SheWhoReignsSupreme/GoonManager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(PatchingScreen): retry/exit state handling

Browse source
This commit is contained in:
rushiiMachine 2024-08-04 11:13:33 -07:00
parent cb7bb308d0
commit 9dc08bd1d0
No known key found for this signature in database
GPG key ID: DCBE5952BB3B6420
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt
View file

@ -64,16 +64,12 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
val listState = rememberLazyListState()
val showMinimizationWarning = remember { !context.isIgnoringBatteryOptimizations() }
// Go home directly if screen model mandates so (usually caused by cancelled PackageInstaller dialog)
LaunchedEffect(state) {
if (state is PatchingScreenState.CloseScreen)
navigator.popUntilRoot()
}
// Go home directly if install was successful
BackHandler(state is PatchingScreenState.Success) {
navigator.popUntilRoot()
}
// Prevent screen from turning off while working
Wakelock(active = state is PatchingScreenState.Working)
@ -86,9 +82,16 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
// Only show exit warning if currently working
val onTryExit: () -> Unit = remember {
{
// Show cancellation if currently running
if (state == PatchingScreenState.Working && !model.devMode) {
showAbortWarning = true
} else {
}
// Go home directly if install was successful
else if (state is PatchingScreenState.Success) {
navigator.popUntilRoot()
}
// Go back to the patch options screen
else {
navigator.back(currentActivity = null)
}
}
@ -214,13 +217,13 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
item(key = "BUTTONS") {
var cacheCleared by remember { mutableStateOf(false) }
val filteredState by remember { model.state.filter { it.isNewlyFinished } }
.collectAsState(initial = null)
val filteredState by remember { model.state.filter { it.isProgressChange } }
.collectAsState(initial = PatchingScreenState.Working)
AnimatedVisibility(
visible = filteredState != null,
visible = filteredState != PatchingScreenState.Working,
enter = fadeIn() + slideInVertically(),
exit = ExitTransition.None,
exit = fadeOut() + slideOutVertically { it * -2 },
) {
Column {
HorizontalDivider(
@ -231,6 +234,9 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
)
when (filteredState) {
PatchingScreenState.Working -> {}
PatchingScreenState.CloseScreen -> error("unreachable")
PatchingScreenState.Success -> {
MainActionButton(
text = "Launch Aliucord",
@ -246,8 +252,6 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
onClick = model::restart,
)
}
else -> error("unreachable")
}
MainActionButton(

2
app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt
View file

@ -35,7 +35,7 @@ class PatchingScreenModel(
private val paths: PathManager,
private val options: PatchOptions,
private val prefs: PreferencesManager,
) : StateScreenModel<PatchingScreenState>(PatchingScreenState.Pending) {
) : StateScreenModel<PatchingScreenState>(PatchingScreenState.Working) {
private var startTime: Date? = null
private var runnerJob: Job? = null
private var stepRunner: StepRunner? = null

15
app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenState.kt
View file

@ -1,21 +1,16 @@
package com.aliucord.manager.ui.screens.patching
import com.aliucord.manager.ui.screens.patching.PatchingScreenState.*
import com.aliucord.manager.ui.screens.patching.PatchingScreenState.CloseScreen
sealed interface PatchingScreenState {
data object Pending : PatchingScreenState
data object Working : PatchingScreenState
data object Success : PatchingScreenState
data class Failed(
val failureLog: String,
) : PatchingScreenState
data class Failed(val failureLog: String) : PatchingScreenState
data object CloseScreen : PatchingScreenState
}
val PatchingScreenState.isNewlyFinished: Boolean
inline get() = this == Success || this is Failed
val PatchingScreenState.isProgressChange: Boolean
inline get() = this != CloseScreen
val PatchingScreenState.isFinished: Boolean
inline get() = isNewlyFinished || this == CloseScreen
inline get() = isProgressChange || this == CloseScreen