refactor: Updated string resources, improved error handling, added er…

…ror dialogs, and enhanced cart item management Significantly improved error handling, user experience, and cart item management: - Updated all string resources for better clarity, consistency, and localization. - Enhanced the app's error handling mechanism for better user experience. - Added informative error dialogs to provide users with clear and actionable feedback in case of issues. - Added a new option to edit an entire cart item via swiping it, providing users with more flexibility.
D4rK7355608 · Jan 1, 2025 · d231f70 · d231f70
1 parent d158292
commit d231f70
Show file tree

Hide file tree

Showing 11 changed files with 154 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Version 1.2.0:
 
+- **New**: Added a new option to edit an entire cart item via swiping it, providing users with more flexibility.
 - **New**: Added an "Open Cart After Creation" feature in settings, allowing you to automatically
   view newly created carts.
 - **Minor**: Improved UI handling when the keyboard appears, ensuring smoother interactions during

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,7 +15,7 @@ android {
         applicationId = "com.d4rk.cartcalculator"
         minSdk = 23
         targetSdk = 35
-        versionCode = 78
+        versionCode = 79
         versionName = "1.2.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(

diff --git a/...ator/data/model/ui/screens/UiCartModel.kt → ...tor/data/model/ui/screens/UiCartScreen.kt b/...ator/data/model/ui/screens/UiCartModel.kt → ...tor/data/model/ui/screens/UiCartScreen.kt
@@ -3,13 +3,15 @@ package com.d4rk.cartcalculator.data.model.ui.screens
 import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
 import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
 
-data class UiCartModel(
+data class UiCartScreen(
     val selectedCurrency: String = "" ,
     val totalPrice: Double = 0.0 ,
     val cartItems: List<ShoppingCartItemsTable> = emptyList() ,
     val cart: ShoppingCartTable? = null ,
+    val currentCartItemForEdit: ShoppingCartItemsTable? = null,
     val openDialog: Boolean = false ,
     val openDeleteDialog: Boolean = false ,
+    val openEditDialog: Boolean = false,
     val currentCartItemForDeletion: ShoppingCartItemsTable? = null ,
     val itemQuantities: Map<Int, Int> = emptyMap()
 )
diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/AddNewCartAlertDialog.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/AddNewCartAlertDialog.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
+import com.d4rk.cartcalculator.ui.components.spacers.MediumVerticalSpacer
 import java.util.Date
 
 @Composable
@@ -86,7 +87,7 @@ fun AddNewCartAlertDialogContent(
                           placeholder = { Text(text = stringResource(id = R.string.shopping_cart)) })
         Spacer(modifier = Modifier.height(24.dp))
         Icon(imageVector = Icons.Outlined.Info , contentDescription = null)
-        Spacer(modifier = Modifier.height(12.dp))
+        MediumVerticalSpacer()
         Text(text = stringResource(id = R.string.summary_cart_dialog))
     }
     newCart.value =

diff --git a/...rc/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/AddNewCartItemAlertDialog.kt b/...rc/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/AddNewCartItemAlertDialog.kt
@@ -29,15 +29,31 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.ui.components.spacers.MediumVerticalSpacer
 
 @Composable
 fun AddNewCartItemAlertDialog(
-    cartId : Int , onDismiss : () -> Unit , onCartCreated : (ShoppingCartItemsTable) -> Unit
+    cartId : Int ,
+    onDismiss : () -> Unit ,
+    onCartCreated : (ShoppingCartItemsTable) -> Unit ,
+    existingCartItem : ShoppingCartItemsTable? = null
 ) {
+
     val newCartItem : MutableState<ShoppingCartItemsTable?> =
             remember { mutableStateOf(value = null) }
+    val initialName : String = existingCartItem?.name ?: ""
+    val initialPrice : String = existingCartItem?.price ?: ""
+    val initialQuantity : String = existingCartItem?.quantity?.toString() ?: ""
+
     AlertDialog(onDismissRequest = onDismiss , text = {
-        AddNewCartItemAlertDialogContent(cartId = cartId , newCartItem = newCartItem)
+        AddNewCartItemAlertDialogContent(
+            cartId = cartId ,
+            newCartItem = newCartItem ,
+            initialName = initialName ,
+            initialPrice = initialPrice ,
+            initialQuantity = initialQuantity ,
+            existingCartItem = existingCartItem
+        )
     } , icon = {
         Icon(
             Icons.Outlined.ShoppingBag , contentDescription = null
@@ -61,11 +77,16 @@ fun AddNewCartItemAlertDialog(
 
 @Composable
 fun AddNewCartItemAlertDialogContent(
-    cartId : Int , newCartItem : MutableState<ShoppingCartItemsTable?>
+    cartId : Int ,
+    newCartItem : MutableState<ShoppingCartItemsTable?> ,
+    initialName : String ,
+    initialPrice : String ,
+    initialQuantity : String ,
+    existingCartItem : ShoppingCartItemsTable?
 ) {
-    val nameText : MutableState<String> = remember { mutableStateOf(value = "") }
-    val priceText : MutableState<String> = remember { mutableStateOf(value = "") }
-    val quantityText : MutableState<String> = remember { mutableStateOf(value = "") }
+    val nameText : MutableState<String> = remember { mutableStateOf(value = initialName) }
+    val priceText : MutableState<String> = remember { mutableStateOf(value = initialPrice) }
+    val quantityText : MutableState<String> = remember { mutableStateOf(value = initialQuantity) }
 
     val nameFocusRequester : FocusRequester = remember { FocusRequester() }
     val priceFocusRequester : FocusRequester = remember { FocusRequester() }
@@ -113,21 +134,29 @@ fun AddNewCartItemAlertDialogContent(
 
         Spacer(modifier = Modifier.height(height = 24.dp))
         Icon(imageVector = Icons.Outlined.Info , contentDescription = null)
-        Spacer(modifier = Modifier.height(height = 12.dp))
+        MediumVerticalSpacer()
         Text(text = stringResource(id = R.string.dialog_info_cart_item))
     }
 
     if (nameText.value.isNotBlank() && priceText.value.isNotBlank() && quantityText.value.isNotBlank()) {
-        val price : Double? =
-                priceText.value.replace(oldChar = ',' , newChar = '.').toDoubleOrNull()
+        val price : Double? = priceText.value.replace(oldChar = ',' , newChar = '.').toDoubleOrNull()
         val quantity : Int? = quantityText.value.toIntOrNull()
         if (price != null && quantity != null) {
-            newCartItem.value = ShoppingCartItemsTable(
-                cartId = cartId ,
-                name = nameText.value ,
-                price = price.toString() ,
-                quantity = quantity
-            )
+            newCartItem.value = if (existingCartItem != null) {
+                val updatedItem = existingCartItem.copy(
+                    name = nameText.value , price = price.toString() , quantity = quantity
+                )
+                updatedItem
+            }
+            else {
+                val newItem = ShoppingCartItemsTable(
+                    cartId = cartId ,
+                    name = nameText.value ,
+                    price = price.toString() ,
+                    quantity = quantity
+                )
+                newItem
+            }
         }
         else {
             newCartItem.value = null

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/DeleteCartAlertDialog.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/DeleteCartAlertDialog.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.data.database.table.ShoppingCartTable
+import com.d4rk.cartcalculator.ui.components.spacers.MediumVerticalSpacer
 
 @Composable
 fun DeleteCartAlertDialog(
@@ -61,7 +62,7 @@ fun DeleteCartAlertDialogContent(cart : ShoppingCartTable?) {
         )
         Spacer(modifier = Modifier.height(height = 24.dp))
         Icon(imageVector = Icons.Outlined.Info , contentDescription = null)
-        Spacer(modifier = Modifier.height(height = 12.dp))
+        MediumVerticalSpacer()
         Text(
             text = stringResource(id= R.string.delete_cart_warning , cart?.name ?: "") ,
             style = MaterialTheme.typography.bodyLarge

diff --git a/...rc/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/DeleteCartItemAlertDialog.kt b/...rc/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/DeleteCartItemAlertDialog.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.data.database.table.ShoppingCartItemsTable
+import com.d4rk.cartcalculator.ui.components.spacers.MediumVerticalSpacer
 
 @Composable
 fun DeleteCartItemAlertDialog(
@@ -65,7 +66,7 @@ fun DeleteCartItemAlertDialogContent(cartItem: ShoppingCartItemsTable) {
         )
         Spacer(modifier = Modifier.height(24.dp))
         Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
-        Spacer(modifier = Modifier.height(12.dp))
+        MediumVerticalSpacer()
         Text(
             text = stringResource(id= R.string.delete_cart_item_warning, cartItem.name),
             style = MaterialTheme.typography.bodyLarge

diff --git a/...rc/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/SelectCurrencyAlertDialog.kt b/...rc/main/kotlin/com/d4rk/cartcalculator/ui/components/dialogs/SelectCurrencyAlertDialog.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cartcalculator.R
 import com.d4rk.cartcalculator.data.datastore.DataStore
+import com.d4rk.cartcalculator.ui.components.spacers.MediumVerticalSpacer
 import kotlinx.coroutines.flow.firstOrNull
 
 @Composable
@@ -96,7 +97,7 @@ fun SelectCurrencyAlertDialogContent(
         }
         Spacer(modifier = Modifier.height(height = 24.dp))
         Icon(imageVector = Icons.Outlined.Info , contentDescription = null)
-        Spacer(modifier = Modifier.height(height = 12.dp))
+        MediumVerticalSpacer()
         Text(text = stringResource(id = R.string.dialog_info_currency))
     }
 

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/components/preferences/Preferences.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/components/preferences/Preferences.kt
@@ -6,12 +6,10 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
@@ -33,6 +31,7 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.d4rk.cartcalculator.ui.components.spacers.LargeHorizontalSpacer
 
 /**
  * Creates a clickable card with a title and a switch for app preference screens.
@@ -157,7 +156,7 @@ fun PreferenceItem(
                 }) , verticalAlignment = Alignment.CenterVertically
     ) {
         icon?.let {
-            Spacer(modifier = Modifier.width(16.dp))
+            LargeHorizontalSpacer()
             Icon(it , contentDescription = null)
         }
         Column(
@@ -212,9 +211,9 @@ fun SwitchPreferenceItem(
                 }) , verticalAlignment = Alignment.CenterVertically
     ) {
         icon?.let {
-            Spacer(modifier = Modifier.width(16.dp))
+            LargeHorizontalSpacer()
             Icon(it , contentDescription = null)
-            Spacer(modifier = Modifier.width(16.dp))
+            LargeHorizontalSpacer()
         }
         Column(
             modifier = Modifier
@@ -270,9 +269,9 @@ fun SwitchPreferenceItemWithDivider(
                 }) , verticalAlignment = Alignment.CenterVertically
     ) {
         icon?.let {
-            Spacer(modifier = Modifier.width(16.dp))
+            LargeHorizontalSpacer()
             Icon(it , contentDescription = null)
-            Spacer(modifier = Modifier.width(16.dp))
+            LargeHorizontalSpacer()
         }
         Column(
             modifier = Modifier