fix: math on add expense screen

app/src/main/java/cc/n0th1ng/tripmoney/screens/addexpense/AddExpenseBottomSheet.kt

@@ -115,10 +115,6 @@ fun AddExpenseBottomSheet(
 ) {
     val currentTripId = currentTrip.id
 
-//    if (categories.isEmpty()) {
-//        return
-//    }
-
     var amount by remember {
         mutableStateOf(
             "%.2f".format(expenseDtoToEdit?.expense?.amount ?: 0.00)
@@ -139,7 +135,7 @@ fun AddExpenseBottomSheet(
         )
     }
     var category by remember {
-        mutableStateOf<Category?>(
+        mutableStateOf(
             expenseDtoToEdit?.category ?: if (categories.isEmpty()) null else categories[0]
         )
     }
@@ -484,12 +480,20 @@ fun NumberKeyboard(
                             modifier = Modifier
                                 .weight(1f),
                             containerColor = Color.Transparent,
-                            onLongClick = onLongBackspaceClick
+                            onLongClick = onLongBackspaceClick,
+                            contentColor = MaterialTheme.colorScheme.onPrimaryContainer
                         )
 
                         "+", "÷", "−", "×" -> KeyboardButton(
                             text = key,
-                            onClick = { onOperatorClick(key) },
+                            onClick = {
+                                when (key) {
+                                    "+" -> onOperatorClick("+")
+                                    "÷" -> onOperatorClick("/")
+                                    "−" -> onOperatorClick("-")
+                                    "×" -> onOperatorClick("*")
+                                }
+                            },
                             modifier = Modifier.weight(1f),
                             containerColor = MaterialTheme.colorScheme.tertiaryContainer,
                             contentColor = MaterialTheme.colorScheme.onTertiaryContainer
@@ -500,7 +504,7 @@ fun NumberKeyboard(
                             onClick = { onNumberClick(key) },
                             modifier = Modifier.weight(1f),
                             containerColor = Color.Transparent,
-                            contentColor = MaterialTheme.colorScheme.onSecondary
+                            contentColor = MaterialTheme.colorScheme.onPrimaryContainer
                         )
                     }
                 }
@@ -532,7 +536,8 @@ fun KeyboardButton(
         when {
             text != null -> Text(
                 text = text,
-                style = MaterialTheme.typography.headlineMedium
+                style = MaterialTheme.typography.headlineMedium,
+                color = contentColor
             )
 
             icon != null -> Icon(painter = icon, contentDescription = null)

app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -22,6 +21,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -400,20 +401,22 @@ fun DeleteConfirmationDialog(
                     .fillMaxWidth()
                     .padding(top = 24.dp)
             ) {
-                Text(
+                Button(
-                    text = stringResource(string.cancel),
+                    modifier = Modifier.padding(end = 20.dp),
-                    style = MaterialTheme.typography.titleMedium,
+                    onClick = onCancel
-                    color = MaterialTheme.colorScheme.onSecondaryContainer,
+                ) {
-                    modifier = Modifier
+                    Text(stringResource(string.cancel))
-                        .padding(end = 24.dp)
+                }
-                        .clickable { onCancel() }
+
-                )
+                Button(
-                Text(
+                    onClick = onConfirm,
-                    text = stringResource(string.delete),
+                    colors = ButtonDefaults.buttonColors(
-                    color = MaterialTheme.colorScheme.error,
+                        containerColor = MaterialTheme.colorScheme.error,
-                    style = MaterialTheme.typography.titleMedium,
+                        contentColor = MaterialTheme.colorScheme.onError
-                    modifier = Modifier.clickable { onConfirm() }
                     )
+                ) {
+                    Text(stringResource(string.delete))
+                }
             }
         }
     }

app/src/main/java/cc/n0th1ng/tripmoney/screens/managecategories/ManageCategoriesScreen.kt

@@ -230,7 +230,7 @@ fun SwipeToDeleteExpenseCard(
                 Modifier
                     .clip(CardDefaults.elevatedShape)
                     .fillMaxSize()
-                    .background(MaterialTheme.colorScheme.onError)
+                    .background(MaterialTheme.colorScheme.errorContainer)
                     .padding(horizontal = 20.dp),
                 contentAlignment = Alignment.CenterEnd
             ) {