Fix: Enable Both slot Flash options

Author: fatalcoder524

app/src/main/java/com/github/capntrips/kernelflasher/MainActivity.kt

@@ -197,75 +197,124 @@ class MainActivity : ComponentActivity() {
                     val rebootViewModel = mainViewModel.reboot
                     BackHandler(enabled = mainViewModel.isRefreshing, onBack = {})
                     val slotContentA: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_a"
                         val slotViewModel = slotViewModelA
-                        if (slotViewModel!!.wasFlashSuccess != null && listOf("slot_a", "slot").any { navController.currentDestination!!.route.equals(it) }) {
+                        if (slotViewModel!!.wasFlashSuccess != null && listOf("slot{slotSuffix}", "slot").any { navController.currentDestination!!.route.equals(it) }) {
                             slotViewModel.clearFlash(this@MainActivity)
                         }
                         RefreshableScreen(mainViewModel, navController, swipeEnabled = true) {
-                            SlotContent(slotViewModel, "_a", navController)
+                            SlotContent(slotViewModel, slotSuffix, navController)
                         }
 
                     }
                     val slotContentB: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_b"
                         val slotViewModel = slotViewModelB
-                        if (slotViewModel!!.wasFlashSuccess != null && listOf("slot_b", "slot").any { navController.currentDestination!!.route.equals(it) }) {
+                        if (slotViewModel!!.wasFlashSuccess != null && listOf("slot{slotSuffix}", "slot").any { navController.currentDestination!!.route.equals(it) }) {
                             slotViewModel.clearFlash(this@MainActivity)
                         }
                         RefreshableScreen(mainViewModel, navController, swipeEnabled = true) {
-                            SlotContent(slotViewModel, "_b", navController)
+                            SlotContent(slotViewModel, slotSuffix, navController)
+                        }
+
+                    }
+                    val slotContent: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = ""
+                        val slotViewModel = slotViewModelA
+                        if (slotViewModel!!.wasFlashSuccess != null && listOf("slot{slotSuffix}", "slot").any { navController.currentDestination!!.route.equals(it) }) {
+                            slotViewModel.clearFlash(this@MainActivity)
+                        }
+                        RefreshableScreen(mainViewModel, navController, swipeEnabled = true) {
+                            SlotContent(slotViewModel, slotSuffix, navController)
                         }
 
                     }
                     val slotFlashContentA: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_a"
                         val slotViewModel = slotViewModelA
                         RefreshableScreen(mainViewModel, navController) {
-                            SlotFlashContent(slotViewModel!!, "_a", navController)
+                            SlotFlashContent(slotViewModel!!, slotSuffix, navController)
                         }
                     }
                     val slotFlashContentB: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_b"
                         val slotViewModel = slotViewModelB
                         RefreshableScreen(mainViewModel, navController) {
-                            SlotFlashContent(slotViewModel!!, "_b", navController)
+                            SlotFlashContent(slotViewModel!!, slotSuffix, navController)
+                        }
+                    }
+                    val slotFlashContent: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = ""
+                        val slotViewModel = slotViewModelA
+                        RefreshableScreen(mainViewModel, navController) {
+                            SlotFlashContent(slotViewModel!!, slotSuffix, navController)
                         }
                     }
                     val slotBackupsContentA: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_a"
                         val slotViewModel = slotViewModelA
                         if (backStackEntry.arguments?.getString("backupId") != null) {
                             backupsViewModel.currentBackup = backStackEntry.arguments?.getString("backupId")
                         } else {
                             backupsViewModel.clearCurrent()
                         }
                         RefreshableScreen(mainViewModel, navController) {
-                            SlotBackupsContent(slotViewModel!!, backupsViewModel, "_a", navController)
+                            SlotBackupsContent(slotViewModel!!, backupsViewModel, slotSuffix, navController)
                         }
                     }
                     val slotBackupsContentB: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_b"
                         val slotViewModel = slotViewModelB
                         if (backStackEntry.arguments?.getString("backupId") != null) {
                             backupsViewModel.currentBackup = backStackEntry.arguments?.getString("backupId")
                         } else {
                             backupsViewModel.clearCurrent()
                         }
                         RefreshableScreen(mainViewModel, navController) {
-                            SlotBackupsContent(slotViewModel!!, backupsViewModel, "_b", navController)
+                            SlotBackupsContent(slotViewModel!!, backupsViewModel, slotSuffix, navController)
+                        }
+                    }
+                    val slotBackupsContent: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = ""
+                        val slotViewModel = slotViewModelA
+                        if (backStackEntry.arguments?.getString("backupId") != null) {
+                            backupsViewModel.currentBackup = backStackEntry.arguments?.getString("backupId")
+                        } else {
+                            backupsViewModel.clearCurrent()
+                        }
+                        RefreshableScreen(mainViewModel, navController) {
+                            SlotBackupsContent(slotViewModel!!, backupsViewModel, slotSuffix, navController)
                         }
                     }
                     val slotBackupFlashContentA: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_a"
                         val slotViewModel = slotViewModelA
                         backupsViewModel.currentBackup = backStackEntry.arguments?.getString("backupId")
                         if (backupsViewModel.backups.containsKey(backupsViewModel.currentBackup)) {
                             RefreshableScreen(mainViewModel, navController) {
-                                SlotFlashContent(slotViewModel!!, "_a", navController)
+                                SlotFlashContent(slotViewModel!!, slotSuffix, navController)
                             }
                         }
 
                     }
                     val slotBackupFlashContentB: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = "_b"
                         val slotViewModel = slotViewModelB
                         backupsViewModel.currentBackup = backStackEntry.arguments?.getString("backupId")
                         if (backupsViewModel.backups.containsKey(backupsViewModel.currentBackup)) {
                             RefreshableScreen(mainViewModel, navController) {
-                                SlotFlashContent(slotViewModel!!, "_b", navController)
+                                SlotFlashContent(slotViewModel!!, slotSuffix, navController)
+                            }
+                        }
+
+                    }
+                    val slotBackupFlashContent: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit = { backStackEntry ->
+                        val slotSuffix = ""
+                        val slotViewModel = slotViewModelA
+                        backupsViewModel.currentBackup = backStackEntry.arguments?.getString("backupId")
+                        if (backupsViewModel.backups.containsKey(backupsViewModel.currentBackup)) {
+                            RefreshableScreen(mainViewModel, navController) {
+                                SlotFlashContent(slotViewModel!!, slotSuffix, navController)
                             }
                         }