검색 결과 UI

app/src/main/java/team/ppac/navigation/FarmemeNavHost.kt

@@ -18,6 +18,8 @@ import team.ppac.search.detail.navigation.navigateToSearchDetail
 import team.ppac.search.detail.navigation.searchDetailScreen
 import team.ppac.search.main.navigation.navigateToSearch
 import team.ppac.search.main.navigation.searchScreen
+import team.ppac.search.result.navigation.navigateToSearchResult
+import team.ppac.search.result.navigation.searchResultScreen
 
 @Composable
 fun FarmemeNavHost(
@@ -41,13 +43,17 @@ fun FarmemeNavHost(
         )
         searchScreen(
             analyticsHelper = analyticsHelper,
-            navigateToSearchDetail = { navController.navigateToSearchDetail(it) }
+            navigateToSearchDetail = { navController.navigateToSearchDetail(it) },
+            navigateToSearchResult = { navController.navigateToSearchResult() }
         )
         searchDetailScreen(
             analyticsHelper = analyticsHelper,
             navigateBack = { navController.popBackStack() },
             navigateToMemeDetail = navigateToDetail
         )
+        searchResultScreen(
+            navigateBack = { navController.popBackStack() },
+        )
         myPageScreen(
             analyticsHelper = analyticsHelper,
             navigateToDetail = navigateToDetail,

core/designsystem/src/main/kotlin/team/ppac/designsystem/component/toolbar/Toolbar.kt

@@ -28,13 +28,12 @@ fun FarmemeSearchToolbar(
     modifier: Modifier = Modifier,
     text: String,
     onTextChanged: (String) -> Unit,
-    navigationIcon: (@Composable () -> Unit)? = null,
 ) {
     Row(
         modifier = modifier
             .padding(
                 horizontal = 20.dp,
-                vertical = 10.dp
+                vertical = 16.dp
             )
             .statusBarsPadding()
             .fillMaxWidth(),
@@ -43,7 +42,7 @@ fun FarmemeSearchToolbar(
         Box(
             modifier = Modifier.size(20.dp)
         ) {
-            navigationIcon?.invoke()
+            FarmemeIcon.Back(Modifier.size(20.dp))
         }
         Spacer(modifier = Modifier.size(12.dp))
         FarmemeSearchTextField(
@@ -127,9 +126,6 @@ private fun PreviewSearchToolbar() {
     FarmemeSearchToolbar(
         text = text,
         onTextChanged = { text = it },
-        navigationIcon = {
-            FarmemeIcon.Back()
-        }
     )
 }
 

feature/search/src/main/java/team/ppac/search/detail/SearchDetailScreen.kt

@@ -74,7 +74,7 @@ internal fun SearchDetailScreen(
                     uiState.isLoading -> {
                         SearchDetailLoadingContent(
                             modifier = Modifier.fillMaxSize(),
-                            uiState = uiState
+                            isLoading = uiState.isLoading
                         )
                     }
 

feature/search/src/main/java/team/ppac/search/detail/component/SearchDetailLoadingContent.kt

@@ -21,12 +21,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import team.ppac.common.android.util.showSkeleton
 import team.ppac.designsystem.foundation.FarmemeRadius
-import team.ppac.search.detail.mvi.SearchDetailUiState
 
 @Composable
 internal fun SearchDetailLoadingContent(
     modifier: Modifier = Modifier,
-    uiState: SearchDetailUiState,
+    isLoading: Boolean,
 ) {
     Column(
         modifier = modifier
@@ -38,7 +37,7 @@ internal fun SearchDetailLoadingContent(
                 .height(18.dp)
                 .padding(start = 20.dp)
                 .clip(FarmemeRadius.Radius4.shape)
-                .showSkeleton(isLoading = uiState.isLoading)
+                .showSkeleton(isLoading = isLoading)
         )
         Spacer(modifier = Modifier.size(20.dp))
         Row(
@@ -56,23 +55,23 @@ internal fun SearchDetailLoadingContent(
                             .fillMaxWidth()
                             .height(210.dp)
                             .clip(RoundedCornerShape(16.dp))
-                            .showSkeleton(isLoading = uiState.isLoading)
+                            .showSkeleton(isLoading = isLoading)
                     )
                     Spacer(modifier = Modifier.size(10.dp))
                     Box(
                         modifier = Modifier
                             .fillMaxWidth()
                             .height(18.dp)
                             .clip(FarmemeRadius.Radius4.shape)
-                            .showSkeleton(isLoading = uiState.isLoading)
+                            .showSkeleton(isLoading = isLoading)
                     )
                     Spacer(modifier = Modifier.size(10.dp))
                     Box(
                         modifier = Modifier
                             .width(80.dp)
                             .height(18.dp)
                             .clip(FarmemeRadius.Radius4.shape)
-                            .showSkeleton(isLoading = uiState.isLoading)
+                            .showSkeleton(isLoading = isLoading)
                     )
                 }
             }
@@ -86,7 +85,7 @@ private fun SearchDetailLoadingContentPreview() {
     Box(modifier = Modifier.background(Color.White)) {
         SearchDetailLoadingContent(
             modifier = Modifier.fillMaxSize(),
-            uiState = SearchDetailUiState.INITIAL_STATE
+            isLoading = true
         )
     }
 }

feature/search/src/main/java/team/ppac/search/main/SearchRoute.kt

@@ -22,6 +22,7 @@ internal fun SearchRoute(
     analyticsHelper: AnalyticsHelper,
     viewModel: SearchViewModel = hiltViewModel(),
     navigateToSearchDetail: (String) -> Unit,
+    navigateToSearchResult: () -> Unit,
 ) {
     ComposableLifecycle { _, event ->
         when (event) {
@@ -38,6 +39,7 @@ internal fun SearchRoute(
             viewModel.sideEffect.collect { sideEffect ->
                 when (sideEffect) {
                     is SearchSideEffect.NavigateToSearchDetail -> navigateToSearchDetail(sideEffect.argument)
+                    is SearchSideEffect.NavigateToSearchResult -> navigateToSearchResult()
                 }
             }
         }

feature/search/src/main/java/team/ppac/search/main/SearchViewModel.kt

@@ -50,7 +50,8 @@ class SearchViewModel @Inject constructor(
             }
 
             is SearchIntent.ClickSearch -> {
-                showServiceOpenDialog(true)
+//                showServiceOpenDialog(true)
+                postSideEffect(SearchSideEffect.NavigateToSearchResult)
             }
 
             is SearchIntent.ClickKeywordCard -> {

feature/search/src/main/java/team/ppac/search/main/component/SearchBar.kt

@@ -49,7 +49,7 @@ internal fun FarmemeSearchBar(
             Spacer(modifier = Modifier.size(12.dp))
             Text(
                 modifier = Modifier.fillMaxWidth(),
-                text = "\uD83D\uDEA7 검색은 오픈 준비 중!",
+                text = "찾고 싶은 밈 있어?",
                 style = FarmemeTheme.typography.body.large.medium.copy(
                     color = FarmemeTheme.textColor.tertiary
                 )

feature/search/src/main/java/team/ppac/search/main/mvi/SearchSideEffect.kt

@@ -3,7 +3,6 @@ package team.ppac.search.main.mvi
 import team.ppac.common.android.base.UiSideEffect
 
 sealed class SearchSideEffect : UiSideEffect {
-    data class NavigateToSearchDetail(
-        val argument: String,
-    ) : SearchSideEffect()
+    data class NavigateToSearchDetail(val argument: String) : SearchSideEffect()
+    data object NavigateToSearchResult : SearchSideEffect()
 }

feature/search/src/main/java/team/ppac/search/main/navigation/SearchNavigation.kt

@@ -14,13 +14,15 @@ fun NavController.navigateToSearch(navOptions: NavOptions) = navigate(SEARCH_ROU
 fun NavGraphBuilder.searchScreen(
     analyticsHelper: AnalyticsHelper,
     navigateToSearchDetail: (String) -> Unit,
+    navigateToSearchResult: () -> Unit,
 ) {
     composable(
         route = SEARCH_ROUTE
     ) {
         SearchRoute(
             analyticsHelper = analyticsHelper,
-            navigateToSearchDetail = navigateToSearchDetail
+            navigateToSearchDetail = navigateToSearchDetail,
+            navigateToSearchResult = navigateToSearchResult,
         )
     }
 }

feature/search/src/main/java/team/ppac/search/result/SearchResultRoute.kt

@@ -0,0 +1,24 @@
+package team.ppac.search.result
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
+import team.ppac.common.android.base.BaseComposable
+
+@Composable
+internal fun SearchResultRoute(
+    modifier: Modifier = Modifier,
+    viewModel: SearchResultViewModel = hiltViewModel(),
+) {
+    BaseComposable(viewModel = viewModel) { uiState ->
+        SearchResultScreen(
+            modifier = modifier,
+            uiState = uiState,
+            onQueryChange = viewModel::updateSearchQuery,
+            handleLoadStates = viewModel::handleLoadErrorStates,
+            onRetryClick = {},
+            onMemeClick = {},
+            onCopyClick = { _, _ ->},
+        )
+    }
+}

feature/search/src/main/java/team/ppac/search/result/SearchResultScreen.kt

@@ -0,0 +1,91 @@
+package team.ppac.search.result
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.paging.LoadStates
+import team.ppac.common.android.component.error.FarmemeErrorScreen
+import team.ppac.common.android.extension.collectPagingItemsWithHandleState
+import team.ppac.designsystem.component.scaffold.FarmemeScaffold
+import team.ppac.designsystem.component.tabbar.TabBarHeight
+import team.ppac.designsystem.component.toolbar.FarmemeSearchToolbar
+import team.ppac.search.detail.component.EmptyResultContent
+import team.ppac.search.detail.component.SearchDetailLoadingContent
+import team.ppac.search.detail.component.SearchDetailResultContent
+import team.ppac.search.result.mvi.SearchResultUiState
+
+@Composable
+internal fun SearchResultScreen(
+    modifier: Modifier = Modifier,
+    uiState: SearchResultUiState,
+    handleLoadStates: (LoadStates) -> Unit,
+    onQueryChange: (String) -> Unit,
+    onRetryClick: () -> Unit,
+    onMemeClick: (String) -> Unit,
+    onCopyClick: (String, String) -> Unit,
+) {
+    val searchResults = uiState.searchResults.collectPagingItemsWithHandleState(handleLoadStates)
+
+    when {
+        uiState.isError -> {
+            FarmemeErrorScreen(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(bottom = TabBarHeight),
+                title = "정보를 불러오지 못 했어요.\n새로고침 해주세요.",
+                onRetryClick = onRetryClick
+            )
+        }
+
+        else -> {
+            FarmemeScaffold(
+                modifier = modifier.fillMaxSize(),
+                topBar = {
+                    FarmemeSearchToolbar(
+                        text = uiState.query,
+                        onTextChanged = onQueryChange
+                    )
+                }
+            ) { paddingValues ->
+                val innerPadding = PaddingValues(
+                    top = paddingValues.calculateTopPadding(),
+                    start = paddingValues.calculateStartPadding(LayoutDirection.Ltr),
+                    end = paddingValues.calculateEndPadding(LayoutDirection.Ltr),
+                    bottom = paddingValues.calculateBottomPadding() + TabBarHeight
+                )
+
+                when {
+                    uiState.isLoading -> {
+                        SearchDetailLoadingContent(
+                            modifier = Modifier.fillMaxSize(),
+                            isLoading = uiState.isLoading
+                        )
+                    }
+
+                    else -> {
+                        Column(
+                            modifier = Modifier.padding(innerPadding)
+                        ) {
+                            if (uiState.totalMemeCount == 0) {
+                                EmptyResultContent()
+                            } else {
+                                SearchDetailResultContent(
+                                    totalItemCount = uiState.totalMemeCount,
+                                    searchResults = searchResults,
+                                    onMemeClick = onMemeClick,
+                                    onCopyClick = onCopyClick,
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

feature/search/src/main/java/team/ppac/search/result/SearchResultViewModel.kt

@@ -0,0 +1,55 @@
+package team.ppac.search.result
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.paging.LoadState
+import androidx.paging.LoadStates
+import dagger.hilt.android.lifecycle.HiltViewModel
+import team.ppac.common.android.base.BaseViewModel
+import team.ppac.errorhandling.FarmemeNetworkException
+import team.ppac.search.result.mvi.SearchResultIntent
+import team.ppac.search.result.mvi.SearchResultSideEffect
+import team.ppac.search.result.mvi.SearchResultUiState
+import javax.inject.Inject
+
+@HiltViewModel
+class SearchResultViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+) : BaseViewModel<SearchResultUiState, SearchResultSideEffect, SearchResultIntent>(savedStateHandle) {
+
+    override fun createInitialState(savedStateHandle: SavedStateHandle): SearchResultUiState {
+        return SearchResultUiState.INITIAL_STATE
+    }
+
+    override suspend fun handleIntent(intent: SearchResultIntent) {
+        TODO("Not yet implemented")
+    }
+
+    override fun handleClientException(throwable: Throwable) {
+        TODO("Not yet implemented")
+    }
+
+    fun updateSearchQuery(query: String) {
+        reduce { copy(query = query) }
+    }
+
+    fun handleLoadErrorStates(loadStates: LoadStates) {
+        val errorLoadState = arrayOf(
+            loadStates.prepend,
+            loadStates.append,
+            loadStates.refresh
+        ).filterIsInstance(LoadState.Error::class.java).firstOrNull()
+
+        val exception = errorLoadState?.error
+        if (exception != null) {
+            when (exception) {
+                is FarmemeNetworkException -> {
+                    updateErrorState(isError = true)
+                }
+            }
+        }
+    }
+
+    private fun updateErrorState(isError: Boolean) {
+        reduce { copy(isError = isError) }
+    }
+}

feature/search/src/main/java/team/ppac/search/result/mvi/SearchResultIntent.kt

@@ -0,0 +1,5 @@
+package team.ppac.search.result.mvi
+
+import team.ppac.common.android.base.UiIntent
+
+sealed interface SearchResultIntent : UiIntent

feature/search/src/main/java/team/ppac/search/result/mvi/SearchResultSideEffect.kt

@@ -0,0 +1,5 @@
+package team.ppac.search.result.mvi
+
+import team.ppac.common.android.base.UiSideEffect
+
+sealed interface SearchResultSideEffect : UiSideEffect