From 3cf7e6bb167858b25eef468ed2f2aad3d80de14c Mon Sep 17 00:00:00 2001 From: Rostyslav Sheshenya Date: Fri, 20 Feb 2026 23:53:30 -0600 Subject: [PATCH 1/3] Changed russian translation for string "app_license" --- app/src/main/res/values-ru/strings.xml | 2 +- gradle.properties | 10 ++++++++++ gradle/libs.versions.toml | 2 +- settings.gradle.kts | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1f3f804702..f4a2d3d75f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -39,7 +39,7 @@ Выберете файл в файловой системе Выбрать файл О приложении - Авторское лево свободного программного обеспечения, лицензия GPLv3+ + Программное обеспечение, распространяемое по лицензии Copyleft (GPLv3+). О приложении %s Версия: %s Выбор штрих-кода diff --git a/gradle.properties b/gradle.properties index 469c55a65b..8bf7b89298 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,13 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 04012b087e..7d51fc6622 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -52,7 +52,7 @@ junit-junit = { group = "junit", name = "junit", version = "4.13.2" } org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.16.1" } [plugins] -com-android-application = { id = "com.android.application", version = "8.13.2" } +com-android-application = { id = "com.android.application", version = "9.0.1" } org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.3.10" } org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.3.10" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ce82c4000..dab1e8b326 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,9 @@ pluginManagement { mavenCentral() } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { From 0d5805d8dfded7ee216de2999fa4edd5334c11ea Mon Sep 17 00:00:00 2001 From: Rostyslav Sheshenya Date: Sat, 21 Feb 2026 09:54:42 -0600 Subject: [PATCH 2/3] Changed deprecated Locale constructors with Builder() function in Utils.java (line 801 and line 807). --- app/src/main/java/protect/card_locker/Utils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java index 2aa3b45e46..39cc391dee 100644 --- a/app/src/main/java/protect/card_locker/Utils.java +++ b/app/src/main/java/protect/card_locker/Utils.java @@ -798,13 +798,13 @@ static public U mapGetOrDefault(Map map, T key, U defaultValue) { static public Locale stringToLocale(String localeString) { String[] localeParts = localeString.split("-"); if (localeParts.length == 1) { - return new Locale(localeParts[0]); + return new Locale.Builder().setLanguage(localeParts[0]).build(); } if (localeParts[1].startsWith("r")) { localeParts[1] = localeParts[1].substring(1); } - return new Locale(localeParts[0], localeParts[1]); + return new Locale.Builder().setLanguage(localeParts[0]).setRegion(localeParts[1]).build(); } static public Context updateBaseContextLocale(Context context) { From 8dbc07cfba5adf56ce7ffe92134821a116a5b1f1 Mon Sep 17 00:00:00 2001 From: Rostyslav Sheshenya Date: Tue, 24 Feb 2026 13:46:29 -0600 Subject: [PATCH 3/3] - Migrated to built-in Kotlin - Fixed deprecated feature in build.gradle.kts app file called "resourceConfigigurations". Changed it to localeFilters feature. - Fixed a few others deprecated features but not all --- app/build.gradle.kts | 9 +++++---- app/src/main/java/protect/card_locker/MainActivity.kt | 4 ++-- build.gradle.kts | 1 - gradle.properties | 3 +-- gradle/libs.versions.toml | 1 - 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 123242c148..14a71d4efc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.com.android.application) - alias(libs.plugins.org.jetbrains.kotlin.android) alias(libs.plugins.org.jetbrains.kotlin.plugin.compose) } @@ -14,6 +13,9 @@ kotlin { android { namespace = "protect.card_locker" compileSdk = 36 + androidResources { + localeFilters.addAll(listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")) + } defaultConfig { applicationId = "me.hackerchick.catima" @@ -25,8 +27,6 @@ android { vectorDrawables.useSupportLibrary = true multiDexEnabled = true - resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW") - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" buildConfigField("boolean", "showDonate", "true") @@ -38,7 +38,7 @@ android { release { isMinifyEnabled = true proguardFiles( - getDefaultProguardFile("proguard-android.txt"), + getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) } @@ -98,6 +98,7 @@ android { kotlin { compilerOptions { + languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0 jvmTarget = JvmTarget.JVM_17 } } diff --git a/app/src/main/java/protect/card_locker/MainActivity.kt b/app/src/main/java/protect/card_locker/MainActivity.kt index 2cf536fba3..cf9b431e7b 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.kt +++ b/app/src/main/java/protect/card_locker/MainActivity.kt @@ -518,7 +518,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener { intent.data } Intent.ACTION_SEND -> { - intent.getParcelableExtra(Intent.EXTRA_STREAM) + @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_STREAM) } else -> { Log.e(TAG, "Wrong action type to parse intent") @@ -815,7 +815,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener { private fun scaleScreen() { val displayMetrics = DisplayMetrics() - windowManager.defaultDisplay.getMetrics(displayMetrics) + @Suppress("DEPRECATION") windowManager.defaultDisplay.getMetrics(displayMetrics) val screenHeight = displayMetrics.heightPixels val mediumSizePx = TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, diff --git a/build.gradle.kts b/build.gradle.kts index e6d03252e1..2b48e78cbb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,6 @@ plugins { alias(libs.plugins.com.android.application) apply false - alias(libs.plugins.org.jetbrains.kotlin.android) apply false } allprojects { diff --git a/gradle.properties b/gradle.properties index 8bf7b89298..3a1309f80e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,5 +23,4 @@ android.uniquePackageNames=false android.dependency.useConstraints=true android.r8.strictFullModeForKeepRules=false android.r8.optimizedResourceShrinking=false -android.builtInKotlin=false -android.newDsl=false + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d51fc6622..617e663235 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,6 @@ org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", [plugins] com-android-application = { id = "com.android.application", version = "9.0.1" } -org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.3.10" } org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.3.10" } [bundles]