better navigation

iakanoe · Nov 2, 2023 · d2135fd · d2135fd
1 parent 78a7e42
commit d2135fd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/app/src/main/java/io/iakanoe/github/dolarcito/ui/DolarcitoNavigation.kt b/app/src/main/java/io/iakanoe/github/dolarcito/ui/DolarcitoNavigation.kt
@@ -1,5 +1,8 @@
 package io.iakanoe.github.dolarcito.ui
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -115,9 +118,11 @@ fun DolarcitoNavigation() {
         }
     ) { innerPadding ->
         NavHost(
+            modifier = Modifier.padding(innerPadding),
             navController = navController,
             startDestination = Screen.RATES,
-            modifier = Modifier.padding(innerPadding)
+            enterTransition = { slideIntoContainer(towards = AnimatedContentTransitionScope.SlideDirection.Start) + fadeIn() },
+            exitTransition = { slideOutOfContainer(towards = AnimatedContentTransitionScope.SlideDirection.End) + fadeOut() }
         ) {
             composable(Screen.RATES) {
                 ExchangeRatesScreen(

diff --git a/app/src/main/java/io/iakanoe/github/dolarcito/ui/rates/ExchangeRatesScreen.kt b/app/src/main/java/io/iakanoe/github/dolarcito/ui/rates/ExchangeRatesScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -99,21 +100,23 @@ fun ExchangeRatesScreen(
         )
     }
 
-    Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-    ) {
-        when (val state = viewState) {
-            is ExchangeRatesViewState.Loading -> CircularProgressIndicator()
+    Surface {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            when (val state = viewState) {
+                is ExchangeRatesViewState.Loading -> CircularProgressIndicator()
 
-            is ExchangeRatesViewState.Error -> ErrorContent(
-                onRetryClick = { viewModel.update() }
-            )
+                is ExchangeRatesViewState.Error -> ErrorContent(
+                    onRetryClick = { viewModel.update() }
+                )
 
-            is ExchangeRatesViewState.Loaded -> ExchangeRateList(
-                exchangeRates = state.exchangeRates,
-                hiddenExchangeRates = state.hiddenExchangeRates
-            )
+                is ExchangeRatesViewState.Loaded -> ExchangeRateList(
+                    exchangeRates = state.exchangeRates,
+                    hiddenExchangeRates = state.hiddenExchangeRates
+                )
+            }
         }
     }
 }

diff --git a/app/src/main/java/io/iakanoe/github/dolarcito/ui/settings/SettingsScreen.kt b/app/src/main/java/io/iakanoe/github/dolarcito/ui/settings/SettingsScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -78,14 +79,16 @@ fun SettingsScreen(
         )
     }
 
-    Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-    ) {
-        when (viewState) {
-            is SettingsViewState.Loading -> CircularProgressIndicator()
-            is SettingsViewState.Loaded -> OrderableList()
-            else -> Unit
+    Surface {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            when (viewState) {
+                is SettingsViewState.Loading -> CircularProgressIndicator()
+                is SettingsViewState.Loaded -> OrderableList()
+                else -> Unit
+            }
         }
     }
 }