Merge branch 'cleanup-files' into main

Author: shorthouse

app/src/main/java/dev/shorthouse/coinwatch/navigation/AppNavHost.kt

@@ -2,6 +2,9 @@ package dev.shorthouse.coinwatch.navigation
 
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -21,10 +24,14 @@ fun AppNavHost(navController: NavHostController = rememberNavController()) {
         enterTransition = { EnterTransition.None },
         exitTransition = { ExitTransition.None }
     ) {
-        composable(Screen.NavigationBar.route) {
+        composable(route = Screen.NavigationBar.route) {
             NavigationBarScaffold(onNavigateDetails = onNavigateDetails)
         }
-        composable(route = Screen.Details.route + "/{coinId}") {
+        composable(
+            route = Screen.Details.route + "/{coinId}",
+            enterTransition = { fadeIn(animationSpec = tween(700)) },
+            exitTransition = { fadeOut(animationSpec = tween(700)) }
+        ) {
             CoinDetailsScreen(onNavigateUp = { navController.navigateUp() })
         }
     }

app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/FavouritesScreen.kt

@@ -45,7 +45,9 @@ fun FavouritesScreen(
         onCoinClick = { coin ->
             onNavigateDetails(coin.id)
         },
-        onRefresh = { viewModel.initialiseUiState() }
+        onRefresh = {
+            viewModel.initialiseUiState()
+        }
     )
 }
 

app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/MarketScreen.kt

@@ -115,7 +115,7 @@ fun MarketScreen(
     )
     val showJumpToTopFab by remember {
         derivedStateOf {
-            lazyListState.firstVisibleItemIndex > 0
+            lazyListState.firstVisibleItemIndex > 1
         }
     }
 

app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/MarketViewModel.kt

@@ -114,10 +114,18 @@ class MarketViewModel @Inject constructor(
     }
 
     fun updateShowCoinSortBottomSheet(showSheet: Boolean) {
+        if (showSheet && isAnyBottomSheetOpen()) return
+
         _uiState.update { it.copy(showCoinSortBottomSheet = showSheet) }
     }
 
     fun updateShowCoinCurrencyBottomSheet(showSheet: Boolean) {
+        if (showSheet && isAnyBottomSheetOpen()) return
+
         _uiState.update { it.copy(showCoinCurrencyBottomSheet = showSheet) }
     }
+
+    private fun isAnyBottomSheetOpen(): Boolean {
+        return _uiState.value.showCoinSortBottomSheet || _uiState.value.showCoinCurrencyBottomSheet
+    }
 }