Some small fixes

D4rK7355608 · Nov 2, 2024 · db68a8f · db68a8f
1 parent fc848cb
commit db68a8f
Show file tree

Hide file tree

Showing 43 changed files with 148 additions and 89 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,33 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
-/.idea/shelf/Uncommitted_changes_before_Update_at_9_11_2024_8_33_AM_[Changes]/shelved.patch
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.d4rk.cleaner"
         minSdk = 23
         targetSdk = 35
-        versionCode = 141
-        versionName = "3.0.0"
+        versionCode = 142
+        versionName = "3.0.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
             "en",
@@ -43,19 +43,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"
             )
         }
     }
@@ -90,65 +92,65 @@ android {
 dependencies {
 
     //AndroidX
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.core.splashscreen)
-    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.multidex)
+    implementation(dependencyNotation = libs.androidx.work.runtime.ktx)
 
     // Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.ui)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.constraintlayout.compose)
-    implementation(libs.androidx.ui.graphics)
-    implementation(libs.androidx.compose.runtime)
-    implementation(libs.androidx.runtime.livedata)
-    implementation(libs.androidx.runtime.rxjava2)
-    implementation(libs.androidx.ui.tooling.preview)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.material.icons.extended)
-    implementation(libs.datastore.preferences)
-    implementation(libs.androidx.datastore.preferences)
-    implementation(libs.androidx.foundation)
-    implementation(libs.androidx.navigation.compose)
+    implementation(dependencyNotation = platform(libs.androidx.compose.bom))
+    implementation(dependencyNotation = libs.androidx.ui)
+    implementation(dependencyNotation = libs.androidx.activity.compose)
+    implementation(dependencyNotation = libs.androidx.constraintlayout.compose)
+    implementation(dependencyNotation = libs.androidx.ui.graphics)
+    implementation(dependencyNotation = libs.androidx.compose.runtime)
+    implementation(dependencyNotation = libs.androidx.runtime.livedata)
+    implementation(dependencyNotation = libs.androidx.runtime.rxjava2)
+    implementation(dependencyNotation = libs.androidx.ui.tooling.preview)
+    implementation(dependencyNotation = libs.androidx.material3)
+    implementation(dependencyNotation = libs.androidx.material.icons.extended)
+    implementation(dependencyNotation = libs.datastore.preferences)
+    implementation(dependencyNotation = libs.androidx.datastore.preferences)
+    implementation(dependencyNotation = libs.androidx.foundation)
+    implementation(dependencyNotation = libs.androidx.navigation.compose)
 
     // Lifecycle
-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.common.java8)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
-    implementation(libs.androidx.lifecycle.process)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(dependencyNotation = libs.kotlinx.coroutines.android)
+    implementation(dependencyNotation = libs.kotlinx.serialization.json)
+    implementation(dependencyNotation = libs.androidx.lifecycle.runtime.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.common.java8)
+    implementation(dependencyNotation = libs.androidx.lifecycle.livedata.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.process)
+    implementation(dependencyNotation = libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.viewmodel.compose)
+    implementation(dependencyNotation = libs.androidx.lifecycle.runtime.compose)
 
     // Google
-    implementation(libs.play.services.ads)
-    implementation(libs.billing)
-    implementation(libs.play.services.oss.licenses)
-    implementation(libs.material)
-    implementation(libs.app.update.ktx)
-    implementation(libs.review.ktx)
-    implementation(libs.volley)
+    implementation(dependencyNotation = libs.play.services.ads)
+    implementation(dependencyNotation = libs.billing)
+    implementation(dependencyNotation = libs.play.services.oss.licenses)
+    implementation(dependencyNotation = libs.material)
+    implementation(dependencyNotation = libs.app.update.ktx)
+    implementation(dependencyNotation = libs.review.ktx)
+    implementation(dependencyNotation = libs.volley)
 
     // Firebase
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.analytics.ktx)
-    implementation(libs.firebase.crashlytics.ktx)
-    implementation(libs.firebase.perf)
+    implementation(dependencyNotation = platform(libs.firebase.bom))
+    implementation(dependencyNotation = libs.firebase.analytics.ktx)
+    implementation(dependencyNotation = libs.firebase.crashlytics.ktx)
+    implementation(dependencyNotation = libs.firebase.perf)
 
     // Image Compression
-    implementation(libs.compressor)
-    implementation(libs.coil.compose)
-    implementation(libs.coil.video)
+    implementation(dependencyNotation = libs.compressor)
+    implementation(dependencyNotation = libs.coil.compose)
+    implementation(dependencyNotation = libs.coil.video)
 
     // 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/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 97,
-      "versionName": "2.0.0",
+      "versionCode": 141,
+      "versionName": "3.0.0",
       "outputFile": "app-release.apk"
     }
   ],
@@ -33,5 +33,5 @@
       ]
     }
   ],
-  "minSdkVersionForDexing": 26
+  "minSdkVersionForDexing": 23
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/screens/UiMainModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/screens/UiMainModel.kt
@@ -3,7 +3,6 @@ package com.d4rk.cleaner.data.model.ui.screens
 import com.d4rk.cleaner.data.model.ui.navigation.BottomNavigationScreen
 
 data class UiMainModel(
-    val isNavigationDrawerOpen: Boolean = false,
     val currentBottomNavigationScreen: BottomNavigationScreen = BottomNavigationScreen.Home,
     val trashSize: String = "0 KB",
 )
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/BottomNavigationBar.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/BottomNavigationBar.kt
@@ -65,9 +65,13 @@ fun BottomNavigationBar(
                     selected = currentRoute == screen.route,
                     onClick = {
                         view.playSoundEffect(SoundEffectConstants.CLICK)
-                        navController.navigate(screen.route) {
-                            popUpTo(navController.graph.startDestinationId)
-                            launchSingleTop = true
+                        if (currentRoute != screen.route) {
+                            navController.navigate(screen.route) {
+                                popUpTo(navController.graph.startDestinationId) {
+                                    saveState = true
+                                }
+                                launchSingleTop = true
+                            }
                         }
                     })
             }

diff --git a/app/src/main/res/drawable-anydpi/ic_apk_document.xml b/app/src/main/res/drawable-anydpi/ic_apk_document.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="24dp"
@@ -9,4 +10,4 @@
         android:fillColor="?android:textColorPrimary"
         android:pathData="M280,760L680,760Q676,711 650,670Q624,629 582,605L620,537Q622,533 621,528Q620,523 615,521Q611,519 606.5,520Q602,521 600,525L561,595Q541,587 521,582.5Q501,578 480,578Q459,578 439,582.5Q419,587 399,595L360,525Q358,520 353.5,520Q349,520 344,522Q344,522 340,537L378,605Q336,629 310,670Q284,711 280,760ZM390,700Q382,700 376,694Q370,688 370,680Q370,672 376,666Q382,660 390,660Q398,660 404,666Q410,672 410,680Q410,688 404,694Q398,700 390,700ZM570,700Q562,700 556,694Q550,688 550,680Q550,672 556,666Q562,660 570,660Q578,660 584,666Q590,672 590,680Q590,688 584,694Q578,700 570,700ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L520,360ZM240,160L240,160L240,360L240,360L240,160L240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z"
         tools:ignore="VectorPath" />
-</vector>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_archive_filter.xml b/app/src/main/res/drawable-anydpi/ic_archive_filter.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_audio_file.xml b/app/src/main/res/drawable-anydpi/ic_audio_file.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_file_present.xml b/app/src/main/res/drawable-anydpi/ic_file_present.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_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"
     android:width="108dp"
     android:height="108dp"

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/ic_video_file.xml b/app/src/main/res/drawable-anydpi/ic_video_file.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/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/colorIconShortcutBackground" />
     <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_description">Последният Android Cleaner, от който ще се нуждаете за ежедневна употреба!</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_description">Der letzte Android-Reiniger, den Sie jemals für den täglichen Gebrauch benötigen werden!</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_description">¡El mejor limpiador de Android que jamás necesitarás para el uso diario!</string>
     <string name="notification_update_title">¡Hay 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_description">Le meilleur nettoyeur Android dont vous aurez jamais besoin pour une utilisation quotidienne!</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_description">हर रोज़ इस्तेमाल के लिए यह आखिरी Android क्लीनर है जिसकी आपको कभी आवश्यकता होगी!</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_description">Az utolsó Android Cleaner, amire valaha szükséged lesz a mindennapi használathoz!</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_description">Pembersih Android terakhir yang Anda perlukan untuk penggunaan sehari-hari!</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_description">L\'ultimo Android Cleaner di cui avrai bisogno per l\'uso quotidiano!</string>
     <string name="notification_update_title">È disponibile un nuovo aggiornamento!</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_description">毎日の使用に最適な、これ以上のものはないAndroidクリーナー！</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="colorIconShortcutBackground">@android:color/system_neutral1_800</color>
     <color name="colorIconShortcutForeground">@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="colorIconShortcutBackground">#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_description">Ostatni program Android Cleaner, jakiego będziesz potrzebować do codziennego użytku!</string>
     <string name="notification_update_title">Dostępna jest nowa aktualizacja!</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_description">Ultima aplicație de curățare Android de care vei avea nevoie vreodată, pentru utilizare zilnică!</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_description">Последний Android Cleaner, который вам когда-либо понадобится для ежедневного использования!</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_description">Den enda Android Cleaner du någonsin kommer att behöva för vardagligt bruk!</string>
     <string name="notification_update_title">En ny uppdatering är tillgänglig!</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_description">Günlük kullanım için ihtiyacınız olacak son Android Temizleyici!</string>
     <string name="notification_update_title">Yeni bir güncelleme mevcut!</string>