diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt index a31d1fb..662b3b6 100644 --- a/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt +++ b/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( - text = stringResource(string.cancel), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSecondaryContainer, - modifier = Modifier - .padding(end = 24.dp) - .clickable { onCancel() } - ) - Text( - text = stringResource(string.delete), - color = MaterialTheme.colorScheme.error, - style = MaterialTheme.typography.titleMedium, - modifier = Modifier.clickable { onConfirm() } - ) + Button( + modifier = Modifier.padding(end = 20.dp), + onClick = onCancel + ) { + Text(stringResource(string.cancel)) + } + + Button( + onClick = onConfirm, + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.error, + contentColor = MaterialTheme.colorScheme.onError + ) + ) { + Text(stringResource(string.delete)) + } } } } diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/managecategories/ManageCategoriesScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/managecategories/ManageCategoriesScreen.kt index 1bc595a..688b276 100644 --- a/app/src/main/java/cc/n0th1ng/tripmoney/screens/managecategories/ManageCategoriesScreen.kt +++ b/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 ) {