mirror of
https://github.com/kalarina-bit/Sparkledns.git
synced 2026-11-22 07:36:09 +00:00
Keep server test results and collapsed app groups across rotation
This commit is contained in:
@@ -43,6 +43,7 @@ import androidx.compose.runtime.getValue
|
|||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.produceState
|
import androidx.compose.runtime.produceState
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.saveable.Saver
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@@ -94,7 +95,7 @@ fun AppsScreen(modifier: Modifier = Modifier) {
|
|||||||
var apps by remember { mutableStateOf(lastAppList) }
|
var apps by remember { mutableStateOf(lastAppList) }
|
||||||
var excluded by remember { mutableStateOf(prefs.excludedApps) }
|
var excluded by remember { mutableStateOf(prefs.excludedApps) }
|
||||||
var search by rememberSaveable { mutableStateOf("") }
|
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
|
val pending = active != null && excluded != activeExcluded
|
||||||
var showAppsHint by remember { mutableStateOf(!prefs.isHintDismissed(HINT_APPS)) }
|
var showAppsHint by remember { mutableStateOf(!prefs.isHintDismissed(HINT_APPS)) }
|
||||||
// Closing the "reconnect" card hides it until the selection changes again
|
// 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()
|
return bitmap.asImageBitmap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Collapsed groups survive rotation and process death
|
||||||
|
private val CollapsedSaver = Saver<Set<AppGroup>, 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"
|
private const val HINT_APPS = "apps"
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ import androidx.compose.runtime.LaunchedEffect
|
|||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
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.rememberCoroutineScope
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@@ -119,6 +121,12 @@ private val ProtectedContainer = Color(0xFF16233A)
|
|||||||
|
|
||||||
private class TestResult(val ok: Boolean, val text: String)
|
private class TestResult(val ok: Boolean, val text: String)
|
||||||
|
|
||||||
|
// Keeps test and sync results across rotation and process death
|
||||||
|
private val TestResultSaver = Saver<TestResult?, String>(
|
||||||
|
save = { result -> result?.let { (if (it.ok) "1" else "0") + it.text } },
|
||||||
|
restore = { saved -> TestResult(saved.startsWith("1"), saved.drop(1)) },
|
||||||
|
)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HomeScreen(modifier: Modifier = Modifier) {
|
fun HomeScreen(modifier: Modifier = Modifier) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
@@ -131,13 +139,13 @@ fun HomeScreen(modifier: Modifier = Modifier) {
|
|||||||
var selected by remember { mutableStateOf(prefs.providerId) }
|
var selected by remember { mutableStateOf(prefs.providerId) }
|
||||||
val servers by ServerList.servers.collectAsStateWithLifecycle()
|
val servers by ServerList.servers.collectAsStateWithLifecycle()
|
||||||
var syncing by remember { mutableStateOf(false) }
|
var syncing by remember { mutableStateOf(false) }
|
||||||
var syncResult by remember { mutableStateOf<TestResult?>(null) }
|
var syncResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf<TestResult?>(null) }
|
||||||
var shownSync by remember { mutableStateOf<TestResult?>(null) }
|
var shownSync by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf<TestResult?>(null) }
|
||||||
var customUrl by remember { mutableStateOf(prefs.customUrl) }
|
var customUrl by remember { mutableStateOf(prefs.customUrl) }
|
||||||
var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) }
|
var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) }
|
||||||
var customHttp3 by remember { mutableStateOf(prefs.customHttp3) }
|
var customHttp3 by remember { mutableStateOf(prefs.customHttp3) }
|
||||||
var testResult by remember { mutableStateOf<TestResult?>(null) }
|
var testResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf<TestResult?>(null) }
|
||||||
var shownResult by remember { mutableStateOf<TestResult?>(null) } // kept while the card animates out
|
var shownResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf<TestResult?>(null) } // kept while the card animates out
|
||||||
var testing by remember { mutableStateOf(false) }
|
var testing by remember { mutableStateOf(false) }
|
||||||
val crashReport = remember { CrashLog.read(context) }
|
val crashReport = remember { CrashLog.read(context) }
|
||||||
// Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible
|
// Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible
|
||||||
|
|||||||
Reference in New Issue
Block a user