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

feat: unified screen navigation transitions

Browse source
This commit is contained in:
rushiiMachine 2025-04-09 21:10:30 -07:00
parent a91d2084a4
commit 7477167d8d
No known key found for this signature in database
GPG key ID: DCBE5952BB3B6420
4 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/proguard-rules.pro vendored
View file

@ -33,7 +33,7 @@
}
# Keep class names of patching steps since they're used via reflection
-keepnames com.aliucord.manager.patcher.steps.**
-keepnames class com.aliucord.manager.patcher.steps.**
# Uncomment this to preserve the line number information for
# debugging stack traces.

47
app/src/main/kotlin/com/aliucord/manager/MainActivity.kt
View file

@ -16,15 +16,13 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.WindowCompat
import cafe.adriel.voyager.core.annotation.ExperimentalVoyagerApi
import cafe.adriel.voyager.core.stack.StackEvent
import cafe.adriel.voyager.navigator.*
import cafe.adriel.voyager.transitions.ScreenTransition
import com.aliucord.manager.manager.PreferencesManager
import com.aliucord.manager.ui.components.*
import com.aliucord.manager.ui.components.dialogs.StoragePermissionsDialog
import com.aliucord.manager.ui.screens.home.HomeScreen
import com.aliucord.manager.ui.screens.iconopts.IconOptionsScreen
import com.aliucord.manager.ui.screens.patching.PatchingScreen
import com.aliucord.manager.ui.screens.patchopts.PatchOptionsScreen
import com.aliucord.manager.ui.widgets.updater.UpdaterDialog
import com.aliucord.manager.util.IS_CUSTOM_BUILD
import org.koin.android.ext.android.inject
@ -64,37 +62,26 @@ class MainActivity : ComponentActivity() {
ScreenTransition(
navigator = navigator,
transition = block@{
val fadeIn = fadeIn(tween(durationMillis = 300))
val fadeOut = fadeOut(tween(durationMillis = 750, delayMillis = 200))
when {
// Going from Home -> InstallOptions
initialState is HomeScreen && targetState is PatchOptionsScreen ->
slideInVertically { (it * 1.5).toInt() } + fadeIn togetherWith fadeOut
// Going from InstallOptions -> Home
initialState is PatchOptionsScreen && targetState is HomeScreen ->
fadeIn togetherWith slideOutVertically { it * 2 } + fadeOut
// Going from InstallOptions -> Install
initialState is PatchOptionsScreen && targetState is PatchingScreen ->
slideInHorizontally { it * 2 } + fadeIn togetherWith fadeOut
// Going from PatchOptions -> IconOptions
initialState is PatchOptionsScreen && targetState is IconOptionsScreen ->
slideInHorizontally { it * 2 } + fadeIn togetherWith fadeOut
// Going from IconOptions -> PatchOptions
initialState is IconOptionsScreen && targetState is PatchOptionsScreen ->
fadeIn togetherWith slideOutHorizontally { it * 2 } + fadeOut
// Going from Install -> InstallOptions
initialState is PatchingScreen && targetState is PatchOptionsScreen ->
fadeIn togetherWith slideOutHorizontally { it * 2 } + fadeOut
else -> fadeIn togetherWith fadeOut
}
}
transition = { unifiedScreenTransition(navigator.lastEvent) }
)
}
}
}
}
}
private fun unifiedScreenTransition(lastEvent: StackEvent): ContentTransform = when (lastEvent) {
StackEvent.Push, StackEvent.Replace -> ContentTransform(
targetContentEnter = slideInHorizontally { it * 2 } + fadeIn(tween(durationMillis = 400)),
initialContentExit = fadeOut(tween(durationMillis = 400, delayMillis = 300)),
)
StackEvent.Pop -> ContentTransform(
targetContentEnter = EnterTransition.None,
targetContentZIndex = -1f,
initialContentExit = slideOutHorizontally { it * 2 } + fadeOut(tween(durationMillis = 400, delayMillis = 300)),
)
StackEvent.Idle -> fadeIn() togetherWith fadeOut()
}
}

2
app/src/main/kotlin/com/aliucord/manager/util/Context.kt
View file

@ -103,7 +103,7 @@ fun Context.requestNoBatteryOptimizations() {
startActivity(intent)
}
/*
/**
* Get the raw bytes for a resource.
* @param id The resource identifier
* @return The resource's raw bytes as stored inside the APK

2
app/src/main/kotlin/com/aliucord/manager/util/Utils.kt
View file

@ -28,7 +28,7 @@ inline fun <E> ObjectList<E>.find(block: (E) -> Boolean): E? {
/**
* Whether this manager build is not an official release.
*/
@Suppress("KotlinConstantConditions")
@Suppress("KotlinConstantConditions", "SimplifyBooleanWithConstants")
val IS_CUSTOM_BUILD by lazy {
BuildConfig.GIT_BRANCH != "release"
|| BuildConfig.GIT_LOCAL_CHANGES