Search fix

app/src/main/java/st/slex/csplashscreen/ui/InitialApp.kt

@@ -1,6 +1,11 @@
 package st.slex.csplashscreen.ui
 
 import android.annotation.SuppressLint
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.systemBarsPadding
@@ -17,10 +22,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import org.koin.androidx.compose.koinViewModel
 import st.slex.csplashscreen.core.navigation.AppDestination
 import st.slex.csplashscreen.navigation.NavigationHost
+import st.slex.csplashscreen.ui.components.bottom_appbar.BottomAppBarResource
 import st.slex.csplashscreen.ui.components.bottom_appbar.MainBottomAppBar
-import org.koin.androidx.compose.koinViewModel
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
@@ -51,17 +57,25 @@ fun InitialApp(
     Scaffold(
         modifier = modifier,
         contentColor = MaterialTheme.colorScheme.onBackground,
-        containerColor = Color.Transparent,
+        containerColor = MaterialTheme.colorScheme.background,
         bottomBar = {
-            MainBottomAppBar(
-                onBottomAppBarClick = viewModel::navigate,
-                currentDestination = currentDestination
-            )
+            AnimatedVisibility(
+                visible = BottomAppBarResource.isAppbar(currentDestination),
+                enter = slideInVertically(tween(300)) { it },
+                exit = slideOutVertically(tween(300)) { it }
+            ) {
+                MainBottomAppBar(
+                    onBottomAppBarClick = viewModel::navigate,
+                    currentDestination = currentDestination
+                )
+            }
         },
         contentWindowInsets = WindowInsets(0.dp),
         content = {
             NavigationHost(
-                modifier = Modifier.systemBarsPadding(),
+                modifier = Modifier
+                    .background(MaterialTheme.colorScheme.background)
+                    .systemBarsPadding(),
                 navController = navController,
             )
         },

app/src/main/java/st/slex/csplashscreen/ui/components/bottom_appbar/BottomAppBarNavigation.kt

@@ -30,16 +30,22 @@ fun MainBottomAppBar(
                     onBottomAppBarClick(item.screen)
                 },
                 icon = {
-                    val icon = if (isSelected) {
-                        item.selectedIcon
-                    } else {
-                        item.unselectedIcon
-                    }
-                    Icon(icon, item.appDestination.route)
+                    Icon(
+                        imageVector = if (isSelected) {
+                            item.selectedIcon
+                        } else {
+                            item.unselectedIcon
+                        },
+                        contentDescription = item.appDestination.name
+                    )
+                },
+                label = {
+                    Text(
+                        text = stringResource(id = item.titleResource)
+                    )
                 },
-                label = { Text(text = stringResource(id = item.titleResource)) },
                 alwaysShowLabel = false
             )
         }
     }
-}
+}

app/src/main/java/st/slex/csplashscreen/ui/components/bottom_appbar/BottomAppBarResource.kt

@@ -12,7 +12,6 @@ import st.slex.csplashscreen.R
 import st.slex.csplashscreen.core.navigation.AppDestination
 import st.slex.csplashscreen.core.navigation.NavigationScreen
 
-@Suppress("UNUSED")
 enum class BottomAppBarResource(
     val unselectedIcon: ImageVector,
     val selectedIcon: ImageVector,
@@ -40,5 +39,12 @@ enum class BottomAppBarResource(
         appDestination = AppDestination.SEARCH_PHOTOS,
         titleResource = R.string.nav_title_search,
         screen = NavigationScreen.SearchPhotosScreen(query = " ")
-    )
+    );
+
+    companion object {
+
+        fun isAppbar(
+            appDestination: AppDestination?
+        ): Boolean = entries.any { it.appDestination == appDestination }
+    }
 }

core/navigation/src/main/java/st/slex/csplashscreen/core/navigation/AppDestination.kt

@@ -26,13 +26,18 @@ enum class AppDestination(vararg val argsNames: String) {
         }
 
     companion object {
+
         private const val SEPARATOR_ROUTE = "_"
         private const val TAG_ROUTE = "route"
 
-        fun findByRoute(route: String?) = AppDestination
-            .entries
-            .firstOrNull {
-                it.route == route
-            }
+        fun findByRoute(route: String?) = if (route == null) {
+            UNDEFINED
+        } else {
+            AppDestination
+                .entries
+                .firstOrNull { destination ->
+                    destination.navigationRoute == route
+                }
+        }
     }
 }

feature/search/src/main/java/st/slex/csplashscreen/feature/search/ui/SearchPhotosScreen.kt

@@ -7,14 +7,14 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
+import kotlinx.coroutines.flow.StateFlow
 import st.slex.csplashscreen.core.photos.ui.component.LazyListPhotos
 import st.slex.csplashscreen.core.photos.ui.model.PhotoModel
 import st.slex.csplashscreen.feature.search.ui.components.TopAppBarSearch
 import st.slex.csplashscreen.feature.search.ui.components.history.LazyListHistorySearch
 import st.slex.csplashscreen.feature.search.ui.model.SearchItem
-import st.slex.csplashscreen.feature.search.ui.utils.UiExt.isNotLoading
-import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun SearchPhotosScreen(
@@ -39,22 +39,23 @@ fun SearchPhotosScreen(
             search = onQuery
         )
 
-        if (photos.loadState.isNotLoading) {
-            if (photos.itemCount == 0) {
-                LazyListHistorySearch(
-                    modifier = Modifier.weight(1f),
-                    items = searchHistory,
-                    onSearchClick = remember { onQuery },
-                    clearHistory = clearHistory
-                )
-            } else {
-                LazyListPhotos(
-                    modifier = Modifier.weight(1f),
-                    items = photos,
-                    onUserClick = onUserClick,
-                    onImageClick = onImageClick,
-                )
-            }
+        if (
+            photos.loadState.refresh is LoadState.NotLoading &&
+            photos.itemCount == 0
+        ) {
+            LazyListHistorySearch(
+                modifier = Modifier.weight(1f),
+                items = searchHistory,
+                onSearchClick = remember { onQuery },
+                clearHistory = clearHistory
+            )
+        } else {
+            LazyListPhotos(
+                modifier = Modifier.weight(1f),
+                items = photos,
+                onUserClick = onUserClick,
+                onImageClick = onImageClick,
+            )
         }
     }
 }