Updated project structure

D4rK7355608 · Jun 18, 2024 · 4e5c1ff · 4e5c1ff
1 parent f1da204
commit 4e5c1ff
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 48 deletions.
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/MainActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/MainActivity.kt
@@ -13,7 +13,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
 import com.android.volley.NoConnectionError
 import com.android.volley.TimeoutError
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.notifications.managers.AppUpdateNotificationsManager
 import com.d4rk.cleaner.notifications.managers.AppUsageNotificationsManager
 import com.d4rk.cleaner.ui.settings.display.theme.style.AppTheme

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ads/BannerAdsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ads/BannerAdsComposable.kt
@@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
 import com.d4rk.cleaner.constants.ads.AdsConstants
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.AdSize
 import com.google.android.gms.ads.AdView

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/constants/ads/AdsConstants.kt b/app/src/main/kotlin/com/d4rk/cleaner/constants/ads/AdsConstants.kt
@@ -1,9 +1,20 @@
 package com.d4rk.cleaner.constants.ads
 
+import com.d4rk.cleaner.BuildConfig
+
 object AdsConstants {
-    const val BANNER_AD_UNIT_ID = "ca-app-pub-5294151573817700/8040893463"
-    const val BANNER_AD_UNIT_ID_TEST = "ca-app-pub-3940256099942544/6300978111"
 
-    const val APP_OPEN_UNIT_ID = "ca-app-pub-5294151573817700/9208287867"
-    const val APP_OPEN_UNIT_ID_TEST = "ca-app-pub-3940256099942544/9257395921"
+    val BANNER_AD_UNIT_ID: String
+        get() = if (BuildConfig.DEBUG) {
+            "ca-app-pub-3940256099942544/6300978111"
+        } else {
+            "ca-app-pub-5294151573817700/8040893463"
+        }
+
+    val APP_OPEN_UNIT_ID: String
+        get() = if (BuildConfig.DEBUG) {
+            "ca-app-pub-3940256099942544/9257395921"
+        } else {
+            "ca-app-pub-5294151573817700/9208287867"
+        }
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/core/AppCoreManager.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/core/AppCoreManager.kt
@@ -12,7 +12,7 @@ import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
 import com.d4rk.cleaner.constants.ads.AdsConstants
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.notifications.managers.AppUsageNotificationsManager
 import com.google.android.gms.ads.AdError
 import com.google.android.gms.ads.AdRequest

diff --git a/.../com/d4rk/cleaner/data/store/DataStore.kt → .../d4rk/cleaner/data/datastore/DataStore.kt b/.../com/d4rk/cleaner/data/store/DataStore.kt → .../d4rk/cleaner/data/datastore/DataStore.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.data.store
+package com.d4rk.cleaner.data.datastore
 
 import android.content.Context
 import androidx.compose.runtime.mutableStateOf

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
@@ -7,7 +7,7 @@ import androidx.core.app.NotificationCompat
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 

diff --git a/...eaner/dialogs/LanguageDialogComposable.kt → ...er/ui/dialogs/LanguageDialogComposable.kt b/...eaner/dialogs/LanguageDialogComposable.kt → ...er/ui/dialogs/LanguageDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.dialogs
+package com.d4rk.cleaner.ui.dialogs
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -29,7 +29,7 @@ import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import kotlinx.coroutines.flow.firstOrNull
 
 @Composable

diff --git a/...k/cleaner/dialogs/RequireRestartDialog.kt → ...leaner/ui/dialogs/RequireRestartDialog.kt b/...k/cleaner/dialogs/RequireRestartDialog.kt → ...leaner/ui/dialogs/RequireRestartDialog.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.dialogs
+package com.d4rk.cleaner.ui.dialogs
 
 import android.app.Dialog
 import android.app.NotificationManager

diff --git a/...er/dialogs/VersionInfoDialogComposable.kt → ...ui/dialogs/VersionInfoDialogComposable.kt b/...er/dialogs/VersionInfoDialogComposable.kt → ...ui/dialogs/VersionInfoDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.dialogs
+package com.d4rk.cleaner.ui.dialogs
 
 import android.content.res.Resources
 import android.graphics.Bitmap
@@ -21,71 +21,72 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.BuildConfig
 import com.d4rk.cleaner.R
 
 @Composable
 fun VersionInfoDialog(onDismiss: () -> Unit) {
-    AlertDialog(onDismissRequest = onDismiss,
+    AlertDialog(
+        onDismissRequest = onDismiss,
         text = { VersionInfoContent() },
         confirmButton = {},
-        dismissButton = {})
+    )
 }
 
 @Composable
 fun VersionInfoContent() {
     val context = LocalContext.current
     val appName = context.getString(R.string.app_name)
-    val version = String.format(context.getString(R.string.version), BuildConfig.VERSION_NAME)
+    val versionName = BuildConfig.VERSION_NAME
+    val versionString =
+        stringResource(R.string.version, versionName)
     val copyright = context.getString(R.string.copyright)
 
     val appIcon = context.packageManager.getApplicationIcon(context.packageName)
-    val bitmapDrawable = convertAdaptiveIconDrawableToBitmap(appIcon)
+    val bitmapDrawable = appIcon.toBitmapDrawable()
 
     Row(
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier
+            .fillMaxWidth()
     ) {
         Image(
             bitmap = bitmapDrawable.bitmap.asImageBitmap(),
             contentDescription = null,
             modifier = Modifier.size(48.dp)
         )
-        Spacer(modifier = Modifier.width(24.dp))
+        Spacer(modifier = Modifier.width(16.dp))
         Column {
             Text(
                 text = appName,
-                style = MaterialTheme.typography.titleLarge,
+                style = MaterialTheme.typography.titleLarge
             )
             Text(
-                text = version, style = MaterialTheme.typography.bodyMedium
+                text = versionString,
+                style = MaterialTheme.typography.bodyMedium
             )
-            Spacer(modifier = Modifier.height(24.dp))
+            Spacer(modifier = Modifier.height(16.dp))
             Text(
-                text = copyright, style = MaterialTheme.typography.bodyMedium
+                text = copyright,
+                style = MaterialTheme.typography.bodyMedium
             )
         }
     }
 }
 
-fun convertAdaptiveIconDrawableToBitmap(drawable: Drawable): BitmapDrawable {
-    return when (drawable) {
-        is BitmapDrawable -> {
-            drawable
-        }
-
+fun Drawable.toBitmapDrawable(): BitmapDrawable {
+    return when (this) {
+        is BitmapDrawable -> this
         is AdaptiveIconDrawable -> {
-            val bitmap = Bitmap.createBitmap(
-                drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888
-            )
+            val bitmap =
+                Bitmap.createBitmap(intrinsicWidth, intrinsicHeight, Bitmap.Config.ARGB_8888)
             val canvas = Canvas(bitmap)
-            drawable.setBounds(0, 0, canvas.width, canvas.height)
-            drawable.draw(canvas)
+            setBounds(0, 0, canvas.width, canvas.height)
+            draw(canvas)
             BitmapDrawable(Resources.getSystem(), bitmap)
         }
 
-        else -> {
-            throw IllegalArgumentException("Unsupported drawable type")
-        }
+        else -> throw IllegalArgumentException("Unsupported drawable type: ${this::class.java.name}")
     }
 }
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
@@ -45,7 +45,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.dialogs.VersionInfoDialog
+import com.d4rk.cleaner.ui.dialogs.VersionInfoDialog
 import com.d4rk.cleaner.utils.Utils
 import com.d4rk.cleaner.utils.bounceClick
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity

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
@@ -9,7 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.utils.FileScanner
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

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
@@ -21,7 +21,7 @@ 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.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.utils.PreferenceCategoryItem
 import com.d4rk.cleaner.utils.SwitchPreferenceItem
 import kotlinx.coroutines.CoroutineScope

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
@@ -31,8 +31,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.core.os.LocaleListCompat
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
-import com.d4rk.cleaner.dialogs.LanguageDialog
+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

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
@@ -32,7 +32,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.utils.SwitchCardComposable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/display/theme/style/Theme.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/display/theme/style/Theme.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.core.view.WindowCompat
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 
 
 private val lightScheme = lightColorScheme(

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/privacy/ads/AdsSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/settings/privacy/ads/AdsSettingsComposable.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.utils.PreferenceItem
 import com.d4rk.cleaner.utils.SwitchCardComposable
 import com.d4rk.cleaner.utils.Utils

diff --git a/...c/main/kotlin/com/d4rk/cleaner/ui/settings/privacy/usage/UsageAndDiagnosticsComposable.kt b/...c/main/kotlin/com/d4rk/cleaner/ui/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.utils.SwitchCardComposable
 import com.d4rk.cleaner.utils.Utils
 import kotlinx.coroutines.Dispatchers

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/utils/FileScanner.kt b/app/src/main/kotlin/com/d4rk/cleaner/utils/FileScanner.kt
@@ -3,7 +3,7 @@ package com.d4rk.cleaner.utils
 import android.content.res.Resources
 import android.os.Environment
 import com.d4rk.cleaner.R
-import com.d4rk.cleaner.data.store.DataStore
+import com.d4rk.cleaner.data.datastore.DataStore
 import kotlinx.coroutines.flow.first
 import java.io.File
 
@@ -34,7 +34,7 @@ class FileScanner(private val dataStore: DataStore, private val resources: Resou
     }
 
     /**
-     * Loads user preferences from the data store into the [preferences] map.
+     * Loads user preferences from the data datastore into the [preferences] map.
      *
      * The preferences include whether to filter generic files, archive files, APK files, audio files, video files, and image files.
      */