키워드 모아보기 모듈화

app/build.gradle.kts

@@ -94,6 +94,7 @@ dependencies {
     implementation(project(":feature:setting"))
     implementation(project(":feature:splash"))
     implementation(project(":feature:register"))
+    implementation(project(":feature:keyword-collection"))
 
     implementation(libs.core.ktx)
     implementation(libs.lifecycle)

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

@@ -14,8 +14,8 @@ import team.ppac.mypage.navigation.navigateToMyPage
 import team.ppac.recommendation.navigation.RECOMMENDATION_ROUTE
 import team.ppac.recommendation.navigation.navigateToRecommendation
 import team.ppac.recommendation.navigation.recommendationScreen
-import team.ppac.search.detail.navigation.navigateToSearchDetail
-import team.ppac.search.detail.navigation.searchDetailScreen
+import team.ppac.feature.keyword_collection.navigation.navigateToKeywordCollection
+import team.ppac.feature.keyword_collection.navigation.keywordCollectionScreen
 import team.ppac.search.main.navigation.navigateToSearch
 import team.ppac.search.main.navigation.searchScreen
 import team.ppac.search.result.navigation.navigateToSearchResult
@@ -44,10 +44,10 @@ fun FarmemeNavHost(
         )
         searchScreen(
             analyticsHelper = analyticsHelper,
-            navigateToSearchDetail = { navController.navigateToSearchDetail(it) },
+            navigateToKeywordCollection = { navController.navigateToKeywordCollection(it) },
             navigateToSearchResult = { navController.navigateToSearchResult(it) }
         )
-        searchDetailScreen(
+        keywordCollectionScreen(
             analyticsHelper = analyticsHelper,
             navigateBack = { navController.popBackStack() },
             navigateToMemeDetail = navigateToDetail

core/common/android/build.gradle.kts

@@ -24,6 +24,7 @@ android {
 
 dependencies {
     implementation(project(":core:designsystem"))
+    implementation(project(":core:domain"))
 
     implementation(libs.kotlin.coroutines.android)
     implementation(libs.kotlin.coroutines.core)

feature/search/src/main/java/team/ppac/search/detail/component/EmptyResultContent.kt → core/common/android/src/main/kotlin/team/ppac/common/android/component/empty/EmptyResultContent.kt

@@ -1,4 +1,4 @@
-package team.ppac.search.detail.component
+package team.ppac.common.android.component.empty
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

feature/search/src/main/java/team/ppac/search/detail/component/SearchDetailLoadingContent.kt → core/common/android/src/main/kotlin/team/ppac/common/android/component/paging/PagingItemsLoadingContent.kt

@@ -1,4 +1,4 @@
-package team.ppac.search.detail.component
+package team.ppac.common.android.component.paging
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -23,7 +23,7 @@ import team.ppac.common.android.util.showSkeleton
 import team.ppac.designsystem.foundation.FarmemeRadius
 
 @Composable
-internal fun SearchDetailLoadingContent(
+fun PagingItemsLoadingContent(
     modifier: Modifier = Modifier,
     isLoading: Boolean,
 ) {
@@ -81,9 +81,9 @@ internal fun SearchDetailLoadingContent(
 
 @Preview
 @Composable
-private fun SearchDetailLoadingContentPreview() {
+private fun PagingItemsLoadingContentPreview() {
     Box(modifier = Modifier.background(Color.White)) {
-        SearchDetailLoadingContent(
+        PagingItemsLoadingContent(
             modifier = Modifier.fillMaxSize(),
             isLoading = true
         )

feature/search/src/main/java/team/ppac/search/detail/component/SearchDetailResultContent.kt → core/common/android/src/main/kotlin/team/ppac/common/android/component/paging/PagingMemesContent.kt

@@ -1,4 +1,4 @@
-package team.ppac.search.detail.component
+package team.ppac.common.android.component.paging
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.offset
@@ -7,18 +7,22 @@ import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
+import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
+import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
+import kotlinx.coroutines.flow.emptyFlow
 import team.ppac.common.android.component.FarmemeMemeItem
-import team.ppac.search.detail.model.SearchResultUiModel
+import team.ppac.domain.model.Meme
 
 @Composable
-fun SearchDetailResultContent(
+fun PagingMemesContent(
     modifier: Modifier = Modifier,
     totalItemCount: Int,
-    searchResults: LazyPagingItems<SearchResultUiModel>,
+    pagingItems: LazyPagingItems<Meme>,
     onMemeClick: (String) -> Unit,
     onCopyClick: (String, String) -> Unit,
 ) {
@@ -32,25 +36,25 @@ fun SearchDetailResultContent(
             SearchDetailResultHeader(totalCount = totalItemCount)
         }
         items(
-            count = searchResults.itemCount,
-            key = searchResults.itemKey(SearchResultUiModel::memeId)
+            count = pagingItems.itemCount,
+            key = pagingItems.itemKey(Meme::id)
         ) { index ->
-            val searchResult = searchResults[index] ?: return@items
+            val searchResult = pagingItems[index] ?: return@items
 
             with(searchResult) {
                 FarmemeMemeItem(
                     modifier = Modifier.offset(y = (-20).dp),
-                    memeId = memeId,
-                    memeTitle = memeTitle,
-                    lolCount = lolCount,
+                    memeId = id,
+                    memeTitle = title,
+                    lolCount = reactionCount,
                     imageUrl = imageUrl,
                     onMemeClick = onMemeClick,
-                    onCopyClick = { onCopyClick(memeId, memeTitle) },
+                    onCopyClick = { onCopyClick(id, title) },
                 )
             }
         }
 
-        searchResults.apply {
+        pagingItems.apply {
             when {
                 loadState.append is LoadState.NotLoading && loadState.append.endOfPaginationReached -> {
                     item(span = StaggeredGridItemSpan.FullLine) {
@@ -60,4 +64,15 @@ fun SearchDetailResultContent(
             }
         }
     }
+}
+
+@Preview
+@Composable
+private fun PagingMemesContentPreview() {
+    PagingMemesContent(
+        totalItemCount = 10,
+        pagingItems = emptyFlow<PagingData<Meme>>().collectAsLazyPagingItems(),
+        onMemeClick = {},
+        onCopyClick = { _, _ -> }
+    )
 }

feature/search/src/main/java/team/ppac/search/detail/component/SearchDetailResultFooter.kt → core/common/android/src/main/kotlin/team/ppac/common/android/component/paging/PagingResultFooter.kt

@@ -1,4 +1,4 @@
-package team.ppac.search.detail.component
+package team.ppac.common.android.component.paging
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

feature/search/src/main/java/team/ppac/search/detail/component/SearchDetailResultHeader.kt → core/common/android/src/main/kotlin/team/ppac/common/android/component/paging/PagingResultItemCountHeader.kt

@@ -1,4 +1,4 @@
-package team.ppac.search.detail.component
+package team.ppac.common.android.component.paging
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxWidth

feature/keyword-collection/.gitignore

@@ -0,0 +1 @@
+/build

feature/keyword-collection/build.gradle.kts

@@ -0,0 +1,50 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.dagger.hilt)
+    alias(libs.plugins.kotlin.kapt)
+}
+
+android {
+    namespace = "team.ppac.feature.keyword_collection"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    implementation(project(":core:common:android"))
+    implementation(project(":core:common:kotlin"))
+    implementation(project(":core:domain"))
+    implementation(project(":core:designsystem"))
+    implementation(project(":core:error-handling"))
+    implementation(project(":core:analytics"))
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.bundles.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.appcompat)
+    implementation(libs.core.ktx)
+    implementation(libs.kotlin.coroutines.android)
+    implementation(libs.timber)
+    implementation(libs.hilt.android)
+    implementation(libs.kotlinx.collections.immutable)
+    kapt(libs.hilt.compiler)
+    implementation(libs.paging.runtime)
+    implementation(libs.paging.compose)
+}

feature/keyword-collection/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

feature/search/src/main/java/team/ppac/search/detail/SearchDetailRoute.kt → feature/keyword-collection/src/main/java/team/ppac/feature/keyword_collection/KeywordCollectionRoute.kt

@@ -1,11 +1,9 @@
-package team.ppac.search.detail
+package team.ppac.feature.keyword_collection
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -21,15 +19,14 @@ import team.ppac.analytics.action.SearchDetailAction
 import team.ppac.analytics.type.ScreenType
 import team.ppac.common.android.base.BaseComposable
 import team.ppac.common.android.util.ComposableLifecycle
-import team.ppac.search.detail.mvi.SearchDetailIntent
-import team.ppac.search.detail.mvi.SearchDetailSideEffect
-import timber.log.Timber
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionIntent
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionSideEffect
 
 @Composable
-internal fun SearchDetailRoute(
+internal fun KeywordCollectionRoute(
     modifier: Modifier = Modifier,
     analyticsHelper: AnalyticsHelper,
-    viewModel: SearchDetailViewModel = hiltViewModel(),
+    viewModel: KeywordCollectionViewModel = hiltViewModel(),
     navigateBack: () -> Unit,
     navigateToMemeDetail: (String) -> Unit,
 ) {
@@ -55,13 +52,13 @@ internal fun SearchDetailRoute(
         LaunchedEffect(key1 = viewModel) {
             viewModel.sideEffect.collect { sideEffect ->
                 when (sideEffect) {
-                    is SearchDetailSideEffect.NavigateToMemeDetail ->
+                    is KeywordCollectionSideEffect.NavigateToMemeDetail ->
                         navigateToMemeDetail(sideEffect.memeId)
                 }
             }
         }
 
-        SearchDetailScreen(
+        KeywordCollectionScreen(
             modifier = modifier,
             uiState = uiState,
             handleLoadStates = viewModel::handleLoadErrorStates,
@@ -85,9 +82,9 @@ internal fun SearchDetailRoute(
                     }
                 )
 
-                viewModel.intent(SearchDetailIntent.ClickMeme(memeId))
+                viewModel.intent(KeywordCollectionIntent.ClickMeme(memeId))
             },
-            onRetryClick = { viewModel.intent(SearchDetailIntent.ClickErrorRetry) },
+            onRetryClick = { viewModel.intent(KeywordCollectionIntent.ClickErrorRetry) },
             onCopyClick = { memeId, memeTitle ->
                 analyticsHelper.reportAction(
                     action = SearchDetailAction.CLICK_COPY,

feature/search/src/main/java/team/ppac/search/detail/SearchDetailScreen.kt → feature/keyword-collection/src/main/java/team/ppac/feature/keyword_collection/KeywordCollectionScreen.kt

@@ -1,4 +1,4 @@
-package team.ppac.search.detail
+package team.ppac.feature.keyword_collection
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -13,28 +13,28 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.paging.LoadStates
+import team.ppac.common.android.component.empty.EmptyResultContent
+import team.ppac.common.android.component.paging.PagingMemesContent
 import team.ppac.common.android.component.error.FarmemeErrorScreen
 import team.ppac.common.android.extension.collectPagingItemsWithHandleState
 import team.ppac.designsystem.FarmemeTheme
 import team.ppac.designsystem.component.scaffold.FarmemeScaffold
 import team.ppac.designsystem.component.tabbar.TabBarHeight
 import team.ppac.designsystem.component.toolbar.FarmemeBackToolBar
-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.detail.mvi.SearchDetailUiState
+import team.ppac.common.android.component.paging.PagingItemsLoadingContent
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionUiState
 
 @Composable
-internal fun SearchDetailScreen(
+internal fun KeywordCollectionScreen(
     modifier: Modifier = Modifier,
-    uiState: SearchDetailUiState,
+    uiState: KeywordCollectionUiState,
     handleLoadStates: (LoadStates) -> Unit,
     onBackClick: () -> Unit,
     onMemeClick: (String) -> Unit,
     onRetryClick: () -> Unit,
     onCopyClick: (String, String) -> Unit,
 ) {
-    val searchResults = uiState.searchResults.collectPagingItemsWithHandleState(handleLoadStates)
+    val memes = uiState.memes.collectPagingItemsWithHandleState(handleLoadStates)
 
     when {
         uiState.isError -> {
@@ -72,7 +72,7 @@ internal fun SearchDetailScreen(
 
                 when {
                     uiState.isLoading -> {
-                        SearchDetailLoadingContent(
+                        PagingItemsLoadingContent(
                             modifier = Modifier.fillMaxSize(),
                             isLoading = uiState.isLoading
                         )
@@ -85,9 +85,9 @@ internal fun SearchDetailScreen(
                             if (uiState.totalMemeCount == 0) {
                                 EmptyResultContent()
                             } else {
-                                SearchDetailResultContent(
+                                PagingMemesContent(
                                     totalItemCount = uiState.totalMemeCount,
-                                    searchResults = searchResults,
+                                    pagingItems = memes,
                                     onMemeClick = onMemeClick,
                                     onCopyClick = onCopyClick,
                                 )
@@ -103,8 +103,8 @@ internal fun SearchDetailScreen(
 @Preview
 @Composable
 private fun SearchDetailScreenPreview() {
-    SearchDetailScreen(
-        uiState = SearchDetailUiState.INITIAL_STATE,
+    KeywordCollectionScreen(
+        uiState = KeywordCollectionUiState.INITIAL_STATE,
         handleLoadStates = {},
         onBackClick = {},
         onMemeClick = {},