Reworked the app's main code for better structure.

D4rK7355608 · Oct 20, 2024 · 67b1dd8 · 67b1dd8
1 parent 9cdf416
commit 67b1dd8
Show file tree

Hide file tree

Showing 26 changed files with 254 additions and 159 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         applicationId = "com.d4rk.cleaner"
         minSdk = 23
         targetSdk = 35
-        versionCode = 134
+        versionCode = 138
         versionName = "3.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/core/datastore/DataStoreCoreManager.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/core/datastore/DataStoreCoreManager.kt
@@ -14,7 +14,7 @@ open class DataStoreCoreManager(protected val context: Context) {
     lateinit var dataStore: DataStore
 
     suspend fun initializeDataStore(): Boolean = coroutineScope {
-        dataStore = DataStore.getInstance(context.applicationContext)
+        dataStore = DataStore.getInstance(context = context.applicationContext)
 
         listOf(
             async { dataStore.getStartupPage().firstOrNull() ?: BottomBarRoutes.HOME },

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
@@ -182,6 +182,29 @@ class DataStore(context: Context) {
         }
     }
 
+    private val trashSizeKey = longPreferencesKey(name = "trash_size")
+    val trashSize: Flow<Long> = dataStore.data.map { preferences ->
+        preferences[trashSizeKey] ?: 0L
+    }
+
+    suspend fun addTrashSize(size: Long) {
+        dataStore.edit { preferences ->
+            preferences[trashSizeKey] = (preferences[trashSizeKey] ?: 0L) + size
+        }
+    }
+
+    suspend fun subtractTrashSize(size: Long) {
+        dataStore.edit { preferences ->
+            preferences[trashSizeKey] = (preferences[trashSizeKey] ?: 0L) - size
+        }
+    }
+
+    suspend fun clearTrashSize() {
+        dataStore.edit { preferences ->
+            preferences[trashSizeKey] = 0L
+        }
+    }
+
     private val genericFilterKey =
         booleanPreferencesKey(name = DataStoreNamesConstants.DATA_STORE_GENERIC_FILTER)
     val genericFilter: Flow<Boolean> = dataStore.data.map { preferences ->

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
@@ -3,5 +3,5 @@ package com.d4rk.cleaner.data.model.ui.navigation
 import androidx.compose.ui.graphics.vector.ImageVector
 
 data class NavigationDrawerItem(
-    val title: Int, val selectedIcon: ImageVector, val badgeCount: Int? = null
+    val title: Int, val selectedIcon: ImageVector, val badgeText: String = ""
 )
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
@@ -0,0 +1,9 @@
+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/notifications/workers/AppUsageNotificationWorker.kt b/app/src/main/kotlin/com/d4rk/cleaner/notifications/workers/AppUsageNotificationWorker.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.runBlocking
  */
 class AppUsageNotificationWorker(context: Context, workerParams: WorkerParameters) :
     Worker(context, workerParams) {
-    private val dataStore = DataStore.getInstance(context)
+    private val dataStore = DataStore.getInstance(context = context)
     private val appUsageChannelId = "app_usage_channel"
     private val appUsageNotificationId = 0
 

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/animations/Animations.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/animations/Animations.kt
@@ -30,7 +30,7 @@ fun Modifier.bounceClick(
 ) : Modifier = composed {
     var buttonState : ButtonState by remember { mutableStateOf(ButtonState.Idle) }
     val context : Context = LocalContext.current
-    val dataStore : DataStore = DataStore.getInstance(context)
+    val dataStore : DataStore = DataStore.getInstance(context = context)
     val bouncyButtonsEnabled : Boolean by dataStore.bouncyButtons.collectAsState(initial = true)
     val scale : Float by animateFloatAsState(
         if (buttonState == ButtonState.Pressed && animationEnabled && bouncyButtonsEnabled) 0.96f else 1f ,

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/dialogs/ErrorAlertDialog.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/dialogs/ErrorAlertDialog.kt
@@ -14,7 +14,7 @@ fun ErrorAlertDialog(
     AlertDialog(
         onDismissRequest = onDismiss,
         title = { Text(text = "Error") },
-        text = { Text(errorMessage) },
+        text = { Text(text = errorMessage) },
         confirmButton = {
             TextButton(onClick = onDismiss) {
                 Text(text = stringResource(id = android.R.string.ok))

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/dialogs/SelectLanguageAlertDialog.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/dialogs/SelectLanguageAlertDialog.kt
@@ -53,11 +53,11 @@ fun SelectLanguageAlertDialog(
             onLanguageSelected(selectedLanguage.value)
             onDismiss()
         }) {
-            Text(stringResource(id = android.R.string.ok))
+            Text(text = stringResource(id = android.R.string.ok))
         }
     }, dismissButton = {
         TextButton(onClick = onDismiss) {
-            Text(stringResource(id = android.R.string.cancel))
+            Text(text = stringResource(id = android.R.string.cancel))
         }
     })
 }
@@ -74,7 +74,7 @@ fun SelectLanguageAlertDialogContent(
     }
 
     Column {
-        Text(stringResource(id = R.string.dialog_language_subtitle))
+        Text(text = stringResource(id = R.string.dialog_language_subtitle))
         Box(
             modifier = Modifier
                 .fillMaxWidth()
@@ -103,7 +103,7 @@ fun SelectLanguageAlertDialogContent(
         Spacer(modifier = Modifier.height(24.dp))
         Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
         Spacer(modifier = Modifier.height(12.dp))
-        Text(stringResource(id = R.string.dialog_info_language))
+        Text(text = stringResource(id = R.string.dialog_info_language))
     }
 
     LaunchedEffect(selectedLanguage.value) {

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/NavigationDrawer.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/NavigationDrawer.kt
@@ -39,6 +39,7 @@ import androidx.navigation.NavHostController
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.data.model.ui.navigation.NavigationDrawerItem
+import com.d4rk.cleaner.data.model.ui.screens.UiMainModel
 import com.d4rk.cleaner.ui.components.animations.bounceClick
 import com.d4rk.cleaner.ui.components.animations.hapticDrawerSwipe
 import com.d4rk.cleaner.ui.screens.help.HelpActivity
@@ -57,15 +58,15 @@ fun NavigationDrawer(
     view: View,
     dataStore: DataStore,
     context: Context,
+    uiState: UiMainModel,
 ) {
     val scope: CoroutineScope = rememberCoroutineScope()
-
     val drawerItems: List<NavigationDrawerItem> = listOf(
         NavigationDrawerItem(
             title = R.string.image_optimizer, selectedIcon = Icons.Outlined.Image
         ),
         NavigationDrawerItem(
-            title = R.string.trash, selectedIcon = Icons.Outlined.DeleteOutline
+            title = R.string.trash, selectedIcon = Icons.Outlined.DeleteOutline, badgeText = uiState.trashSize,
         ),
         NavigationDrawerItem(
             title = R.string.settings,
@@ -164,7 +165,9 @@ fun NavigationDrawer(
                             )
                         },
                         badge = {
-                            item.badgeCount?.let { Text(text = it.toString()) }
+                            item.badgeText.isNotBlank().let {
+                                Text(text = item.badgeText)
+                            }
                         },
                         modifier = Modifier
                             .padding(

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeViewModel.kt
@@ -222,9 +222,10 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
      */
     fun moveToTrash() {
         viewModelScope.launch(context = Dispatchers.Default + coroutineExceptionHandler) {
+            showLoading()
             val filesToMove =
                     _uiState.value.analyzeState.fileSelectionMap.filter { it.value }.keys.toList()
-            showLoading()
+            val totalTrashSize = filesToMove.sumOf { it.length() }
             repository.moveToTrash(filesToMove) {
                 _uiState.update { currentUiState ->
                     currentUiState.copy(analyzeState = currentUiState.analyzeState.copy(
@@ -237,6 +238,7 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
                 }
                 updateStorageInfo()
             }
+            repository.addTrashSize(totalTrashSize)
             hideLoading()
         }
     }

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt
@@ -140,6 +140,10 @@ class HomeRepository(
         }
     }
 
+    suspend fun addTrashSize(size: Long) {
+        dataStore.addTrashSize(size)
+    }
+
     /**
      * Restores the specified files from the trash directory.
      * @param filesToRestore The set of files to restore from trash.

diff --git a/...lin/com/d4rk/cleaner/ui/screens/imageoptimizer/imageoptimizer/ImageOptimizerComposable.kt b/...lin/com/d4rk/cleaner/ui/screens/imageoptimizer/imageoptimizer/ImageOptimizerComposable.kt
@@ -49,7 +49,7 @@ fun ImageOptimizerComposable(
     activity: ImageOptimizerActivity , viewModel: ImageOptimizerViewModel
 ) {
     val context: Context = LocalContext.current
-    val dataStore: DataStore = DataStore.getInstance(context)
+    val dataStore: DataStore = DataStore.getInstance(context = context)
     val coroutineScope: CoroutineScope = rememberCoroutineScope()
     val adsState: State<Boolean> = dataStore.ads.collectAsState(initial = true)
     val tabs: List<String> = listOf(

diff --git a/...c/main/kotlin/com/d4rk/cleaner/ui/screens/imageoptimizer/imagepicker/ImagePickerScreen.kt b/...c/main/kotlin/com/d4rk/cleaner/ui/screens/imageoptimizer/imagepicker/ImagePickerScreen.kt
@@ -44,7 +44,7 @@ fun ImagePickerComposable(
 ) {
     val context: Context = LocalContext.current
     val view: View = LocalView.current
-    val dataStore: DataStore = DataStore.getInstance(context)
+    val dataStore: DataStore = DataStore.getInstance(context = context)
     val adsState: State<Boolean> = dataStore.ads.collectAsState(initial = true)
 
     LaunchedEffect(key1 = viewModel.selectedImageUri) {