Updated the libraries and some under the hood logic

D4rK7355608 · Jun 17, 2024 · 108e0b3 · 108e0b3
1 parent 9ac3b7f
commit 108e0b3
Show file tree

Hide file tree

Showing 35 changed files with 108 additions and 97 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/MainActivity.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/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.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import com.d4rk.cartcalculator.notifications.managers.AppUpdateNotificationsManager
 import com.d4rk.cartcalculator.notifications.managers.AppUsageNotificationsManager
 import com.d4rk.cartcalculator.ui.settings.display.theme.style.AppTheme

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ads/BannerAdsComposable.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/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.cartcalculator.constants.ads.AdsConstants
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.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/cartcalculator/constants/ads/AdsConstants.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/constants/ads/AdsConstants.kt
@@ -1,9 +1,20 @@
 package com.d4rk.cartcalculator.constants.ads
 
+import com.d4rk.cartcalculator.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/cartcalculator/data/core/AppCoreManager.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/data/core/AppCoreManager.kt
@@ -13,8 +13,8 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
 import androidx.room.Room
 import com.d4rk.cartcalculator.constants.ads.AdsConstants
-import com.d4rk.cartcalculator.data.db.AppDatabase
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.database.AppDatabase
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import com.d4rk.cartcalculator.notifications.managers.AppUsageNotificationsManager
 import com.google.android.gms.ads.AdError
 import com.google.android.gms.ads.AdRequest

diff --git a/...4rk/cartcalculator/data/db/AppDatabase.kt → ...rtcalculator/data/database/AppDatabase.kt b/...4rk/cartcalculator/data/db/AppDatabase.kt → ...rtcalculator/data/database/AppDatabase.kt
@@ -1,12 +1,12 @@
-package com.d4rk.cartcalculator.data.db
+package com.d4rk.cartcalculator.data.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.d4rk.cartcalculator.data.db.dao.NewCartDao
-import com.d4rk.cartcalculator.data.db.dao.ShoppingCartItemsDao
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartItemsTable
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartTable
+import com.d4rk.cartcalculator.data.database.dao.NewCartDao
+import com.d4rk.cartcalculator.data.database.dao.ShoppingCartItemsDao
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
 import com.d4rk.cartcalculator.data.repository.DateConverter
 
 @Database(entities = [ShoppingCartTable::class, ShoppingCartItemsTable::class], version = 2)

diff --git a/.../cartcalculator/data/db/dao/NewCartDao.kt → ...alculator/data/database/dao/NewCartDao.kt b/.../cartcalculator/data/db/dao/NewCartDao.kt → ...alculator/data/database/dao/NewCartDao.kt
@@ -1,10 +1,10 @@
-package com.d4rk.cartcalculator.data.db.dao
+package com.d4rk.cartcalculator.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
 
 @Dao
 interface NewCartDao {

diff --git a/...lator/data/db/dao/ShoppingCartItemsDao.kt → ...data/database/dao/ShoppingCartItemsDao.kt b/...lator/data/db/dao/ShoppingCartItemsDao.kt → ...data/database/dao/ShoppingCartItemsDao.kt
@@ -1,12 +1,12 @@
-package com.d4rk.cartcalculator.data.db.dao
+package com.d4rk.cartcalculator.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
 
 @Dao
 interface ShoppingCartItemsDao {

diff --git a/...r/data/db/table/ShoppingCartItemsTable.kt → .../database/table/ShoppingCartItemsTable.kt b/...r/data/db/table/ShoppingCartItemsTable.kt → .../database/table/ShoppingCartItemsTable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.data.db.table
+package com.d4rk.cartcalculator.data.database.table
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

diff --git a/...ulator/data/db/table/ShoppingCartTable.kt → .../data/database/table/ShoppingCartTable.kt b/...ulator/data/db/table/ShoppingCartTable.kt → .../data/database/table/ShoppingCartTable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.data.db.table
+package com.d4rk.cartcalculator.data.database.table
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

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

diff --git a/...c/main/kotlin/com/d4rk/cartcalculator/notifications/workers/AppUsageNotificationWorker.kt b/...c/main/kotlin/com/d4rk/cartcalculator/notifications/workers/AppUsageNotificationWorker.kt
@@ -7,7 +7,7 @@ import androidx.core.app.NotificationCompat
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.d4rk.cartcalculator.R
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartActivity.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartActivity.kt
@@ -9,7 +9,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.ViewModelProvider
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import com.d4rk.cartcalculator.ui.settings.display.theme.style.AppTheme
 import com.google.android.gms.ads.MobileAds
 

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartActivityComposable.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartActivityComposable.kt
@@ -45,10 +45,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.ads.BannerAdsComposable
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartItemsTable
-import com.d4rk.cartcalculator.data.store.DataStore
-import com.d4rk.cartcalculator.dialogs.DeleteCartItemDialog
-import com.d4rk.cartcalculator.dialogs.NewCartItemDialog
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.data.datastore.DataStore
+import com.d4rk.cartcalculator.ui.dialogs.DeleteCartItemDialog
+import com.d4rk.cartcalculator.ui.dialogs.NewCartItemDialog
 import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartViewModel.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartViewModel.kt
@@ -8,9 +8,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.d4rk.cartcalculator.data.core.AppCoreManager
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartItemsTable
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartTable
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
@@ -76,17 +76,17 @@ class CartViewModel(private val cartId: Int, private val dataStore: DataStore) :
     }
 
     /**
-     * Loads the selected currency from the data store and updates the UI state.
+     * Loads the selected currency from the data datastore and updates the UI state.
      *
      * This function is called during the initialization of the ViewModel. It launches a coroutine in the ViewModel's scope.
      * In the coroutine, it performs the following operations:
-     * 1. Fetches the selected currency from the data store.
+     * 1. Fetches the selected currency from the data datastore.
      * 2. If a currency is found, it sets the `selectedCurrency` state to the fetched currency.
      * 3. If no currency is found, it sets the `selectedCurrency` state to an empty string.
      *
-     * Note: The data store operation is performed asynchronously to avoid blocking the main thread.
+     * Note: The data datastore operation is performed asynchronously to avoid blocking the main thread.
      *
-     * @throws Exception If there is an error while fetching the selected currency from the data store.
+     * @throws Exception If there is an error while fetching the selected currency from the data datastore.
      */
     private fun loadSelectedCurrency() {
         viewModelScope.launch {

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartViewModelFactory.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/cart/CartViewModelFactory.kt
@@ -2,7 +2,7 @@ package com.d4rk.cartcalculator.ui.cart
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.datastore.DataStore
 
 /**
  * Factory class for creating instances of [CartViewModel].

diff --git a/...lator/dialogs/CurrencyDialogComposable.kt → ...or/ui/dialogs/CurrencyDialogComposable.kt b/...lator/dialogs/CurrencyDialogComposable.kt → ...or/ui/dialogs/CurrencyDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.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.cartcalculator.R
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import kotlinx.coroutines.flow.firstOrNull
 
 @Composable

diff --git a/...tor/dialogs/DeleteCartDialogComposable.kt → .../ui/dialogs/DeleteCartDialogComposable.kt b/...tor/dialogs/DeleteCartDialogComposable.kt → .../ui/dialogs/DeleteCartDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.ui.dialogs
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
 
 @Composable
 fun DeleteCartDialog(

diff --git a/...dialogs/DeleteCartItemDialogComposable.kt → ...dialogs/DeleteCartItemDialogComposable.kt b/...dialogs/DeleteCartItemDialogComposable.kt → ...dialogs/DeleteCartItemDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.ui.dialogs
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
 
 @Composable
 fun DeleteCartItemDialog(

diff --git a/...lator/dialogs/LanguageDialogComposable.kt → ...or/ui/dialogs/LanguageDialogComposable.kt b/...lator/dialogs/LanguageDialogComposable.kt → ...or/ui/dialogs/LanguageDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.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.cartcalculator.R
-import com.d4rk.cartcalculator.data.store.DataStore
+import com.d4rk.cartcalculator.data.datastore.DataStore
 import kotlinx.coroutines.flow.firstOrNull
 
 @Composable

diff --git a/...ulator/dialogs/NewCartDialogComposable.kt → ...tor/ui/dialogs/NewCartDialogComposable.kt b/...ulator/dialogs/NewCartDialogComposable.kt → ...tor/ui/dialogs/NewCartDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.ui.dialogs
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -23,7 +23,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.data.core.AppCoreManager
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.Date

diff --git a/...or/dialogs/NewCartItemDialogComposable.kt → ...ui/dialogs/NewCartItemDialogComposable.kt b/...or/dialogs/NewCartItemDialogComposable.kt → ...ui/dialogs/NewCartItemDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.ui.dialogs
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -22,7 +22,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
-import com.d4rk.cartcalculator.data.db.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
 
 @Composable
 fun NewCartItemDialog(

diff --git a/...or/dialogs/VersionInfoDialogComposable.kt → ...ui/dialogs/VersionInfoDialogComposable.kt b/...or/dialogs/VersionInfoDialogComposable.kt → ...ui/dialogs/VersionInfoDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cartcalculator.dialogs
+package com.d4rk.cartcalculator.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.cartcalculator.BuildConfig
 import com.d4rk.cartcalculator.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}")
     }
 }