Revert "feat: add navigation transitions with fade animations for improved user experience"
This reverts commit ab014206fd.
This commit is contained in:
@@ -65,8 +65,6 @@ dependencies {
|
|||||||
implementation 'androidx.compose.material3:material3:1.1.2'
|
implementation 'androidx.compose.material3:material3:1.1.2'
|
||||||
implementation 'androidx.compose.material:material-icons-extended'
|
implementation 'androidx.compose.material:material-icons-extended'
|
||||||
implementation 'androidx.navigation:navigation-compose:2.7.5'
|
implementation 'androidx.navigation:navigation-compose:2.7.5'
|
||||||
// Animation (for navigation transitions)
|
|
||||||
implementation 'androidx.compose.animation:animation'
|
|
||||||
|
|
||||||
// ViewModel
|
// ViewModel
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
|
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
package com.collabtable.app.ui.navigation
|
package com.collabtable.app.ui.navigation
|
||||||
|
|
||||||
import androidx.compose.animation.core.tween
|
|
||||||
import androidx.compose.animation.fadeIn
|
|
||||||
import androidx.compose.animation.fadeOut
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
@@ -108,26 +105,14 @@ fun MainApp() {
|
|||||||
navController = navController,
|
navController = navController,
|
||||||
startDestination = Routes.Tables,
|
startDestination = Routes.Tables,
|
||||||
) {
|
) {
|
||||||
composable(
|
composable(Routes.Tables) {
|
||||||
route = Routes.Tables,
|
|
||||||
enterTransition = { fadeIn(tween(200)) },
|
|
||||||
exitTransition = { fadeOut(tween(200)) },
|
|
||||||
popEnterTransition = { fadeIn(tween(200)) },
|
|
||||||
popExitTransition = { fadeOut(tween(200)) },
|
|
||||||
) {
|
|
||||||
ListsScreen(
|
ListsScreen(
|
||||||
onNavigateToList = { listId -> navController.navigate("list/$listId") },
|
onNavigateToList = { listId -> navController.navigate("list/$listId") },
|
||||||
onNavigateToSettings = { navController.navigate(Routes.Settings) },
|
onNavigateToSettings = { navController.navigate(Routes.Settings) },
|
||||||
onNavigateToLogs = { navController.navigate(Routes.Logs) },
|
onNavigateToLogs = { navController.navigate(Routes.Logs) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
composable(
|
composable(Routes.Settings) {
|
||||||
route = Routes.Settings,
|
|
||||||
enterTransition = { fadeIn(tween(200)) },
|
|
||||||
exitTransition = { fadeOut(tween(200)) },
|
|
||||||
popEnterTransition = { fadeIn(tween(200)) },
|
|
||||||
popExitTransition = { fadeOut(tween(200)) },
|
|
||||||
) {
|
|
||||||
SettingsScreen(
|
SettingsScreen(
|
||||||
onNavigateBack = { navController.popBackStack() },
|
onNavigateBack = { navController.popBackStack() },
|
||||||
onNavigateToLogs = { navController.navigate(Routes.Logs) },
|
onNavigateToLogs = { navController.navigate(Routes.Logs) },
|
||||||
@@ -137,22 +122,12 @@ fun MainApp() {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
composable(
|
composable(Routes.Logs) {
|
||||||
route = Routes.Logs,
|
|
||||||
enterTransition = { fadeIn(tween(200)) },
|
|
||||||
exitTransition = { fadeOut(tween(200)) },
|
|
||||||
popEnterTransition = { fadeIn(tween(200)) },
|
|
||||||
popExitTransition = { fadeOut(tween(200)) },
|
|
||||||
) {
|
|
||||||
LogsScreen(onNavigateBack = { navController.popBackStack() })
|
LogsScreen(onNavigateBack = { navController.popBackStack() })
|
||||||
}
|
}
|
||||||
composable(
|
composable(
|
||||||
route = Routes.ListDetail,
|
route = Routes.ListDetail,
|
||||||
arguments = listOf(navArgument("listId") { type = NavType.StringType }),
|
arguments = listOf(navArgument("listId") { type = NavType.StringType }),
|
||||||
enterTransition = { fadeIn(tween(200)) },
|
|
||||||
exitTransition = { fadeOut(tween(200)) },
|
|
||||||
popEnterTransition = { fadeIn(tween(200)) },
|
|
||||||
popExitTransition = { fadeOut(tween(200)) },
|
|
||||||
) { backStackEntry ->
|
) { backStackEntry ->
|
||||||
val listId = backStackEntry.arguments?.getString("listId") ?: return@composable
|
val listId = backStackEntry.arguments?.getString("listId") ?: return@composable
|
||||||
ListDetailScreen(listId = listId, onNavigateBack = { navController.popBackStack() })
|
ListDetailScreen(listId = listId, onNavigateBack = { navController.popBackStack() })
|
||||||
|
|||||||
Reference in New Issue
Block a user