refactor: Compose 공통으로 사용하는 부분들 core 모듈로 이동

sieunju · Jan 21, 2024 · 086ee73 · 086ee73
1 parent 26fef9e
commit 086ee73
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 5 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -9,11 +9,15 @@ plugins {
 android {
     namespace = "com.hmju.core"
     buildFeatures {
+        compose = true
         dataBinding = true
     }
     kapt {
         correctErrorTypes = true
     }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.1"
+    }
 }
 
 dependencies {
@@ -82,11 +86,21 @@ dependencies {
      */
     implementation(Kotlin.reflect)
 
+    /**
+     * Compose
+     */
+    implementation(platform(Compose.base))
+    implementation(Compose.material)
+    implementation(Compose.preview)
+    implementation(Compose.ui)
+
     /**
      * Unit Test
      */
     testImplementation(UnitTest.junit)
     androidTestImplementation(UnitTest.junit)
     androidTestImplementation(UnitTest.androidJUnit)
     androidTestImplementation(UnitTest.Espresso.core)
+    androidTestImplementation(platform(Compose.base))
+    debugImplementation(UnitTest.Compose.tooling)
 }
diff --git a/...n/java/com/feature/compose_ui/TilColor.kt → ...in/java/com/hmju/core/compose/TilColor.kt b/...n/java/com/feature/compose_ui/TilColor.kt → ...in/java/com/hmju/core/compose/TilColor.kt
@@ -1,4 +1,4 @@
-package com.feature.compose_ui
+package com.hmju.core.compose
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color

diff --git a/...va/com/feature/compose_ui/TilTextStyle.kt → ...ava/com/hmju/core/compose/TilTextStyle.kt b/...va/com/feature/compose_ui/TilTextStyle.kt → ...ava/com/hmju/core/compose/TilTextStyle.kt
@@ -1,4 +1,4 @@
-package com.feature.compose_ui
+package com.hmju.core.compose
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle

diff --git a/...n/java/com/feature/compose_ui/TilTheme.kt → ...in/java/com/hmju/core/compose/TilTheme.kt b/...n/java/com/feature/compose_ui/TilTheme.kt → ...in/java/com/hmju/core/compose/TilTheme.kt
@@ -1,4 +1,4 @@
-package com.feature.compose_ui
+package com.hmju.core.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable

diff --git a/...com/feature/compose_ui/TilThemeExample.kt → .../com/hmju/core/compose/TilThemeExample.kt b/...com/feature/compose_ui/TilThemeExample.kt → .../com/hmju/core/compose/TilThemeExample.kt
@@ -1,4 +1,4 @@
-package com.feature.compose_ui
+package com.hmju.core.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

diff --git a/features/compose-ui/src/main/java/com/feature/compose_ui/ComposeUiActivity.kt b/features/compose-ui/src/main/java/com/feature/compose_ui/ComposeUiActivity.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.feature.compose_ui.databinding.AComposeUiBinding
+import com.hmju.core.compose.TilTheme
 import com.hmju.core.ui.base.BaseActivity
 import timber.log.Timber
 

diff --git a/features/compose-ui/src/main/java/com/feature/compose_ui/GeneralComposeActivity.kt b/features/compose-ui/src/main/java/com/feature/compose_ui/GeneralComposeActivity.kt
@@ -19,6 +19,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import com.hmju.core.compose.TilTheme
 import timber.log.Timber
 
 /**

diff --git a/features/compose-ui/src/main/java/com/feature/compose_ui/MemoComposeUiActivity.kt b/features/compose-ui/src/main/java/com/feature/compose_ui/MemoComposeUiActivity.kt
@@ -30,6 +30,7 @@ import androidx.lifecycle.lifecycleScope
 import com.feature.compose_ui.model.MemoModel
 import com.feature.compose_ui.model.MemoUiModel
 import com.feature.compose_ui.usecase.GetMemoListUseCase
+import com.hmju.core.compose.TilTheme
 import com.hmju.core.model.params.PagingParameter
 import com.hmju.core.ui.paging.PagingModel
 import dagger.hilt.android.AndroidEntryPoint

diff --git a/features/compose-ui/src/main/java/com/feature/compose_ui/model/MemoUiModel.kt b/features/compose-ui/src/main/java/com/feature/compose_ui/model/MemoUiModel.kt
@@ -29,7 +29,7 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import com.bumptech.glide.integration.compose.GlideImage
 import com.bumptech.glide.integration.compose.placeholder
-import com.feature.compose_ui.TilTheme
+import com.hmju.core.compose.TilTheme
 import com.hmju.core.R
 
 /**