yusheng/QieKan-3.0
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

修复某些界面错误应用淡入淡出动画的问题

Browse Source
This commit is contained in:
HapeLee committed 2026-05-11 04:09:02 +08:00
1 parent 97fe1ad6b5
commit 0308a9d396
1 file changed
+17 -30
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/main/MainActivity.kt
+17 -30
View File
@@ -609,18 +609,7 @@ open class MainActivity : BaseComposeActivity(), VariableDialog.Callback {
) )
} }
entry<MainRouteSearch>( entry<MainRouteSearch> { route ->
metadata = NavDisplay.transitionSpec {
fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300))
} + NavDisplay.popTransitionSpec {
fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300))
} + NavDisplay.predictivePopTransitionSpec { _ ->
fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300))
}
) { route ->
val searchViewModel = koinViewModel<SearchViewModel>() val searchViewModel = koinViewModel<SearchViewModel>()
LaunchedEffect(route.key, route.scopeRaw, searchViewModel) { LaunchedEffect(route.key, route.scopeRaw, searchViewModel) {
@@ -697,19 +686,28 @@ open class MainActivity : BaseComposeActivity(), VariableDialog.Callback {
entry<MainRouteBookInfo>( entry<MainRouteBookInfo>(
metadata = NavDisplay.transitionSpec { metadata = NavDisplay.transitionSpec {
if (initialState.key is MainRouteExploreShow) { val from = initialState.key
val fromStr = from.toString()
if (from is MainRouteHome || from is MainRouteExploreShow || from is MainRouteSearch ||
fromStr.startsWith("MainRouteHome") || fromStr.startsWith("MainRouteExploreShow") || fromStr.startsWith("MainRouteSearch")) {
fadeIn(animationSpec = tween(300)) togetherWith fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300)) fadeOut(animationSpec = tween(300))
} else null } else null
} + NavDisplay.popTransitionSpec { } + NavDisplay.popTransitionSpec {
if (targetState.key is MainRouteExploreShow) { val to = targetState.key
val toStr = to.toString()
if (to is MainRouteHome || to is MainRouteExploreShow || to is MainRouteSearch ||
toStr.startsWith("MainRouteHome") || toStr.startsWith("MainRouteExploreShow") || toStr.startsWith("MainRouteSearch")) {
fadeIn(animationSpec = tween(300)) togetherWith fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300)) fadeOut(animationSpec = tween(300))
} else null } else null
} + NavDisplay.predictivePopTransitionSpec { _ -> } + NavDisplay.predictivePopTransitionSpec { _ ->
if (targetState.key is MainRouteExploreShow) { val to = targetState.key
val toStr = to.toString()
if (to is MainRouteHome || to is MainRouteExploreShow || to is MainRouteSearch ||
toStr.startsWith("MainRouteHome") || toStr.startsWith("MainRouteExploreShow") || toStr.startsWith("MainRouteSearch")) {
fadeIn(animationSpec = tween(300)) togetherWith fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300)) fadeOut(animationSpec = tween(300))
} else null } else null
} }
) { route -> ) { route ->
@@ -731,18 +729,7 @@ open class MainActivity : BaseComposeActivity(), VariableDialog.Callback {
) )
} }
entry<MainRouteExploreShow>( entry<MainRouteExploreShow> { route ->
metadata = NavDisplay.transitionSpec {
fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300))
} + NavDisplay.popTransitionSpec {
fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300))
} + NavDisplay.predictivePopTransitionSpec { _ ->
fadeIn(animationSpec = tween(300)) togetherWith
fadeOut(animationSpec = tween(300))
}
) { route ->
ExploreShowScreen( ExploreShowScreen(
title = route.title ?: "探索", title = route.title ?: "探索",
sourceUrl = route.sourceUrl, sourceUrl = route.sourceUrl,