Enable Both slot Flash options (Add Inactive slot flash warning) : Try 19

Author: fatalcoder524

app/src/main/java/com/github/capntrips/kernelflasher/ui/components/DialogButton.kt

@@ -0,0 +1,32 @@
+package com.github.capntrips.kernelflasher.ui.components
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import com.github.capntrips.kernelflasher.R
+
+@Composable
+fun DialogButton(
+	buttonText: String,
+    onClick: () -> Unit
+) {
+    TextButton(
+        modifier = Modifier.padding(0.dp),
+        shape = RoundedCornerShape(4.0.dp),
+        contentPadding = PaddingValues(
+            horizontal = ButtonDefaults.ContentPadding.calculateLeftPadding(LayoutDirection.Ltr) - (6.667).dp,
+            vertical = ButtonDefaults.ContentPadding.calculateTopPadding()
+        ),
+        onClick = onClick
+    ) {
+        Text(stringResource(R.string.view), maxLines = 1)
+    }
+}

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotFlashContent.kt

@@ -51,7 +51,6 @@ fun ColumnScope.SlotFlashContent(
     navController: NavController
 ) {
     val context = LocalContext.current
-	val showDialog by viewModel.showCautionDialog.observeAsState()
 
     if (!listOf("/flash/ak3", "/flash/image/flash", "/backup/backup").any { navController.currentDestination!!.route!!.endsWith(it) }) {
         SlotCard(
@@ -176,7 +175,7 @@ fun ColumnScope.SlotFlashContent(
                             }
                         }
                     }
-					if (navController.currentDestination!!.route!!.contains("ak3") && viewModel.wasFlashSuccess == true && viewModel.showCautionDialog.value == true){
+					if (navController.currentDestination!!.route!!.contains("ak3") && viewModel.wasFlashSuccess == true && viewModel.showCautionDialog == true){
 						AlertDialog(
 							onDismissRequest = { viewModel.hideCautionDialog() },
 							title = { Text("CAUTION", style = MaterialTheme.typography.titleLarge) },
@@ -189,27 +188,22 @@ fun ColumnScope.SlotFlashContent(
 								}
 							},
 							confirmButton = {
-								OutlinedButton(
-									onClick = {
+								DialogButton(
+									"CHANGE SLOT",
+									{
 										viewModel.hideCautionDialog()
 										viewModel.switchSlot(context)
-									},
-									shape = RoundedCornerShape(4.dp),
-									colors = ButtonDefaults.outlinedButtonColors()
-								) {
-									Text("CHANGE SLOT")
-								}
+									}
+								)
 							},
 							dismissButton = {
-								OutlinedButton(
-									onClick = { viewModel.hideCautionDialog() },
-									shape = RoundedCornerShape(4.dp)
-								) {
-									Text("CANCEL")
-								}
+								DialogButton(
+									"CANCEL",
+									{
+										viewModel.hideCautionDialog()
+									}
+								)
 							},
-							containerColor = MaterialTheme.colorScheme.surface,
-							contentColor = MaterialTheme.colorScheme.onSurface,
 							modifier = Modifier.padding(16.dp)
 						)
 					}

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotViewModel.kt

@@ -84,7 +84,7 @@ class SlotViewModel(
     val error: String
         get() = _error!!
 	val showCautionDialog: Boolean
-		get() = _showCautionDialog
+		get() = _showCautionDialog.value
 
     init {
         refresh(context)