diff --git a/app/src/main/kotlin/androidx/navigation/compose/NavHost.kt b/app/src/main/kotlin/androidx/navigation/compose/NavHost.kt index 6694e3fa1..024ad343e 100644 --- a/app/src/main/kotlin/androidx/navigation/compose/NavHost.kt +++ b/app/src/main/kotlin/androidx/navigation/compose/NavHost.kt @@ -28,7 +28,6 @@ import androidx.compose.animation.core.ExperimentalTransitionApi import androidx.compose.animation.core.SeekableTransitionState import androidx.compose.animation.core.rememberTransition import androidx.compose.animation.core.tween -import androidx.compose.animation.core.updateTransition import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.togetherWith @@ -55,8 +54,6 @@ import androidx.navigation.NavHostController import androidx.navigation.Navigator import androidx.navigation.createGraph import androidx.navigation.get -import com.hippo.ehviewer.Settings -import com.hippo.ehviewer.collectAsState import kotlinx.coroutines.CancellationException /** @@ -246,15 +243,10 @@ public fun NavHost( val zIndices = remember { mutableMapOf() } if (backStackEntry != null) { - val enablePredictiveBack by Settings.predictiveNavAnim.collectAsState() val transitionState = remember { SeekableTransitionState(backStackEntry) } - val transition = if (enablePredictiveBack) { - LaunchedEffect(backStackEntry) { - transitionState.animateTo(backStackEntry) - } - rememberTransition(transitionState, label = "entry") - } else { - updateTransition(backStackEntry, label = "entry") + val transition = rememberTransition(transitionState, label = "entry") + LaunchedEffect(backStackEntry) { + transitionState.animateTo(backStackEntry) } var inPredictiveBack by remember { mutableStateOf(false) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt b/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt index d97215286..405b6cf10 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt @@ -109,7 +109,6 @@ object Settings : DataStorePreferences(null) { val listThumbSize = intPref("list_tile_size", 40) val languageFilter = intPref("language_filter", -1) val meteredNetworkWarning = boolPref("cellular_network_warning", false) - val predictiveNavAnim = boolPref("predictive_nav_anim", true) val blackDarkTheme = boolPref("black_dark_theme", false) var downloadScheme by stringOrNullPref("image_scheme", null) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt index efdcd69d6..3a7accc11 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt @@ -188,10 +188,6 @@ fun AdvancedScreen(navigator: DestinationsNavigator) { title = stringResource(id = R.string.preload_thumb_aggressively), value = Settings::preloadThumbAggressively, ) - SwitchPreference( - title = stringResource(id = R.string.predictive_nav_anim), - value = Settings.predictiveNavAnim::value, - ) IntSliderPreference( maxValue = 5, minValue = 1,