fix: Remove mini-games and logs button from simple mode

Author: MarcaDian

app/src/main/java/app/morphe/manager/ui/screen/PatcherScreen.kt

@@ -460,7 +460,6 @@ fun PatcherScreen(
                             patchesProgress = patchesProgress,
                             patcherViewModel = patcherViewModel,
                             showLongStepWarning = showLongStepWarning,
-                            miniGameState = miniGameState,
                             onCancelClick = { state.showCancelDialog = true },
                             onHomeClick = onBackClick
                         )

app/src/main/java/app/morphe/manager/ui/screen/patcher/ExpertPatchingProgress.kt

@@ -769,10 +769,7 @@ private fun ExpertLogPanel(
             )
 
             when (activeTab) {
-                1 -> MiniGameContent(
-                    state = miniGameState,
-                    modifier = Modifier.fillMaxSize()
-                )
+                1 -> MiniGameContent(state = miniGameState)
                 else -> {
                     LazyColumn(
                         state = listState,

app/src/main/java/app/morphe/manager/ui/screen/patcher/PatcherStates.kt

@@ -196,7 +196,7 @@ fun PatchingSuccess(
         // Bottom action bar
         PatcherBottomActionBar(
             showCancelButton = false,
-            showLogsButton = true,
+            showLogsButton = isExpertMode,
             showHomeButton = true,
             showSaveButton = true,
             showErrorButton = false,

app/src/main/java/app/morphe/manager/ui/screen/patcher/SimplePatcherProgress.kt

@@ -8,17 +8,12 @@ package app.morphe.manager.ui.screen.patcher
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.SportsEsports
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
@@ -32,8 +27,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import app.morphe.manager.R
 import app.morphe.manager.ui.model.State
-import app.morphe.manager.ui.screen.patcher.game.MiniGameContent
-import app.morphe.manager.ui.screen.patcher.game.MiniGameState
 import app.morphe.manager.ui.screen.shared.*
 import app.morphe.manager.ui.viewmodel.HomeAndPatcherMessages
 import app.morphe.manager.ui.viewmodel.PatcherViewModel
@@ -51,14 +44,12 @@ fun SimplePatchingInProgress(
     patchesProgress: Pair<Int, Int>,
     patcherViewModel: PatcherViewModel,
     showLongStepWarning: Boolean = false,
-    miniGameState: MiniGameState,
     onCancelClick: () -> Unit,
     onHomeClick: () -> Unit
 ) {
     val windowSize = rememberWindowSize()
     val (completed, total) = patchesProgress
     val context = LocalContext.current
-    var showGame by rememberSaveable { mutableStateOf(false) }
 
     val currentMessage = remember {
         mutableIntStateOf(
@@ -95,9 +86,6 @@ fun SimplePatchingInProgress(
                 total = total,
                 showLongStepWarning = showLongStepWarning,
                 patcherViewModel = patcherViewModel,
-                showGame = showGame,
-                onToggleGame = { showGame = !showGame },
-                miniGameState = miniGameState,
                 onCancelClick = onCancelClick,
                 onHomeClick = onHomeClick
             )
@@ -131,9 +119,6 @@ private fun AdaptiveProgressContent(
     total: Int,
     showLongStepWarning: Boolean,
     patcherViewModel: PatcherViewModel,
-    showGame: Boolean,
-    onToggleGame: () -> Unit,
-    miniGameState: MiniGameState,
     onCancelClick: () -> Unit = {},
     onHomeClick: () -> Unit = {}
 ) {
@@ -184,121 +169,44 @@ private fun AdaptiveProgressContent(
                 )
             }
 
-            // Right column: Progress circle or game
-            ProgressSlot(
-                progress = progress,
-                completed = completed,
-                total = total,
-                showGame = showGame,
-                onToggleGame = onToggleGame,
-                miniGameState = miniGameState,
+            // Right column: Circular progress
+            Box(
                 modifier = Modifier
                     .weight(0.5f)
-                    .fillMaxHeight()
-            )
-        }
-    } else {
-        // Single-column layout for compact windows (portrait)
-        BoxWithConstraints(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(horizontal = contentPadding),
-            contentAlignment = Alignment.Center
-        ) {
-            // Slot height = square board (maxWidth) + 56dp header (ScoreRow 44dp + spacing 12dp),
-            // capped so message + details still fit.
-            val slotHeight = (maxWidth + 56.dp)
-                .coerceAtMost(maxHeight - 160.dp)
-                .coerceAtLeast(220.dp)
-
-            Column(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(itemSpacing)
+                    .fillMaxHeight(),
+                contentAlignment = Alignment.Center
             ) {
-                ProgressMessageSection(currentMessage)
-
-                ProgressSlot(
+                CircularProgressWithStats(
                     progress = progress,
                     completed = completed,
                     total = total,
-                    showGame = showGame,
-                    onToggleGame = onToggleGame,
-                    miniGameState = miniGameState,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(slotHeight)
-                )
-
-                ProgressDetailsSection(
-                    showLongStepWarning = showLongStepWarning,
-                    patcherViewModel = patcherViewModel,
-                    windowSize = windowSize
+                    modifier = Modifier.size(280.dp)
                 )
             }
         }
-    }
-}
+    } else {
+        // Single-column layout for compact windows (portrait)
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = contentPadding),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(itemSpacing * 3)
+        ) {
+            ProgressMessageSection(currentMessage)
 
-/**
- * Swappable slot that shows either the circular progress or the mini-game.
- */
-@Composable
-private fun ProgressSlot(
-    progress: Float,
-    completed: Int,
-    total: Int,
-    showGame: Boolean,
-    onToggleGame: () -> Unit,
-    miniGameState: MiniGameState,
-    modifier: Modifier = Modifier
-) {
-    LaunchedEffect(showGame) {
-        if (!showGame) miniGameState.pauseActiveGame()
-    }
-    Box(modifier = modifier) {
-        if (showGame) {
-            MiniGameContent(
-                state = miniGameState,
-                modifier = Modifier.fillMaxSize(),
+            CircularProgressWithStats(
                 progress = progress,
-                gameContentPadding = 8.dp,
-                onBackToHost = onToggleGame
+                completed = completed,
+                total = total,
+                modifier = Modifier.size(280.dp)
+            )
+
+            ProgressDetailsSection(
+                showLongStepWarning = showLongStepWarning,
+                patcherViewModel = patcherViewModel,
+                windowSize = windowSize
             )
-        } else {
-            Column(
-                modifier = Modifier.fillMaxSize().padding(8.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp)
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.End
-                ) {
-                    Surface(
-                        onClick = onToggleGame,
-                        shape = RoundedCornerShape(10.dp),
-                        color = MaterialTheme.colorScheme.surfaceVariant
-                    ) {
-                        Icon(
-                            imageVector = Icons.Outlined.SportsEsports,
-                            contentDescription = null,
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.padding(12.dp).size(20.dp)
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier.weight(1f).fillMaxWidth(),
-                    contentAlignment = Alignment.Center
-                ) {
-                    CircularProgressWithStats(
-                        progress = progress,
-                        completed = completed,
-                        total = total,
-                        modifier = Modifier.size(280.dp)
-                    )
-                }
-            }
         }
     }
 }

app/src/main/java/app/morphe/manager/ui/screen/patcher/game/MiniGameConfig.kt

@@ -95,14 +95,11 @@ internal fun GameChip(
 
 /**
  * Game selection screen shown when no game is active yet.
- * [onClose] is optional; pass null when the caller's navigation already provides
- * a way to dismiss (e.g. Expert mode, clicking the Logs tab suffices).
  */
 @Composable
 internal fun GamePickerContent(
     onSelect: (MiniGame) -> Unit,
-    modifier: Modifier = Modifier,
-    onClose: (() -> Unit)? = null
+    modifier: Modifier = Modifier
 ) {
     Column(
         modifier = modifier,
@@ -127,12 +124,6 @@ internal fun GamePickerContent(
                     )
                 }
             }
-            Spacer(Modifier.weight(1f))
-            if (onClose != null) {
-                GameChip(onClick = onClose) {
-                    Icon(Icons.Outlined.BarChart, contentDescription = null, modifier = Modifier.size(20.dp))
-                }
-            }
         }
 
         Column(
@@ -224,57 +215,46 @@ private fun GamePickerGridCard(
 /**
  * Unified slot that shows either the game picker or the active game.
  * Handles all picker/game switching internally so callers only need to pass state.
- *
- * [onBackToHost] adds a BarChart chip that exits the game slot entirely (Simple mode only).
- * Pass null in Expert mode where the Logs tab serves that purpose.
  */
 @Composable
 internal fun MiniGameContent(
     state: MiniGameState,
-    modifier: Modifier = Modifier,
-    progress: Float? = null,
-    gameContentPadding: Dp = 16.dp,
-    onBackToHost: (() -> Unit)? = null
+    progress: Float? = null
 ) {
+    val contentModifier = Modifier.fillMaxSize().padding(16.dp)
     when (val selected = state.selectedGame) {
         null -> GamePickerContent(
             onSelect = { state.selectGame(it) },
-            modifier = modifier.padding(gameContentPadding),
-            onClose = onBackToHost
+            modifier = contentModifier
         )
         else -> {
             val extraActions: @Composable () -> Unit = {
                 GameChip(onClick = { state.selectedGame = null }) {
                     Icon(Icons.Outlined.SportsEsports, contentDescription = null, modifier = Modifier.size(20.dp))
                 }
-                if (onBackToHost != null) {
-                    GameChip(onClick = onBackToHost) {
-                        Icon(Icons.Outlined.BarChart, contentDescription = null, modifier = Modifier.size(20.dp))
-                    }
-                }
             }
             when (selected) {
                 MiniGame.GAME_2048 -> Game2048Board(
                     state = state.game2048,
-                    modifier = modifier.padding(gameContentPadding),
+                    modifier = contentModifier,
                     progress = progress,
                     extraActions = extraActions
                 )
                 MiniGame.FLAPPY -> FlappyBirdGame(
                     state = state.flappy,
-                    modifier = modifier.padding(gameContentPadding),
+                    modifier = contentModifier,
                     progress = progress,
                     extraActions = extraActions
                 )
                 MiniGame.SNAKE -> SnakeGame(
                     state = state.snake,
-                    modifier = modifier.padding(gameContentPadding),
+                    modifier = contentModifier,
                     progress = progress,
                     extraActions = extraActions
                 )
                 MiniGame.DINO -> DinoGame(
                     state = state.dino,
-                    modifier = modifier.padding(gameContentPadding),
+                    modifier = contentModifier,
                     progress = progress,
                     extraActions = extraActions
                 )