diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 649e3dfc..2a0f37b4 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -63,7 +63,5 @@ dependencies { implementation(libs.coil) implementation(libs.copydown) implementation(libs.kotlinx.coroutines.core) - implementation(libs.material.motion.core) - implementation(libs.material.motion.navigation) implementation(libs.sqldelight.extensions.coroutines) } diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt index a29bb0b1..98be37f9 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt @@ -6,7 +6,6 @@ */ package dev.msfjarvis.claw.android.ui -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.ExperimentalMaterial3Api @@ -28,7 +27,10 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.navigation.NavType +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument import androidx.navigation.navDeepLink import androidx.paging.compose.collectAsLazyPagingItems @@ -51,12 +53,9 @@ import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation import dev.msfjarvis.claw.common.urllauncher.UrlLauncher import dev.msfjarvis.claw.common.user.UserProfile import kotlinx.coroutines.launch -import soup.compose.material.motion.navigation.MaterialMotionNavHost -import soup.compose.material.motion.navigation.composable -import soup.compose.material.motion.navigation.rememberMaterialMotionNavController @Suppress("ModifierMissing") // Top-level composable, will never have a modifier supplied. -@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun LobstersApp( urlLauncher: UrlLauncher, @@ -68,7 +67,7 @@ fun LobstersApp( val hottestListState = rememberLazyListState() val newestListState = rememberLazyListState() val savedListState = rememberLazyListState() - val navController = rememberMaterialMotionNavController() + val navController = rememberNavController() val coroutineScope = rememberCoroutineScope() val postActions = rememberPostActions(urlLauncher, navController, viewModel) val backStackEntry by navController.currentBackStackEntryAsState() @@ -158,7 +157,7 @@ fun LobstersApp( ) }, ) { paddingValues -> - MaterialMotionNavHost( + NavHost( navController = navController, startDestination = Destinations.startDestination.route, modifier = Modifier.padding(paddingValues), diff --git a/distribution/whatsnew/whatsnew-en-GB b/distribution/whatsnew/whatsnew-en-GB index 63d7ad0d..14e3eb4b 100644 --- a/distribution/whatsnew/whatsnew-en-GB +++ b/distribution/whatsnew/whatsnew-en-GB @@ -3,3 +3,4 @@ Changelog - Switch to Compose Material's swipe refresh feature - Change metadata extractor logic to no longer prefer canonical URLs. The submitted URL will be retained as-is now. +- Remove navigation transition animations diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 529d9ba8..fe204b45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,6 @@ composeCompiler = "1.4.0-alpha02" coroutines = "1.6.4" dagger = "2.44.2" kotlin = "1.7.21" -material_motion = "0.10.3" # @pin Needs to be aligned with Retrofit okhttp = "3.14.9" retrofit = "2.9.0" @@ -71,8 +70,6 @@ jsoup = "org.jsoup:jsoup:1.15.3" kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } -material_motion-core = { module = "io.github.fornewid:material-motion-compose-core", version.ref = "material_motion" } -material_motion-navigation = { module = "io.github.fornewid:material-motion-compose-navigation", version.ref = "material_motion" } napier = "io.github.aakira:napier:2.6.1" okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } okhttp-loggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }