Merge branch 'navigation-anims' into main

Author: shorthouse

app/build.gradle.kts

@@ -83,6 +83,7 @@ dependencies {
     implementation("com.google.accompanist:accompanist-placeholder-material:0.30.1")
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6")
     implementation("androidx.compose.ui:ui-tooling-preview-android:1.5.3")
+    implementation("androidx.navigation:navigation-compose:2.7.4")
     lintChecks("com.slack.lint.compose:compose-lint-checks:1.2.0")
 
     // Coroutines
@@ -97,7 +98,7 @@ dependencies {
     implementation("com.google.dagger:hilt-android:2.48.1")
     kapt("com.google.dagger:hilt-android-compiler:2.48.1")
     kapt("androidx.hilt:hilt-compiler:1.0.0")
-    implementation("androidx.hilt:hilt-navigation-compose:1.1.0-beta01")
+    implementation("androidx.hilt:hilt-navigation-compose:1.1.0-rc01")
 
     // Retrofit
     implementation("com.squareup.retrofit2:retrofit:2.9.0")

app/src/main/java/dev/shorthouse/coinwatch/ui/screen/list/CoinListScreen.kt

@@ -35,7 +35,6 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -94,7 +93,7 @@ fun CoinListScreen(
         is CoinListUiState.Success -> {
             val lazyListState = rememberLazyListState()
             val scope = rememberCoroutineScope()
-            val showButton by remember {
+            val showJumpToTopFab by remember {
                 derivedStateOf {
                     lazyListState.firstVisibleItemIndex > 0
                 }
@@ -119,7 +118,7 @@ fun CoinListScreen(
                 },
                 floatingActionButton = {
                     AnimatedVisibility(
-                        visible = showButton,
+                        visible = showJumpToTopFab,
                         enter = scaleIn(),
                         exit = scaleOut()
                     ) {

app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/CoinSearchScreen.kt

@@ -1,6 +1,7 @@
 package dev.shorthouse.coinwatch.ui.screen.search
 
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
@@ -95,7 +96,9 @@ fun CoinSearchScreen(
             )
         }
 
-        CoinSearchUiState.Loading -> {}
+        is CoinSearchUiState.Loading -> {
+            Box(modifier = Modifier.fillMaxSize())
+        }
     }
 }
 
@@ -195,7 +198,7 @@ fun CoinSearchContent(
         active = true,
         onActiveChange = {},
         tonalElevation = 0.dp,
-        modifier = modifier.focusRequester(focusRequester)
+        modifier = modifier.focusRequester(focusRequester).fillMaxSize()
     )
 
     LaunchedEffect(focusRequester) {