More life quality improvements to this app

D4rK7355608 · Jul 13, 2024 · 16afff1 · 16afff1
1 parent d9ef199
commit 16afff1
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 23 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,22 +1,21 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
-    id("com.google.android.gms.oss-licenses-plugin")
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.googlePlayServices)
+    alias(libs.plugins.googleOssServices)
+    alias(libs.plugins.googleFirebase)
+    alias(libs.plugins.compose.compiler)
 }
+
 android {
     compileSdk = 34
     namespace = "com.d4rk.cleaner"
     defaultConfig {
         applicationId = "com.d4rk.cleaner"
         minSdk = 26
         targetSdk = 34
-        versionCode = 94
+        versionCode = 95
         versionName = "2.0.0"
-        archivesName = "${applicationId}-v${versionName}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
             "en",
@@ -41,6 +40,7 @@ android {
             useSupportLibrary = true
         }
     }
+
     buildTypes {
         release {
             multiDexEnabled = true
@@ -63,32 +63,34 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
         jvmTarget = "17"
     }
+
     buildFeatures {
         viewBinding = true
         buildConfig = true
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+
     bundle {
         storeArchive {
             enable = true
         }
     }
 }
+
 dependencies {
 
     //AndroidX

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/constants/permissions/PermissionsConstants.kt b/app/src/main/kotlin/com/d4rk/cleaner/constants/permissions/PermissionsConstants.kt
@@ -0,0 +1,6 @@
+package com.d4rk.cleaner.constants.permissions
+
+object PermissionsConstants {
+    const val REQUEST_CODE_STORAGE_PERMISSIONS = 1
+    const val REQUEST_CODE_NOTIFICATION_PERMISSION = 2
+}
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/appmanager/AppManagerViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/appmanager/AppManagerViewModel.kt
@@ -47,7 +47,7 @@ class AppManagerViewModel(private val application: Application) : ViewModel() {
     }
 
     private fun loadInstalledApps() {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             _installedApps.value = getInstalledApps()
         }
     }
@@ -59,7 +59,7 @@ class AppManagerViewModel(private val application: Application) : ViewModel() {
     }
 
     private fun loadApkFiles() {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             _apkFiles.value = getApkFilesFromStorage()
         }
     }

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/utils/PermissionsUtils.kt b/app/src/main/kotlin/com/d4rk/cleaner/utils/PermissionsUtils.kt
@@ -12,15 +12,13 @@ import android.os.Environment
 import android.provider.Settings
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import com.d4rk.cleaner.constants.permissions.PermissionsConstants
 
 /**
  * Utility class for handling runtime permissions.
  */
 object PermissionsUtils {
 
-    const val REQUEST_CODE_STORAGE_PERMISSIONS = 1
-    const val REQUEST_CODE_NOTIFICATION_PERMISSION = 2
-
     /**
      * Checks if the app has all necessary storage permissions.
      *
@@ -114,7 +112,7 @@ object PermissionsUtils {
         ActivityCompat.requestPermissions(
             activity,
             requiredPermissions.toTypedArray(),
-            REQUEST_CODE_STORAGE_PERMISSIONS
+            PermissionsConstants.REQUEST_CODE_STORAGE_PERMISSIONS
         )
     }
 
@@ -166,7 +164,7 @@ object PermissionsUtils {
             ActivityCompat.requestPermissions(
                 activity,
                 arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                REQUEST_CODE_NOTIFICATION_PERMISSION
+                PermissionsConstants.REQUEST_CODE_NOTIFICATION_PERMISSION
             )
         }
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsKotlinAndroid) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.googlePlayServices) apply false
     alias(libs.plugins.googleOssServices) apply false
     alias(libs.plugins.googleFirebase) apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.0"
+agp = "8.5.1"
 appcompat = "1.7.0"
 appUpdateKtx = "2.1.0"
 billing = "7.0.0"
@@ -13,7 +13,7 @@ firebaseBom = "32.8.1"
 glide = "4.16.0"
 lifecycle = "2.8.3"
 volley = "1.2.1"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -89,4 +89,5 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 googlePlayServices = { id = "com.google.gms.google-services", version.ref = "google-services" }
 googleOssServices = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "google-oss-services" }
-googleFirebase = { id = "com.google.firebase.crashlytics", version.ref = "google-firebase-crashlytics" }
+googleFirebase = { id = "com.google.firebase.crashlytics", version.ref = "google-firebase-crashlytics" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,6 +15,7 @@ pluginManagement {
         }
     }
 }
+
 @Suppress("UnstableApiUsage") dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -25,5 +26,6 @@ pluginManagement {
         }
     }
 }
+
 rootProject.name = "Cleaner for Android"
 include(":app")