diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 1e8043b2..0c91e703 100644 --- 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,6 +86,14 @@ dependencies { */ implementation(Kotlin.reflect) + /** + * Compose + */ + implementation(platform(Compose.base)) + implementation(Compose.material) + implementation(Compose.preview) + implementation(Compose.ui) + /** * Unit Test */ @@ -89,4 +101,6 @@ dependencies { androidTestImplementation(UnitTest.junit) androidTestImplementation(UnitTest.androidJUnit) androidTestImplementation(UnitTest.Espresso.core) + androidTestImplementation(platform(Compose.base)) + debugImplementation(UnitTest.Compose.tooling) } \ No newline at end of file diff --git a/features/compose-ui/src/main/java/com/feature/compose_ui/TilColor.kt b/core/src/main/java/com/hmju/core/compose/TilColor.kt similarity index 97% rename from features/compose-ui/src/main/java/com/feature/compose_ui/TilColor.kt rename to core/src/main/java/com/hmju/core/compose/TilColor.kt index 1193a84f..db1b6865 100644 --- a/features/compose-ui/src/main/java/com/feature/compose_ui/TilColor.kt +++ b/core/src/main/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/features/compose-ui/src/main/java/com/feature/compose_ui/TilTextStyle.kt b/core/src/main/java/com/hmju/core/compose/TilTextStyle.kt similarity index 98% rename from features/compose-ui/src/main/java/com/feature/compose_ui/TilTextStyle.kt rename to core/src/main/java/com/hmju/core/compose/TilTextStyle.kt index c84e7d11..22a4c8ac 100644 --- a/features/compose-ui/src/main/java/com/feature/compose_ui/TilTextStyle.kt +++ b/core/src/main/java/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/features/compose-ui/src/main/java/com/feature/compose_ui/TilTheme.kt b/core/src/main/java/com/hmju/core/compose/TilTheme.kt similarity index 95% rename from features/compose-ui/src/main/java/com/feature/compose_ui/TilTheme.kt rename to core/src/main/java/com/hmju/core/compose/TilTheme.kt index 4caaf600..62d5781e 100644 --- a/features/compose-ui/src/main/java/com/feature/compose_ui/TilTheme.kt +++ b/core/src/main/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/features/compose-ui/src/main/java/com/feature/compose_ui/TilThemeExample.kt b/core/src/main/java/com/hmju/core/compose/TilThemeExample.kt similarity index 99% rename from features/compose-ui/src/main/java/com/feature/compose_ui/TilThemeExample.kt rename to core/src/main/java/com/hmju/core/compose/TilThemeExample.kt index 67b01d05..bd99ed85 100644 --- a/features/compose-ui/src/main/java/com/feature/compose_ui/TilThemeExample.kt +++ b/core/src/main/java/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 index 3a2c69c4..acd29622 100644 --- 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 index 6cc4e62d..09a6d461 100644 --- 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 index c10b7270..ce42a529 100644 --- 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 index defeb761..dce7402e 100644 --- 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 /**