Updated the project structure and simplified the app

D4rK7355608 · Jul 10, 2024 · 0888d7d · 0888d7d
1 parent df2193e
commit 0888d7d
Show file tree

Hide file tree

Showing 28 changed files with 112 additions and 108 deletions.
diff --git a/app/src/androidTest/kotlin/com/d4rk/cleaner/ExampleInstrumentedTest.kt b/app/src/androidTest/kotlin/com/d4rk/cleaner/ExampleInstrumentedTest.kt
@@ -3,7 +3,7 @@ package com.d4rk.cleaner
 import android.os.Environment
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.d4rk.cleaner.utils.FileScanner
+import com.d4rk.cleaner.utils.cleaning.FileScanner
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
@@ -53,7 +53,7 @@ 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.utils.Utils
+import com.d4rk.cleaner.utils.IntentUtils
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -102,32 +102,32 @@ fun MainComposable() {
                         when (item.title) {
 
                             R.string.image_optimizer -> {
-                                Utils.openActivity(
+                                IntentUtils.openActivity(
                                     context, ImagePickerActivity::class.java
                                 )
                             }
 
                             R.string.settings -> {
-                                Utils.openActivity(
+                                IntentUtils.openActivity(
                                     context, SettingsActivity::class.java
                                 )
                             }
 
                             R.string.help_and_feedback -> {
-                                Utils.openActivity(
+                                IntentUtils.openActivity(
                                     context, HelpActivity::class.java
                                 )
                             }
 
                             R.string.updates -> {
-                                Utils.openUrl(
+                                IntentUtils.openUrl(
                                     context,
                                     "https://github.com/D4rK7355608/${context.packageName}/blob/master/CHANGELOG.md"
                                 )
                             }
 
                             R.string.share -> {
-                                Utils.shareApp(context)
+                                IntentUtils.shareApp(context)
                             }
                         }
                         scope.launch {
@@ -170,7 +170,7 @@ fun MainComposable() {
                 }
             }, actions = {
                 IconButton(onClick = {
-                    Utils.openActivity(context, SupportActivity::class.java)
+                    IntentUtils.openActivity(context, SupportActivity::class.java)
                 }) {
                     Icon(
                         Icons.Outlined.VolunteerActivism,

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/VersionInfoDialogComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/VersionInfoDialogComposable.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.BuildConfig
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.utils.toBitmapDrawable
+import com.d4rk.cleaner.utils.cleaning.toBitmapDrawable
 
 @Composable
 fun VersionInfoDialog(onDismiss: () -> Unit) {

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/help/HelpActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/help/HelpActivity.kt
@@ -9,7 +9,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import com.d4rk.cleaner.ui.settings.display.theme.style.AppTheme
-import com.d4rk.cleaner.utils.Utils
+import com.d4rk.cleaner.utils.IntentUtils
 import com.google.android.play.core.review.ReviewManager
 import com.google.android.play.core.review.ReviewManagerFactory
 
@@ -47,12 +47,12 @@ class HelpActivity : AppCompatActivity() {
         task.addOnSuccessListener { reviewInfo ->
             reviewManager.launchReviewFlow(this , reviewInfo)
         }.addOnFailureListener {
-            Utils.openUrl(
+            IntentUtils.openUrl(
                 this ,
                 "https://play.google.com/store/apps/details?id=${this.packageName}&showAllReviews=true"
             )
         }.addOnFailureListener {
-            Utils.sendEmailToDeveloper(this)
+            IntentUtils.sendEmailToDeveloper(this)
         }
     }
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/help/HelpComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/help/HelpComposable.kt
@@ -46,8 +46,8 @@ import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.ui.dialogs.VersionInfoDialog
-import com.d4rk.cleaner.utils.Utils
-import com.d4rk.cleaner.utils.bounceClick
+import com.d4rk.cleaner.utils.IntentUtils
+import com.d4rk.cleaner.utils.compose.bounceClick
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -71,7 +71,7 @@ fun HelpComposable(activity : HelpActivity) {
             DropdownMenu(expanded = showMenu , onDismissRequest = { showMenu = false }) {
                 DropdownMenuItem(text = { Text(stringResource(R.string.view_in_google_play_store)) } ,
                     onClick = {
-                        Utils.openUrl(
+                        IntentUtils.openUrl(
                             context ,
                             "https://play.google.com/store/apps/details?id=${activity.packageName}"
                         )
@@ -80,28 +80,28 @@ fun HelpComposable(activity : HelpActivity) {
                     onClick = { showDialog.value = true })
                 DropdownMenuItem(text = { Text(stringResource(R.string.beta_program)) } ,
                     onClick = {
-                        Utils.openUrl(
+                        IntentUtils.openUrl(
                             context ,
                             "https://play.google.com/apps/testing/${activity.packageName}"
                         )
                     })
                 DropdownMenuItem(text = { Text(stringResource(R.string.terms_of_service)) } ,
                     onClick = {
-                        Utils.openUrl(
+                        IntentUtils.openUrl(
                             context ,
                             "https://sites.google.com/view/d4rk7355608/more/apps/terms-of-service"
                         )
                     })
                 DropdownMenuItem(text = { Text(stringResource(R.string.privacy_policy)) } ,
                     onClick = {
-                        Utils.openUrl(
+                        IntentUtils.openUrl(
                             context ,
                             "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy"
                         )
                     })
                 DropdownMenuItem(text = { Text(stringResource(com.google.android.gms.oss.licenses.R.string.oss_license_title)) } ,
                     onClick = {
-                        Utils.openActivity(
+                        IntentUtils.openActivity(
                             context , OssLicensesMenuActivity::class.java
                         )
                     })

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
@@ -69,10 +69,10 @@ import coil.memory.MemoryCache
 import coil.request.ImageRequest
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.ui.dialogs.RescanAlertDialog
-import com.d4rk.cleaner.utils.CircularDeterminateIndicator
-import com.d4rk.cleaner.utils.bounceClick
-import com.d4rk.cleaner.utils.getFileIcon
-import com.d4rk.cleaner.utils.getVideoThumbnail
+import com.d4rk.cleaner.utils.compose.components.CircularDeterminateIndicator
+import com.d4rk.cleaner.utils.compose.bounceClick
+import com.d4rk.cleaner.utils.cleaning.getFileIcon
+import com.d4rk.cleaner.utils.cleaning.getVideoThumbnail
 import com.google.common.io.Files.getFileExtension
 import java.io.File
 

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeViewModel.kt
@@ -11,7 +11,7 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.d4rk.cleaner.data.datastore.DataStore
-import com.d4rk.cleaner.utils.FileScanner
+import com.d4rk.cleaner.utils.cleaning.FileScanner
 import com.d4rk.cleaner.utils.PermissionsUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -42,7 +42,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
 
     init {
         updateStorageInfo()
-        fileScanner = FileScanner(dataStoreInstance,application.resources)
+        fileScanner = FileScanner(dataStoreInstance, application.resources)
     }
 
     /**

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
@@ -64,9 +64,9 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.d4rk.cleaner.R
 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
+import com.d4rk.cleaner.utils.cleaning.FileUtils.formatSize
+import com.d4rk.cleaner.utils.compose.components.StorageProgressBar
+import com.d4rk.cleaner.utils.compose.bounceClick
 import kotlin.math.absoluteValue
 import kotlin.math.min
 

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/SettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/SettingsComposable.kt
@@ -30,8 +30,8 @@ import com.d4rk.cleaner.ui.settings.advanced.AdvancedSettingsActivity
 import com.d4rk.cleaner.ui.settings.cleaning.CleaningSettingsActivity
 import com.d4rk.cleaner.ui.settings.display.DisplaySettingsActivity
 import com.d4rk.cleaner.ui.settings.privacy.PrivacySettingsActivity
-import com.d4rk.cleaner.utils.PreferenceItem
-import com.d4rk.cleaner.utils.Utils
+import com.d4rk.cleaner.utils.compose.components.PreferenceItem
+import com.d4rk.cleaner.utils.IntentUtils
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -57,15 +57,15 @@ fun SettingsComposable(activity: SettingsActivity) {
                     title = stringResource(R.string.display),
                     summary = stringResource(R.string.summary_preference_settings_display),
                     onClick = {
-                        Utils.openActivity(context, DisplaySettingsActivity::class.java)
+                        IntentUtils.openActivity(context, DisplaySettingsActivity::class.java)
                     })
             }
             item {
                 PreferenceItem(Icons.Outlined.CleaningServices,
                     title = stringResource(R.string.cleaning),
                     summary = stringResource(R.string.summary_preference_settings_cleaning),
                     onClick = {
-                        Utils.openActivity(
+                        IntentUtils.openActivity(
                             context, CleaningSettingsActivity::class.java
                         )
                     })
@@ -75,15 +75,15 @@ fun SettingsComposable(activity: SettingsActivity) {
                     title = stringResource(R.string.notifications),
                     summary = stringResource(R.string.summary_preference_settings_notifications),
                     onClick = {
-                        Utils.openAppNotificationSettings(context)
+                        IntentUtils.openAppNotificationSettings(context)
                     })
             }
             item {
                 PreferenceItem(Icons.Outlined.Build,
                     title = stringResource(R.string.advanced),
                     summary = stringResource(R.string.summary_preference_settings_advanced),
                     onClick = {
-                        Utils.openActivity(
+                        IntentUtils.openActivity(
                             context, AdvancedSettingsActivity::class.java
                         )
                     })
@@ -93,15 +93,15 @@ fun SettingsComposable(activity: SettingsActivity) {
                     title = stringResource(R.string.security_and_privacy),
                     summary = stringResource(R.string.summary_preference_settings_privacy_and_security),
                     onClick = {
-                        Utils.openActivity(context, PrivacySettingsActivity::class.java)
+                        IntentUtils.openActivity(context, PrivacySettingsActivity::class.java)
                     })
             }
             item {
                 PreferenceItem(Icons.Outlined.Info,
                     title = stringResource(R.string.about),
                     summary = stringResource(R.string.summary_preference_settings_about),
                     onClick = {
-                        Utils.openActivity(context, AboutSettingsActivity::class.java)
+                        IntentUtils.openActivity(context, AboutSettingsActivity::class.java)
                     })
             }
         }

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/about/AboutSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/about/AboutSettingsComposable.kt
@@ -24,9 +24,9 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.d4rk.cleaner.BuildConfig
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.utils.PreferenceCategoryItem
-import com.d4rk.cleaner.utils.PreferenceItem
-import com.d4rk.cleaner.utils.Utils
+import com.d4rk.cleaner.utils.compose.components.PreferenceCategoryItem
+import com.d4rk.cleaner.utils.compose.components.PreferenceItem
+import com.d4rk.cleaner.utils.IntentUtils
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -62,7 +62,7 @@ fun AboutSettingsComposable(activity : AboutSettingsActivity) {
                 PreferenceItem(title = stringResource(com.google.android.gms.oss.licenses.R.string.oss_license_title) ,
                     summary = stringResource(R.string.summary_preference_settings_oss) ,
                     onClick = {
-                        Utils.openActivity(context , OssLicensesMenuActivity::class.java)
+                        IntentUtils.openActivity(context , OssLicensesMenuActivity::class.java)
                     })
             }
             item {

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/advanced/AdvancedSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/advanced/AdvancedSettingsComposable.kt
@@ -19,9 +19,9 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.utils.PreferenceCategoryItem
-import com.d4rk.cleaner.utils.PreferenceItem
-import com.d4rk.cleaner.utils.Utils
+import com.d4rk.cleaner.utils.compose.components.PreferenceCategoryItem
+import com.d4rk.cleaner.utils.compose.components.PreferenceItem
+import com.d4rk.cleaner.utils.IntentUtils
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -49,7 +49,7 @@ fun AdvancedSettingsComposable(activity : AdvancedSettingsActivity) {
                 PreferenceItem(title = stringResource(R.string.bug_report) ,
                     summary = stringResource(R.string.summary_preference_settings_bug_report) ,
                     onClick = {
-                        Utils.openUrl(
+                        IntentUtils.openUrl(
                             context ,
                             "https://github.com/D4rK7355608/${context.packageName}/issues/new"
                         )

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
@@ -22,8 +22,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.datastore.DataStore
-import com.d4rk.cleaner.utils.PreferenceCategoryItem
-import com.d4rk.cleaner.utils.SwitchPreferenceItem
+import com.d4rk.cleaner.utils.compose.components.PreferenceCategoryItem
+import com.d4rk.cleaner.utils.compose.components.SwitchPreferenceItem
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/display/DisplaySettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/display/DisplaySettingsComposable.kt
@@ -34,11 +34,11 @@ import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.ui.dialogs.LanguageDialog
 import com.d4rk.cleaner.ui.settings.display.theme.ThemeSettingsActivity
-import com.d4rk.cleaner.utils.PreferenceCategoryItem
-import com.d4rk.cleaner.utils.PreferenceItem
-import com.d4rk.cleaner.utils.SwitchPreferenceItem
-import com.d4rk.cleaner.utils.SwitchPreferenceItemWithDivider
-import com.d4rk.cleaner.utils.Utils
+import com.d4rk.cleaner.utils.compose.components.PreferenceCategoryItem
+import com.d4rk.cleaner.utils.compose.components.PreferenceItem
+import com.d4rk.cleaner.utils.compose.components.SwitchPreferenceItem
+import com.d4rk.cleaner.utils.compose.components.SwitchPreferenceItemWithDivider
+import com.d4rk.cleaner.utils.IntentUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -99,7 +99,7 @@ fun DisplaySettingsComposable(activity : DisplaySettingsActivity) {
                         }
                     } ,
                     onClick = {
-                        Utils.openActivity(
+                        IntentUtils.openActivity(
                             context , ThemeSettingsActivity::class.java
                         )
                     })

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/display/theme/ThemeSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/display/theme/ThemeSettingsComposable.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.datastore.DataStore
-import com.d4rk.cleaner.utils.SwitchCardComposable
+import com.d4rk.cleaner.utils.compose.components.SwitchCardComposable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch