diff --git a/app/src/debug/res/values-ru/strings.xml b/app/src/debug/res/values-ru/strings.xml deleted file mode 100644 index 9c7f1adda2..0000000000 --- a/app/src/debug/res/values-ru/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - DebugTangem - - diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 764dd201cc..0911a552b7 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -1,6 +1,6 @@ - DebugTangem + Debug Tangem - \ No newline at end of file + diff --git a/app/src/external/res/values-ru/strings.xml b/app/src/external/res/values-ru/strings.xml deleted file mode 100644 index 3a1e80c609..0000000000 --- a/app/src/external/res/values-ru/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - ExternalTangem - - diff --git a/app/src/external/res/values/strings.xml b/app/src/external/res/values/strings.xml index 3a1e80c609..1e2d2f4d56 100644 --- a/app/src/external/res/values/strings.xml +++ b/app/src/external/res/values/strings.xml @@ -1,6 +1,6 @@ - ExternalTangem + External Tangem diff --git a/app/src/internal/res/values-ru/strings.xml b/app/src/internal/res/values-ru/strings.xml deleted file mode 100644 index 76df805cb3..0000000000 --- a/app/src/internal/res/values-ru/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - InternalTangem - - diff --git a/app/src/internal/res/values/strings.xml b/app/src/internal/res/values/strings.xml index 76df805cb3..4ba0d6fad8 100644 --- a/app/src/internal/res/values/strings.xml +++ b/app/src/internal/res/values/strings.xml @@ -1,6 +1,6 @@ - InternalTangem + Internal Tangem diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..250461aa6b --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + Tangem + + diff --git a/build.gradle.kts b/build.gradle.kts index aa62254f1d..91904f4d34 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,6 +10,67 @@ plugins { alias(deps.plugins.firebase.crashlytics) apply false } -tasks.register("clean", Delete::class) { +val clean by tasks.registering { delete(rootProject.buildDir) +} + +interface Injected { + @get:Inject + val fs: FileSystemOperations +} + +val assembleInternalQA by tasks.registering { + group = "build" + description = "Builds internal APK to 'build/outputs' directory" + + val appOutputApkDir = "$projectDir/app/build/outputs/apk/internal" + val rootOutputApkDir = "$buildDir/outputs" + val injected = objects.newInstance() + + dependsOn(":app:assembleInternal") + + doFirst { + injected.fs.delete { + delete(appOutputApkDir) + delete("$rootOutputApkDir/app-internal.apk") + } + } + doLast { + injected.fs.copy { + from("$appOutputApkDir/app-internal.apk") + into(rootOutputApkDir) + } + } +} + +val assembleExternalQA by tasks.registering { + group = "build" + description = "Builds external APK to 'build/outputs' directory" + + val appOutputApkDir = "$projectDir/app/build/outputs/apk/external" + val rootOutputApkDir = "$buildDir/outputs" + val injected = objects.newInstance() + + dependsOn(":app:assembleExternal") + + doFirst { + injected.fs.delete { + delete(appOutputApkDir) + delete("$rootOutputApkDir/app-external.apk") + } + } + doLast { + injected.fs.copy { + from("$appOutputApkDir/app-external.apk") + into(rootOutputApkDir) + } + } +} + +val assembleQA by tasks.registering { + group = "build" + description = "Builds internal and external APKs to 'build/outputs' directory" + + dependsOn(assembleInternalQA) + dependsOn(assembleExternalQA) } \ No newline at end of file diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml index a0dd22a168..f4ba8d958a 100644 --- a/core/res/src/main/res/values-de/strings.xml +++ b/core/res/src/main/res/values-de/strings.xml @@ -358,7 +358,6 @@ Choose token Your tokens not available - Tangem Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Hide %s diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml index 43efbd281e..8c367d88a4 100644 --- a/core/res/src/main/res/values-fr/strings.xml +++ b/core/res/src/main/res/values-fr/strings.xml @@ -358,7 +358,6 @@ Choose token Your tokens not available - Tangem Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Hide %s diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml index b1209fc917..53671cbc35 100644 --- a/core/res/src/main/res/values-it/strings.xml +++ b/core/res/src/main/res/values-it/strings.xml @@ -358,7 +358,6 @@ Choose token Your tokens not available - Tangem Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Hide %s diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 41175e518c..0d2c66f7d1 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -359,7 +359,6 @@ Выберите токен Ваши токены не доступен - Tangem Скрыть Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно через страницу управления токенами. Скрыть %s diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml index dcc7b86b54..4758954e64 100644 --- a/core/res/src/main/res/values-zh-rTW/strings.xml +++ b/core/res/src/main/res/values-zh-rTW/strings.xml @@ -358,7 +358,6 @@ 選擇代幣 您的代幣 無法使用 - Tangem 隱藏 您即將在主屏幕上隱藏此代幣。您可以隨時通過管理代幣頁面將其添加回來。 隱藏 %s diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 7425f3b247..307ced0569 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -359,7 +359,6 @@ Choose token Your tokens not available - Tangem Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Hide %s diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt index b872eb35ff..767e46ba25 100644 --- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt +++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt @@ -34,7 +34,7 @@ internal enum class BuildType( * Build type for QA * * Features: - * - Env: beta + * - Env: dev * - Signing config: debug * - Logs * - Tester menu @@ -46,7 +46,7 @@ internal enum class BuildType( appIdSuffix = "internal", versionSuffix = "internal", configFields = listOf( - BuildConfigField.Environment(value = "beta"), + BuildConfigField.Environment(value = "dev"), BuildConfigField.TestActionEnabled(isEnabled = true), BuildConfigField.LogEnabled(isEnabled = true), BuildConfigField.TesterMenuAvailability(isEnabled = true),