[Feat] 키워드 모아보기 모듈화

mash-up-kr · Oct 5, 2024 · 0840d32 · 0840d32
1 parent 233b0b0
commit 0840d32
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 107 deletions.
diff --git a/app/build.gradle.kts b/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)

diff --git a/feature/keyword-collection/.gitignore b/feature/keyword-collection/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/feature/keyword-collection/build.gradle.kts b/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)
+}
diff --git a/feature/keyword-collection/src/main/AndroidManifest.xml b/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>
diff --git a/...c/search/detail/KeywordCollectionRoute.kt → ...word_collection/KeywordCollectionRoute.kt b/...c/search/detail/KeywordCollectionRoute.kt → ...word_collection/KeywordCollectionRoute.kt
@@ -1,4 +1,4 @@
-package team.ppac.search.detail
+package team.ppac.feature.keyword_collection
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -19,8 +19,8 @@ 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.KeywordCollectionIntent
-import team.ppac.search.detail.mvi.KeywordCollectionSideEffect
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionIntent
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionSideEffect
 
 @Composable
 internal fun KeywordCollectionRoute(

diff --git a/.../search/detail/KeywordCollectionScreen.kt → ...ord_collection/KeywordCollectionScreen.kt b/.../search/detail/KeywordCollectionScreen.kt → ...ord_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
@@ -21,8 +21,8 @@ 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.KeywordCollectionLoadingContent
-import team.ppac.search.detail.mvi.KeywordCollectionUiState
+import team.ppac.common.android.component.paging.PagingItemsLoadingContent
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionUiState
 
 @Composable
 internal fun KeywordCollectionScreen(
@@ -72,7 +72,7 @@ internal fun KeywordCollectionScreen(
 
                 when {
                     uiState.isLoading -> {
-                        KeywordCollectionLoadingContent(
+                        PagingItemsLoadingContent(
                             modifier = Modifier.fillMaxSize(),
                             isLoading = uiState.isLoading
                         )

diff --git a/...arch/detail/KeywordCollectionViewModel.kt → ..._collection/KeywordCollectionViewModel.kt b/...arch/detail/KeywordCollectionViewModel.kt → ..._collection/KeywordCollectionViewModel.kt
@@ -1,4 +1,4 @@
-package team.ppac.search.detail
+package team.ppac.feature.keyword_collection
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
@@ -16,9 +16,9 @@ import team.ppac.domain.model.MemeWatchType
 import team.ppac.domain.usecase.GetSearchMemeUseCase
 import team.ppac.domain.usecase.WatchMemeUseCase
 import team.ppac.errorhandling.FarmemeNetworkException
-import team.ppac.search.detail.mvi.KeywordCollectionIntent
-import team.ppac.search.detail.mvi.KeywordCollectionSideEffect
-import team.ppac.search.detail.mvi.KeywordCollectionUiState
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionIntent
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionSideEffect
+import team.ppac.feature.keyword_collection.mvi.KeywordCollectionUiState
 import javax.inject.Inject
 
 @HiltViewModel

diff --git a/...rch/detail/mvi/KeywordCollectionIntent.kt → ...collection/mvi/KeywordCollectionIntent.kt b/...rch/detail/mvi/KeywordCollectionIntent.kt → ...collection/mvi/KeywordCollectionIntent.kt
@@ -1,4 +1,4 @@
-package team.ppac.search.detail.mvi
+package team.ppac.feature.keyword_collection.mvi
 
 import team.ppac.common.android.base.UiIntent
 

diff --git a/...detail/mvi/KeywordCollectionSideEffect.kt → ...ection/mvi/KeywordCollectionSideEffect.kt b/...detail/mvi/KeywordCollectionSideEffect.kt → ...ection/mvi/KeywordCollectionSideEffect.kt
@@ -1,4 +1,4 @@
-package team.ppac.search.detail.mvi
+package team.ppac.feature.keyword_collection.mvi
 
 import team.ppac.common.android.base.UiSideEffect
 

diff --git a/...ch/detail/mvi/KeywordCollectionUiState.kt → ...ollection/mvi/KeywordCollectionUiState.kt b/...ch/detail/mvi/KeywordCollectionUiState.kt → ...ollection/mvi/KeywordCollectionUiState.kt
@@ -1,4 +1,4 @@
-package team.ppac.search.detail.mvi
+package team.ppac.feature.keyword_collection.mvi
 
 import androidx.paging.PagingData
 import kotlinx.coroutines.flow.Flow

diff --git a/...navigation/KeywordCollectionNavigation.kt → ...navigation/KeywordCollectionNavigation.kt b/...navigation/KeywordCollectionNavigation.kt → ...navigation/KeywordCollectionNavigation.kt
@@ -1,12 +1,12 @@
-package team.ppac.search.detail.navigation
+package team.ppac.feature.keyword_collection.navigation
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import team.ppac.analytics.AnalyticsHelper
-import team.ppac.search.detail.KeywordCollectionRoute
+import team.ppac.feature.keyword_collection.KeywordCollectionRoute
 
 const val KEYWORD_COLLECTION_ROUTE = "keyword_collection"
 

diff --git a/...search/src/main/java/team/ppac/search/detail/component/KeywordCollectionLoadingContent.kt b/...search/src/main/java/team/ppac/search/detail/component/KeywordCollectionLoadingContent.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -42,3 +42,4 @@ include(":feature:detail")
 include(":feature:setting")
 include(":feature:splash")
 include(":feature:register")
+include(":feature:keyword-collection")