diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt index 9a080cf..048cd71 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt @@ -43,6 +43,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.produceState import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -94,7 +95,7 @@ fun AppsScreen(modifier: Modifier = Modifier) { var apps by remember { mutableStateOf(lastAppList) } var excluded by remember { mutableStateOf(prefs.excludedApps) } var search by rememberSaveable { mutableStateOf("") } - var collapsed by remember { mutableStateOf(setOf(AppGroup.SYSTEM)) } + var collapsed by rememberSaveable(stateSaver = CollapsedSaver) { mutableStateOf(setOf(AppGroup.SYSTEM)) } val pending = active != null && excluded != activeExcluded var showAppsHint by remember { mutableStateOf(!prefs.isHintDismissed(HINT_APPS)) } // Closing the "reconnect" card hides it until the selection changes again @@ -368,4 +369,10 @@ private fun Drawable.toImageBitmap(size: Int): ImageBitmap { return bitmap.asImageBitmap() } +// Collapsed groups survive rotation and process death +private val CollapsedSaver = Saver, String>( + save = { groups -> groups.joinToString(",") { it.name } }, + restore = { saved -> saved.split(',').mapNotNull { name -> AppGroup.entries.firstOrNull { it.name == name } }.toSet() }, +) + private const val HINT_APPS = "apps" diff --git a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt index 9366384..caabab6 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt @@ -71,6 +71,8 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.Saver +import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -119,6 +121,12 @@ private val ProtectedContainer = Color(0xFF16233A) private class TestResult(val ok: Boolean, val text: String) +// Keeps test and sync results across rotation and process death +private val TestResultSaver = Saver( + save = { result -> result?.let { (if (it.ok) "1" else "0") + it.text } }, + restore = { saved -> TestResult(saved.startsWith("1"), saved.drop(1)) }, +) + @Composable fun HomeScreen(modifier: Modifier = Modifier) { val context = LocalContext.current @@ -131,13 +139,13 @@ fun HomeScreen(modifier: Modifier = Modifier) { var selected by remember { mutableStateOf(prefs.providerId) } val servers by ServerList.servers.collectAsStateWithLifecycle() var syncing by remember { mutableStateOf(false) } - var syncResult by remember { mutableStateOf(null) } - var shownSync by remember { mutableStateOf(null) } + var syncResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf(null) } + var shownSync by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf(null) } var customUrl by remember { mutableStateOf(prefs.customUrl) } var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) } var customHttp3 by remember { mutableStateOf(prefs.customHttp3) } - var testResult by remember { mutableStateOf(null) } - var shownResult by remember { mutableStateOf(null) } // kept while the card animates out + var testResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf(null) } + var shownResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf(null) } // kept while the card animates out var testing by remember { mutableStateOf(false) } val crashReport = remember { CrashLog.read(context) } // Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible