From 9f2e5b8dd9e19b926be0e2a712832cb86b071121 Mon Sep 17 00:00:00 2001
From: Joe Tretter <j.tretter@gmail.com>
Date: Fri, 24 Apr 2026 13:25:56 -0500
Subject: [PATCH] Auto-commit after successful build: update app gameplay/UI,
 improve build setup

Changed files:\napp/build.gradle.kts
app/src/main/java/solutions/tretter/githugandroid/GitHugApp.kt
---
 app/build.gradle.kts                                  |  4 ++--
 .../java/solutions/tretter/githugandroid/GitHugApp.kt | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8df1f62..41e3dd9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "solutions.tretter.githugandroid"
         minSdk = 26
         targetSdk = 34
-        versionCode = 69
-        versionName = "0.1.68"
+        versionCode = 70
+        versionName = "0.1.69"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/solutions/tretter/githugandroid/GitHugApp.kt b/app/src/main/java/solutions/tretter/githugandroid/GitHugApp.kt
index 27630ec..1234d06 100644
--- a/app/src/main/java/solutions/tretter/githugandroid/GitHugApp.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/GitHugApp.kt
@@ -40,7 +40,7 @@ fun GitHugApp() {
         val paneLayoutStore = remember(context) { PaneLayoutStore(context.applicationContext) }
         val gameProgressStore = remember(context) { GameProgressStore(context.applicationContext) }
         val persistedPaneLayout by paneLayoutStore.layoutFlow.collectAsState(initial = defaultPaneLayout())
-        val persistedCompletedLevels by gameProgressStore.completedLevelsFlow.collectAsState(initial = emptySet())
+        val persistedCompletedLevels by gameProgressStore.completedLevelsFlow.collectAsState(initial = null)
         val scope = rememberCoroutineScope()
         val screenScrollState = rememberScrollState()
         val screenHeightDp = configuration.screenHeightDp
@@ -82,17 +82,18 @@ fun GitHugApp() {
         }
 
         LaunchedEffect(persistedCompletedLevels) {
-            completedLevels = persistedCompletedLevels
+            val restoredCompletedLevels = persistedCompletedLevels ?: return@LaunchedEffect
+            completedLevels = restoredCompletedLevels
             if (!hasRestoredProgress) {
                 hasRestoredProgress = true
-                val firstIncompleteIndex = levels.indexOfFirst { it.id !in persistedCompletedLevels }
+                val firstIncompleteIndex = levels.indexOfFirst { it.id !in restoredCompletedLevels }
                 val resumeIndex = firstIncompleteIndex.takeIf { it >= 0 } ?: levels.lastIndex
                 currentLevelIndex = resumeIndex
                 repo = runtime.prepareLevel(levels[resumeIndex])
                 output = listOf(
-                    if (persistedCompletedLevels.size == levels.size) {
+                    if (restoredCompletedLevels.size == levels.size) {
                         "🏁 All Githug levels completed."
-                    } else if (persistedCompletedLevels.isEmpty()) {
+                    } else if (restoredCompletedLevels.isEmpty()) {
                         runtime.startupBanner()
                     } else {
                         "Resumed at level: ${levels[resumeIndex].title}"