Small stuff

D4rK7355608 · Nov 3, 2024 · 2a857b6 · 2a857b6
1 parent c94e732
commit 2a857b6
Show file tree

Hide file tree

Showing 36 changed files with 116 additions and 80 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,29 +15,29 @@ android {
         applicationId = "com.d4rk.cartcalculator"
         minSdk = 23
         targetSdk = 35
-        versionCode = 63
+        versionCode = 64
         versionName = "1.1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
-            "en",
-            "bg-rBG",
-            "de-rDE",
-            "es-rGQ",
-            "fr-rFR",
-            "hi-rIN",
-            "hu-rHU",
-            "in-rID",
-            "it-rIT",
-            "ja-rJP",
-            "pl-rPL",
-            "pt-rBR",
-            "ro-rRO",
-            "ru-rRU",
-            "sv-rSE",
-            "th-rTH",
-            "tr-rTR",
-            "uk-rUA",
-            "zh-rTW",
+            "en" ,
+            "bg-rBG" ,
+            "de-rDE" ,
+            "es-rGQ" ,
+            "fr-rFR" ,
+            "hi-rIN" ,
+            "hu-rHU" ,
+            "in-rID" ,
+            "it-rIT" ,
+            "ja-rJP" ,
+            "pl-rPL" ,
+            "pt-rBR" ,
+            "ro-rRO" ,
+            "ru-rRU" ,
+            "sv-rSE" ,
+            "th-rTH" ,
+            "tr-rTR" ,
+            "uk-rUA" ,
+            "zh-rTW" ,
         )
         vectorDrawables {
             useSupportLibrary = true
@@ -46,19 +46,21 @@ android {
 
     buildTypes {
         release {
-            multiDexEnabled = true
             isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = false
-            proguardFiles(
-                getDefaultProguardFile(name = "proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
         }
         debug {
-            multiDexEnabled = true
             isDebuggable = true
+        }
+    }
+
+    buildTypes.forEach { buildType ->
+        with(buildType) {
+            multiDexEnabled = true
             proguardFiles(
-                getDefaultProguardFile(name = "proguard-android-optimize.txt"), "proguard-rules.pro"
+                getDefaultProguardFile(name = "proguard-android-optimize.txt") ,
+                "proguard-rules.pro"
             )
         }
     }
@@ -99,59 +101,59 @@ dependencies {
     implementation(libs.firebase.perf)
 
     // Google
-    implementation(libs.play.services.ads)
-    implementation(libs.billing)
-    implementation(libs.material)
-    implementation(libs.play.services.oss.licenses)
-    implementation(libs.review.ktx)
-    implementation(libs.app.update.ktx)
-    implementation(libs.volley)
+    implementation(dependencyNotation = libs.play.services.ads)
+    implementation(dependencyNotation = libs.billing)
+    implementation(dependencyNotation = libs.material)
+    implementation(dependencyNotation = libs.play.services.oss.licenses)
+    implementation(dependencyNotation = libs.review.ktx)
+    implementation(dependencyNotation = libs.app.update.ktx)
+    implementation(dependencyNotation = libs.volley)
 
     // Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.animation.core)
-    implementation(libs.androidx.foundation)
-    implementation(libs.androidx.material.icons.extended)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.runtime)
-    implementation(libs.androidx.runtime.livedata)
-    implementation(libs.androidx.ui)
-    implementation(libs.androidx.graphics.shapes)
-    implementation(libs.androidx.constraintlayout.compose)
-    implementation(libs.ui.tooling)
-    implementation(libs.datastore.preferences)
-    implementation(libs.androidx.datastore.preferences)
-    implementation(libs.androidx.navigation.compose)
+    implementation(dependencyNotation = platform(libs.androidx.compose.bom))
+    implementation(dependencyNotation = libs.androidx.activity.compose)
+    implementation(dependencyNotation = libs.androidx.animation.core)
+    implementation(dependencyNotation = libs.androidx.foundation)
+    implementation(dependencyNotation = libs.androidx.material.icons.extended)
+    implementation(dependencyNotation = libs.androidx.material3)
+    implementation(dependencyNotation = libs.androidx.runtime)
+    implementation(dependencyNotation = libs.androidx.runtime.livedata)
+    implementation(dependencyNotation = libs.androidx.ui)
+    implementation(dependencyNotation = libs.androidx.graphics.shapes)
+    implementation(dependencyNotation = libs.androidx.constraintlayout.compose)
+    implementation(dependencyNotation = libs.ui.tooling)
+    implementation(dependencyNotation = libs.datastore.preferences)
+    implementation(dependencyNotation = libs.androidx.datastore.preferences)
+    implementation(dependencyNotation = libs.androidx.navigation.compose)
 
     // AndroidX
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.process)
-    implementation(libs.androidx.lifecycle.common.java8)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-    implementation(libs.androidx.multidex)
-    implementation(libs.androidx.work.runtime.ktx)
+    implementation(dependencyNotation = libs.androidx.core.ktx)
+    implementation(dependencyNotation = libs.androidx.appcompat)
+    implementation(dependencyNotation = libs.androidx.core.splashscreen)
+    implementation(dependencyNotation = libs.androidx.lifecycle.runtime.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.process)
+    implementation(dependencyNotation = libs.androidx.lifecycle.common.java8)
+    implementation(dependencyNotation = libs.androidx.lifecycle.livedata.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(dependencyNotation = libs.androidx.multidex)
+    implementation(dependencyNotation = libs.androidx.work.runtime.ktx)
 
     // KSP
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.room.ktx)
-    implementation(libs.androidx.room.runtime)
+    ksp(dependencyNotation = libs.androidx.room.compiler)
+    implementation(dependencyNotation = libs.androidx.room.ktx)
+    implementation(dependencyNotation = libs.androidx.room.runtime)
 
     // Kotlin
-    implementation(libs.kotlinx.coroutines.android)
+    implementation(dependencyNotation = libs.kotlinx.coroutines.android)
 
     // Image Compression
-    implementation(libs.coil.compose)
+    implementation(dependencyNotation = libs.coil.compose)
 
     // Test
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    androidTestImplementation(libs.ui.test.junit4)
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
+    testImplementation(dependencyNotation = libs.junit)
+    androidTestImplementation(dependencyNotation = libs.androidx.junit)
+    androidTestImplementation(dependencyNotation = libs.androidx.espresso.core)
+    androidTestImplementation(dependencyNotation = libs.ui.test.junit4)
+    debugImplementation(dependencyNotation = libs.androidx.ui.tooling)
+    debugImplementation(dependencyNotation = libs.androidx.ui.test.manifest)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto">

diff --git a/app/src/main/res/drawable-anydpi/ic_launcher_foreground.xml b/app/src/main/res/drawable-anydpi/ic_launcher_foreground.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:width="432dp"

diff --git a/app/src/main/res/drawable-anydpi/ic_notification_important.xml b/app/src/main/res/drawable-anydpi/ic_notification_important.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

diff --git a/app/src/main/res/drawable-anydpi/ic_notification_update.xml b/app/src/main/res/drawable-anydpi/ic_notification_update.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

diff --git a/app/src/main/res/drawable-anydpi/ic_shortcut_settings_foreground.xml b/app/src/main/res/drawable-anydpi/ic_shortcut_settings_foreground.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:width="432dp"

diff --git a/app/src/main/res/drawable-anydpi/il_startup.xml b/app/src/main/res/drawable-anydpi/il_startup.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:width="847dp"

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/colorLauncherBackground" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_settings.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_settings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/colorShortcutBackground" />
     <foreground android:drawable="@drawable/ic_shortcut_settings_foreground" />

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Ефективно управлявайте и изчислявайте вашите артикули с Cart Calculator. 🛒</string>
     <string name="notification_update_title">Налично е ново обновление!</string>

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Verwalten und berechnen Sie effizient Ihre Einkaufswagenartikel mit Cart Calculator. 🛒</string>
     <string name="notification_update_title">Ein neues Update ist verfügbar!</string>

diff --git a/app/src/main/res/values-es-rGQ/strings.xml b/app/src/main/res/values-es-rGQ/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Administra y calcula eficientemente los artículos de tu carrito con Cart Calculator. 🛒</string>
     <string name="notification_update_title">¡Una nueva actualización disponible!</string>

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Gérez et calculez efficacement les articles de votre panier avec Cart Calculator. 🛒</string>
     <string name="notification_update_title">Une nouvelle mise à jour est disponible !</string>

diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">कार्ट कैलकुलेटर के साथ अपने कार्ट आइटम को कुशलतापूर्वक प्रबंधित करें और उनकी गणना करें। 🛒</string>
     <string name="notification_update_title">एक नया अपडेट उपलब्ध है!</string>

diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">A bevásárlókosár elemeit hatékonyan kezelheti és kiszámolhatja a Cart Calculator segítségével. 🛒</string>
     <string name="notification_update_title">Új frissítés érhető el!</string>

diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Kelola dan hitung item keranjang Anda secara efisien dengan Cart Calculator. 🛒</string>
     <string name="notification_update_title">Pembaruan baru tersedia!</string>

diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Gestisci e calcola gli articoli del tuo carrello in modo efficiente con Cart Calculator. 🛒</string>
     <string name="notification_update_title">Un nuovo aggiornamento è disponibile!</string>

diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">カート計算機を使ってカート内の商品を効率的に管理・計算しましょう。 🛒</string>
     <string name="notification_update_title">新しいアップデートが利用可能です！</string>

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorShortcutBackground">@android:color/system_neutral1_800</color>
     <color name="colorShortcutForeground">@android:color/system_accent1_100</color>

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorLauncherBackground">#2D2D2D</color>
     <color name="colorShortcutBackground">#2E3133</color>

diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Efektywnie zarządzaj i obliczaj przedmioty w koszyku za pomocą Kalkulatora Koszyka. 🛒</string>
     <string name="notification_update_title">Dostępna jest nowa aktualizacja!</string>

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Gerencie e calcule seus itens do carrinho de forma eficiente com o Cart Calculator. ??</string>
     <string name="notification_update_title">Uma nova atualização está disponível!</string>

diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Gestionează și calculează eficient articolele din coșul tău cu Cart Calculator. 🛒</string>
     <string name="notification_update_title">O nouă actualizare este disponibilă!</string>

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Эффективно управляйте и подсчитывайте товары в корзине с помощью Cart Calculator. 🛒</string>
     <string name="notification_update_title">Доступно новое обновление!</string>

diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Hantera och beräkna dina varor i kundvagnen effektivt med Varukorg-räknaren. 🛒</string>
     <string name="notification_update_title">En ny uppdatering är tillgänglig!</string>

diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">จัดการและคำนวณรายการในรถเข็นของคุณได้อย่างมีประสิทธิภาพด้วย Cart Calculator. ??</string>
     <string name="notification_update_title">มีการอัปเดตใหม่!</string>

diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Cart Calculator ile alışveriş sepetinizdeki ürünleri etkili bir şekilde yönetin ve hesaplayın. 🛒</string>
     <string name="notification_update_title">Yeni bir güncelleme mevcut!</string>

diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Ефективно керуйте та розраховуйте товари у своєму кошику за допомогою Cart Calculator. 🛒</string>
     <string name="notification_update_title">Доступне нове оновлення!</string>

diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorShortcutBackground">@android:color/system_accent1_100</color>
     <color name="colorShortcutForeground">@android:color/system_neutral2_700</color>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="currency">
         <item>AUD $</item>   <!-- Australian Dollar -->

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorLauncherBackground">#FFFFFF</color>
     <color name="colorShortcutBackground">#C1E8FF</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_short_description">Efficiently manage and calculate your cart items with Cart Calculator. 🛒</string>
     <string name="notification_update_title">A new update available!</string>

diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Cart Calculator</string>
     <string name="app_full_name" translatable="false">Shopping Cart Calculator for Android</string>

diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
         android:enabled="true"

diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
     <locale android:name="bg" />
     <locale android:name="de" />
@@ -10,12 +11,12 @@
     <locale android:name="it" />
     <locale android:name="ja" />
     <locale android:name="pl" />
-    <locale android:name="pt-BR"/>
+    <locale android:name="pt-BR" />
     <locale android:name="ro" />
     <locale android:name="ru" />
     <locale android:name="sv" />
-    <locale android:name="tr" />
     <locale android:name="th" />
+    <locale android:name="tr" />
     <locale android:name="uk" />
-    <locale android:name="zh-Hans"/>
+    <locale android:name="zh-Hant" />
 </locale-config>