From 421bf418d1bf2d7408ae364af80d77310950a131 Mon Sep 17 00:00:00 2001 From: Zane Schepke Date: Sun, 5 May 2024 21:36:44 -0400 Subject: [PATCH] fix: fastlane metadata --- .../ui/screens/config/ConfigScreen.kt | 20 +++++++++---------- .../ui/screens/config/model/InterfaceProxy.kt | 2 +- .../{ru => ru-RU}/full_description.txt | 0 .../{ru => ru-RU}/short_description.txt | 0 .../metadata/android/{ru => ru-RU}/title.txt | 0 .../{tr => tr-TR}/full_description.txt | 0 .../{tr => tr-TR}/short_description.txt | 0 .../metadata/android/{tr => tr-TR}/title.txt | 0 gradle/libs.versions.toml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename fastlane/metadata/android/{ru => ru-RU}/full_description.txt (100%) rename fastlane/metadata/android/{ru => ru-RU}/short_description.txt (100%) rename fastlane/metadata/android/{ru => ru-RU}/title.txt (100%) rename fastlane/metadata/android/{tr => tr-TR}/full_description.txt (100%) rename fastlane/metadata/android/{tr => tr-TR}/short_description.txt (100%) rename fastlane/metadata/android/{tr => tr-TR}/title.txt (100%) diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt index 2973e83..619519b 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt @@ -557,16 +557,6 @@ fun ConfigScreen( .fillMaxWidth() .focusRequester(focusRequester), ) - ConfigurationTextBox( - value = uiState.interfaceProxy.transportPacketMagicHeader, - onValueChange = { value -> viewModel.onTransportPacketMagicHeader(value) }, - keyboardActions = keyboardActions, - label = stringResource(R.string.transport_packet_magic_header), - hint = stringResource(R.string.transport_packet_magic_header).lowercase(), - modifier = Modifier - .fillMaxWidth() - .focusRequester(focusRequester), - ) ConfigurationTextBox( value = uiState.interfaceProxy.underloadPacketMagicHeader, onValueChange = { value -> viewModel.onUnderloadPacketMagicHeader(value) }, @@ -577,6 +567,16 @@ fun ConfigScreen( .fillMaxWidth() .focusRequester(focusRequester), ) + ConfigurationTextBox( + value = uiState.interfaceProxy.transportPacketMagicHeader, + onValueChange = { value -> viewModel.onTransportPacketMagicHeader(value) }, + keyboardActions = keyboardActions, + label = stringResource(R.string.transport_packet_magic_header), + hint = stringResource(R.string.transport_packet_magic_header).lowercase(), + modifier = Modifier + .fillMaxWidth() + .focusRequester(focusRequester), + ) } Row( verticalAlignment = Alignment.CenterVertically, diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/InterfaceProxy.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/InterfaceProxy.kt index 8acb61f..078511c 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/InterfaceProxy.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/InterfaceProxy.kt @@ -55,8 +55,8 @@ data class InterfaceProxy( responsePacketJunkSize = if(i.responsePacketJunkSize.isPresent) i.responsePacketJunkSize.get().toString() else "", initPacketMagicHeader = if(i.initPacketMagicHeader.isPresent) i.initPacketMagicHeader.get().toString() else "", responsePacketMagicHeader = if(i.responsePacketMagicHeader.isPresent) i.responsePacketMagicHeader.get().toString() else "", - underloadPacketMagicHeader = if(i.underloadPacketMagicHeader.isPresent) i.underloadPacketMagicHeader.get().toString() else "", transportPacketMagicHeader = if(i.transportPacketMagicHeader.isPresent) i.transportPacketMagicHeader.get().toString() else "", + underloadPacketMagicHeader = if(i.underloadPacketMagicHeader.isPresent) i.underloadPacketMagicHeader.get().toString() else "", ) } } diff --git a/fastlane/metadata/android/ru/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt similarity index 100% rename from fastlane/metadata/android/ru/full_description.txt rename to fastlane/metadata/android/ru-RU/full_description.txt diff --git a/fastlane/metadata/android/ru/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt similarity index 100% rename from fastlane/metadata/android/ru/short_description.txt rename to fastlane/metadata/android/ru-RU/short_description.txt diff --git a/fastlane/metadata/android/ru/title.txt b/fastlane/metadata/android/ru-RU/title.txt similarity index 100% rename from fastlane/metadata/android/ru/title.txt rename to fastlane/metadata/android/ru-RU/title.txt diff --git a/fastlane/metadata/android/tr/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt similarity index 100% rename from fastlane/metadata/android/tr/full_description.txt rename to fastlane/metadata/android/tr-TR/full_description.txt diff --git a/fastlane/metadata/android/tr/short_description.txt b/fastlane/metadata/android/tr-TR/short_description.txt similarity index 100% rename from fastlane/metadata/android/tr/short_description.txt rename to fastlane/metadata/android/tr-TR/short_description.txt diff --git a/fastlane/metadata/android/tr/title.txt b/fastlane/metadata/android/tr-TR/title.txt similarity index 100% rename from fastlane/metadata/android/tr/title.txt rename to fastlane/metadata/android/tr-TR/title.txt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7575251..82882c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ zxingCore = "3.5.3" #plugins gradlePlugins-kotlinxSerialization = "1.9.23" -material = "1.11.0" +material = "1.12.0" [libraries]