joe/Githug-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc Changes

Browse Source
This commit is contained in:
Joe Tretter
2026-05-11 20:20:13 -05:00
parent 7e55084815
commit 316323a00c
3 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/solutions/tretter/githugandroid/GitHugApp.kt
View File

@@ -21,6 +21,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.platform.LocalConfiguration
@@ -28,8 +29,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
import androidx.compose.ui.layout.boundsInRoot
import androidx.compose.ui.layout.onGloballyPositioned
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@@ -74,10 +73,9 @@ fun GitHugApp() {
var solvedCelebrationTitle by remember { mutableStateOf<String?>(null) }
var showTerminalInputHint by remember { mutableStateOf(true) }
var showExerciseDescriptionHint by remember { mutableStateOf(true) }
var showHelpOverlay by remember { mutableStateOf(false) }
var showHelpOnStart by remember { mutableStateOf(true) }
var helpPreferenceInitialized by remember { mutableStateOf(false) }
var workspaceBounds by remember { mutableStateOf<Rect?>(null) }
var showHelpOverlay by rememberSaveable { mutableStateOf(false) }
var showHelpOnStart by rememberSaveable { mutableStateOf(true) }
var helpPreferenceInitialized by rememberSaveable { mutableStateOf(false) }
var exerciseBounds by remember { mutableStateOf<Rect?>(null) }
var promptBounds by remember { mutableStateOf<Rect?>(null) }
val currentLevel = levels[currentLevelIndex]
@@ -480,9 +478,7 @@ fun GitHugApp() {
) {
FixedHeader()
Box(
modifier = Modifier
.fillMaxWidth()
.onGloballyPositioned { workspaceBounds = it.boundsInRoot() },
modifier = Modifier.fillMaxWidth(),
) {
PaneWorkspace(
modifier = Modifier.fillMaxWidth(),
@@ -570,22 +566,21 @@ fun GitHugApp() {
)
},
)
if (showHelpOverlay) {
HelpCalloutOverlay(
showHelpOnStart = showHelpOnStart,
onShowHelpOnStartChange = { showHelpOnStart = it },
onOk = {
showHelpOverlay = false
scope.launch { gameProgressStore.saveShowHelpOnStart(showHelpOnStart) }
},
onClose = { showHelpOverlay = false },
workspaceBounds = workspaceBounds,
exerciseBounds = exerciseBounds,
promptBounds = promptBounds,
)
}
}
}
if (showHelpOverlay) {
HelpCalloutOverlay(
showHelpOnStart = showHelpOnStart,
onShowHelpOnStartChange = { showHelpOnStart = it },
onOk = {
showHelpOverlay = false
scope.launch { gameProgressStore.saveShowHelpOnStart(showHelpOnStart) }
},
onClose = { showHelpOverlay = false },
exerciseBounds = exerciseBounds,
promptBounds = promptBounds,
)
}
}
}
}