Code improvements and performance optimizations

MihaiCristianCondrea · MihaiCristianCondrea · commit 49b3bd1f25f0 · 2024-07-08T10:56:32.000+03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         applicationId = "com.d4rk.cleaner"
         minSdk = 26
         targetSdk = 34
-        versionCode = 79
+        versionCode = 80
         versionName = "2.0.0"
         archivesName = "${applicationId}-v${versionName}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -73,12 +73,6 @@
             android:name=".ui.support.SupportActivity"
             android:parentActivityName=".MainActivity" />
 
-        <activity
-            android:name=".ui.whitelist.WhitelistActivity"
-            android:exported="true"
-            android:label="@string/whitelist"
-            android:parentActivityName=".MainActivity" />
-
         <activity
             android:name=".ui.imageoptimizer.ImageOptimizerActivity"
             android:exported="true"
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
@@ -46,15 +46,14 @@ import androidx.navigation.compose.rememberNavController
 import com.d4rk.cleaner.ads.FullBannerAdsComposable
 import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.ui.appmanager.AppManagerComposable
-import com.d4rk.cleaner.ui.components.navigation.BottomNavigationScreen
-import com.d4rk.cleaner.ui.components.navigation.NavigationDrawerItem
+import com.d4rk.cleaner.data.model.ui.navigation.BottomNavigationScreen
+import com.d4rk.cleaner.data.model.ui.navigation.NavigationDrawerItem
 import com.d4rk.cleaner.ui.help.HelpActivity
 import com.d4rk.cleaner.ui.home.HomeComposable
 import com.d4rk.cleaner.ui.imageoptimizer.ImagePickerActivity
 import com.d4rk.cleaner.ui.memory.MemoryManagerComposable
 import com.d4rk.cleaner.ui.settings.SettingsActivity
 import com.d4rk.cleaner.ui.support.SupportActivity
-import com.d4rk.cleaner.ui.whitelist.WhitelistActivity
 import com.d4rk.cleaner.utils.Utils
 import kotlinx.coroutines.launch
 
@@ -105,11 +104,6 @@ fun MainComposable() {
                     selected = index == selectedItemIndex,
                     onClick = {
                         when (item.title) {
-                            R.string.whitelist -> {
-                                Utils.openActivity(
-                                    context, WhitelistActivity::class.java
-                                )
-                            }
 
                             R.string.image_optimizer -> {
                                 Utils.openActivity(
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt
@@ -221,17 +221,6 @@ class DataStore(context: Context) {
         }
     }
 
-    private val autoWhitelistKey = booleanPreferencesKey("auto_whitelist")
-    val autoWhitelist: Flow<Boolean> = dataStore.data.map { preferences ->
-        preferences[autoWhitelistKey] ?: true
-    }
-
-    suspend fun saveAutoWhitelist(isChecked: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[autoWhitelistKey] = isChecked
-        }
-    }
-
     private val oneClickCleanKey = booleanPreferencesKey("one_click_clean")
     val oneClickClean: Flow<Boolean> = dataStore.data.map { preferences ->
         preferences[oneClickCleanKey] ?: false
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/InternalStorageInfo.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/InternalStorageInfo.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.ui.memory.model
+package com.d4rk.cleaner.data.model.ui
 
 data class InternalStorageInfo(
     val totalStorage: Long,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/RamInfo.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/RamInfo.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.ui.memory.model
+package com.d4rk.cleaner.data.model.ui
 
 data class RamInfo(
     val totalRam: Long = 0,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/StorageInfo.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/StorageInfo.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.ui.memory.model
+package com.d4rk.cleaner.data.model.ui
 
 data class StorageInfo(
     val totalStorage: Long = 0,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/button/ButtonState.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/button/ButtonState.kt
@@ -0,0 +1,3 @@
+package com.d4rk.cleaner.data.model.ui.button
+
+enum class ButtonState { Pressed , Idle }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/navigation/BottomNavigationScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/navigation/BottomNavigationScreen.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.ui.components.navigation
+package com.d4rk.cleaner.data.model.ui.navigation
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Home
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/navigation/NavigationDrawerItem.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/navigation/NavigationDrawerItem.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.ui.components.navigation
+package com.d4rk.cleaner.data.model.ui.navigation
 
 import androidx.compose.ui.graphics.vector.ImageVector
 
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/button/ButtonState.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/button/ButtonState.kt
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt
@@ -1,6 +1,7 @@
 package com.d4rk.cleaner.ui.home
 
 import android.app.Activity
+import android.graphics.Bitmap
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
@@ -49,6 +50,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -300,8 +302,10 @@ fun FileCard(file: File, viewModel: HomeViewModel, imageLoader: ImageLoader) {
     val context = LocalContext.current
     val fileExtension = getFileExtension(file.name)
 
-    val thumbnail = remember(file.absolutePath) {
-        getVideoThumbnail(file.absolutePath, thumbnailWidth = 64, thumbnailHeight = 64)
+    var thumbnail by remember(file.absolutePath) { mutableStateOf<Bitmap?>(null) }
+
+    LaunchedEffect(file.absolutePath) {
+        thumbnail = getVideoThumbnail(file.absolutePath)
     }
 
     Card(
@@ -332,7 +336,7 @@ fun FileCard(file: File, viewModel: HomeViewModel, imageLoader: ImageLoader) {
                 in context.resources.getStringArray(R.array.video_extensions).toList() -> {
                     if (thumbnail != null) {
                         Image(
-                            bitmap = thumbnail.asImageBitmap(),
+                            bitmap = thumbnail!!.asImageBitmap(),
                             contentDescription = file.name,
                             contentScale = ContentScale.Crop,
                             modifier = Modifier.fillMaxSize()
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/memory/MemoryManagerComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/memory/MemoryManagerComposable.kt
@@ -61,8 +61,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.lerp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.ui.memory.model.RamInfo
-import com.d4rk.cleaner.ui.memory.model.StorageInfo
+import com.d4rk.cleaner.data.model.ui.RamInfo
+import com.d4rk.cleaner.data.model.ui.StorageInfo
 import com.d4rk.cleaner.utils.StorageProgressBar
 import com.d4rk.cleaner.utils.Utils.formatSize
 import com.d4rk.cleaner.utils.bounceClick
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/memory/MemoryManagerViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/memory/MemoryManagerViewModel.kt
@@ -8,9 +8,9 @@ import android.os.StatFs
 import android.os.storage.StorageManager
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.d4rk.cleaner.ui.memory.model.InternalStorageInfo
-import com.d4rk.cleaner.ui.memory.model.RamInfo
-import com.d4rk.cleaner.ui.memory.model.StorageInfo
+import com.d4rk.cleaner.data.model.ui.InternalStorageInfo
+import com.d4rk.cleaner.data.model.ui.RamInfo
+import com.d4rk.cleaner.data.model.ui.StorageInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/cleaning/CleaningSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/cleaning/CleaningSettingsComposable.kt
@@ -45,7 +45,6 @@ fun CleaningSettingsComposable(activity: CleaningSettingsActivity) {
     val deleteImageFiles by dataStore.deleteImageFiles.collectAsState(initial = false)
     val doubleChecker by dataStore.doubleChecker.collectAsState(initial = false)
     val clipboardClean by dataStore.clipboardClean.collectAsState(initial = false)
-    val autoWhitelist by dataStore.autoWhitelist.collectAsState(initial = true)
     val oneClickClean by dataStore.oneClickClean.collectAsState(initial = false)
     val dailyCleaner by dataStore.dailyCleaner.collectAsState(initial = false)
     Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
@@ -169,15 +168,6 @@ fun CleaningSettingsComposable(activity: CleaningSettingsActivity) {
                         dataStore.saveClipboardClean(isChecked)
                     }
                 }
-                SwitchPreferenceItem(
-                    title = stringResource(R.string.auto_whitelist),
-                    summary = stringResource(R.string.summary_preference_settings_auto_whitelist),
-                    checked = autoWhitelist,
-                ) { isChecked ->
-                    CoroutineScope(Dispatchers.IO).launch {
-                        dataStore.saveAutoWhitelist(isChecked)
-                    }
-                }
                 SwitchPreferenceItem(
                     title = stringResource(R.string.one_click_clean),
                     summary = stringResource(R.string.summary_preference_settings_one_click_clean),
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/whitelist/WhitelistActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/whitelist/WhitelistActivity.kt
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/utils/AnimationUtils.kt b/app/src/main/kotlin/com/d4rk/cleaner/utils/AnimationUtils.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
-import com.d4rk.cleaner.ui.components.button.ButtonState
+import com.d4rk.cleaner.data.model.ui.button.ButtonState
 
 @SuppressLint("ReturnFromAwaitPointerEventScope")
 @Composable
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/utils/ImageUtils.kt b/app/src/main/kotlin/com/d4rk/cleaner/utils/ImageUtils.kt
@@ -9,24 +9,22 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.media.MediaMetadataRetriever
 import com.d4rk.cleaner.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
-fun getVideoThumbnail(
+suspend fun getVideoThumbnail(
     videoPath: String,
-    thumbnailWidth: Int = 128,
-    thumbnailHeight: Int = 128
-): Bitmap? {
+    thumbnailWidth: Int = 64,
+    thumbnailHeight: Int = 64,
+): Bitmap? = withContext(Dispatchers.IO) {
     val mediaMetadataRetriever = MediaMetadataRetriever()
-    return try {
+    try {
         mediaMetadataRetriever.setDataSource(videoPath)
-        val bitmap =
-            mediaMetadataRetriever.getFrameAtTime(1000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC)
+        val bitmap = mediaMetadataRetriever.getFrameAtTime(
+            1000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC
+        )
         bitmap?.let {
-            Bitmap.createScaledBitmap(
-                it,
-                thumbnailWidth,
-                thumbnailHeight,
-                false
-            )
+            Bitmap.createScaledBitmap(it, thumbnailWidth, thumbnailHeight, false)
         }
     } catch (e: Exception) {
         null
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/utils/ProgressBarsComposables.kt b/app/src/main/kotlin/com/d4rk/cleaner/utils/ProgressBarsComposables.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.d4rk.cleaner.ui.memory.model.StorageInfo
+import com.d4rk.cleaner.data.model.ui.StorageInfo
 
 /**
  * Composable function representing a circular determinate progress indicator with storage information.
diff --git a/app/src/main/res/layout/activity_whitelist.xml b/app/src/main/res/layout/activity_whitelist.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.d4rk.cleaner.ui.memory.model`
	`1`	`+package com.d4rk.cleaner.data.model.ui`
`2`	`2`
`3`	`3`	`data class InternalStorageInfo(`
`4`	`4`	`val totalStorage: Long,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.d4rk.cleaner.data.model.ui.button`
	`2`	`+`
	`3`	`+enum class ButtonState { Pressed , Idle }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.d4rk.cleaner.ui.components.navigation`
	`1`	`+package com.d4rk.cleaner.data.model.ui.navigation`
`2`	`2`
`3`	`3`	`import androidx.compose.material.icons.Icons`
`4`	`4`	`import androidx.compose.material.icons.filled.Home`