Merge pull request #4 from lemoncloud-io/feature/raine-build

프로젝트 네이밍 및 구조 수정

README.md

@@ -8,8 +8,9 @@
 
 | module                       | description               |
 |------------------------------|---------------------------|
-| lemon-core-ui:architecture   | mvi 기반 architecture 인터페이스 |
-| lemon-core-android:component | android component 유틸리티    |
+| android-component            | android component 유틸리티    |
+| ui-architecture              | mvi 기반 architecture 인터페이스 |
+| util-compose (Not Implement) | compose 유틸리티              |
 
 ### UI-Architecture
 

lemon-core-ui/architecture/build.gradle.kts → android-component/build.gradle.kts

@@ -5,5 +5,6 @@ plugins {
 }
 
 android {
-    namespace = "io.lemon.android.core.ui.architecture"
+    namespace = "io.lemon.core.android.component"
+    group = "io.lemon.core"
 }

lemon-core-android/component/src/main/java/io/remon/android/core/android/component/intent/Intent.kt → android-component/src/main/java/io/lemon/core/component/intent/Intent.kt

@@ -1,4 +1,4 @@
-package io.remon.android.core.android.component.intent
+package io.lemon.core.android.component.intent
 
 import android.content.Context
 import android.content.Intent

lemon-core-android/component/src/main/java/io/remon/android/core/android/component/intent/IntentBuilder.kt → android-component/src/main/java/io/lemon/core/component/intent/IntentBuilder.kt

@@ -1,4 +1,4 @@
-package io.remon.android.core.android.component.intent
+package io.lemon.core.android.component.intent
 
 import android.content.Context
 import android.content.Intent

lemon-core-android/component/src/main/java/io/remon/android/core/android/component/intent/PendingIntent.kt → android-component/src/main/java/io/lemon/core/component/intent/PendingIntent.kt

@@ -1,4 +1,4 @@
-package io.remon.android.core.android.component.intent
+package io.lemon.core.android.component.intent
 
 import android.app.PendingIntent
 import android.content.Context

lemon-core-android/component/src/main/java/io/remon/android/core/android/component/launcher/ActivityLauncher.kt → android-component/src/main/java/io/lemon/core/component/launcher/ActivityLauncher.kt

@@ -1,4 +1,4 @@
-package io.remon.android.core.android.component.launcher
+package io.lemon.core.android.component.launcher
 
 import android.app.Activity
 import android.app.Service
@@ -7,7 +7,7 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
 import android.content.Intent.FLAG_ACTIVITY_NO_HISTORY
 import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP
-import io.remon.android.core.android.component.intent.IntentBuilder
+import io.lemon.core.android.component.intent.IntentBuilder
 import kotlin.reflect.KClass
 
 /**

lemon-core-android/component/src/main/java/io/remon/android/core/android/component/launcher/ReceiverLauncher.kt → android-component/src/main/java/io/lemon/core/component/launcher/ReceiverLauncher.kt

@@ -1,10 +1,10 @@
-package io.remon.android.core.android.component.launcher
+package io.lemon.core.android.component.launcher
 
 import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import io.remon.android.core.android.component.intent.IntentBuilder
+import io.lemon.core.android.component.intent.IntentBuilder
 import kotlin.reflect.KClass
 
 /**

lemon-core-android/component/src/main/java/io/remon/android/core/android/component/launcher/ServiceLauncher.kt → android-component/src/main/java/io/lemon/core/component/launcher/ServiceLauncher.kt

@@ -1,10 +1,10 @@
-package io.remon.android.core.android.component.launcher
+package io.lemon.core.android.component.launcher
 
 import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import io.remon.android.core.android.component.intent.IntentBuilder
+import io.lemon.core.android.component.intent.IntentBuilder
 import kotlin.reflect.KClass
 
 /**

build-system/src/main/kotlin/io/lemon/android/buildSystem/Config.kt

@@ -16,7 +16,7 @@ internal object Config {
         ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHH")).toInt()
 
     // You must change app package path and it.
-    const val APPLICATION_ID = "io.lemon.android.core"
+    const val APPLICATION_ID = "io.lemon.core"
 
     val JAVA_VERSION = JavaVersion.VERSION_17
     val JVM_TARGET = JvmTarget.JVM_17

build-system/src/main/kotlin/io/lemon/android/buildSystem/extensions/Android.kt

@@ -1,7 +1,6 @@
 package io.lemon.android.buildSystem.extensions
 
 import com.android.build.api.dsl.CommonExtension
-import io.lemon.android.buildSystem.Config
 import io.lemon.android.buildSystem.Config.JAVA_VERSION
 
 
@@ -20,16 +19,11 @@ internal fun extensionAndroid(
             targetCompatibility = JAVA_VERSION  // The lowest Java version that a android can run
         }
 
-        configureFlavor(
-            commonExtension = this,
-            flavorList = Config.Flavor.FLAVOR_LIST,
-        )
-
         packaging {
             resources {
                 excludes += "/META-INF/{AL2.0,LGPL2.1}"
             }
         }
 
     }
-}
+}

sample/build.gradle.kts

@@ -14,5 +14,5 @@ android {
     namespace = "io.lemon.android.core"
 }
 dependencies {
-    implementation(project(":lemon-core-ui:architecture"))
+    implementation(project(":ui-architecture"))
 }

sample/src/main/java/io/lemon/android/core/home/data/HomeEffect.kt

@@ -1,6 +1,6 @@
 package io.lemon.android.core.home.data
 
-import io.lemon.android.core.ui.architecture.BaseEffect
+import io.lemon.core.ui.architecture.BaseEffect
 
 sealed interface HomeEffect : BaseEffect {
     data class ShowSnackbar(val message: String) : HomeEffect

sample/src/main/java/io/lemon/android/core/home/data/HomeError.kt

@@ -1,6 +1,6 @@
 package io.lemon.android.core.home.data
 
-import io.lemon.android.core.ui.architecture.BaseError
+import io.lemon.core.ui.architecture.BaseError
 
 data class HomeError(
     override val message: String,

sample/src/main/java/io/lemon/android/core/home/data/HomeEvent.kt

@@ -1,6 +1,6 @@
 package io.lemon.android.core.home.data
 
-import io.lemon.android.core.ui.architecture.BaseEvent
+import io.lemon.core.ui.architecture.BaseEvent
 
 sealed interface HomeEvent : BaseEvent {
 

sample/src/main/java/io/lemon/android/core/home/data/HomeState.kt

@@ -1,6 +1,6 @@
 package io.lemon.android.core.home.data
 
-import io.lemon.android.core.ui.architecture.BaseState
+import io.lemon.core.ui.architecture.BaseState
 
 data class HomeState(
     override val isLoading: Boolean = false,

sample/src/main/java/io/lemon/android/core/home/data/HomeViewModel.kt

@@ -1,7 +1,7 @@
 package io.lemon.android.core.home.data
 
-import io.lemon.android.core.ui.architecture.Config
-import io.lemon.android.core.ui.architecture.BaseViewModel
+import io.lemon.core.ui.architecture.Config
+import io.lemon.core.ui.architecture.BaseViewModel
 
 class HomeViewModel : BaseViewModel<HomeState, HomeEvent, HomeEffect, HomeError>() {
 

settings.gradle.kts

@@ -22,5 +22,5 @@ dependencyResolutionManagement {
 }
 
 include(":sample")
-include(":lemon-core-ui:architecture")
-include(":lemon-core-android:component")
+include(":android-component")
+include(":ui-architecture")

ui-architecture/.gitignore

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

lemon-core-ui/architecture/README.md → ui-architecture/README.md

@@ -16,5 +16,5 @@ sample 프로젝트 참고
 
 ### Architecture
 
-![ui-architecture](./assets/ui-architecture.jpeg)
+![ui-architecture](assets/ui-architecture.jpeg)
 

lemon-core-android/component/build.gradle.kts → ui-architecture/build.gradle.kts

@@ -5,5 +5,6 @@ plugins {
 }
 
 android {
-    namespace = "io.lemon.android.core.android.component"
+    namespace = "io.lemon.core.ui.architecture"
+    group = "io.lemon.core"
 }

ui-architecture/consumer-rules.pro

@@ -0,0 +1,5 @@
+-dontwarn io.lemon.core.ui.architecture.BaseEffect
+-dontwarn io.lemon.core.ui.architecture.BaseEvent
+-dontwarn io.lemon.core.ui.architecture.BaseState
+-dontwarn io.lemon.core.ui.architecture.BaseError
+-dontwarn io.lemon.core.ui.architecture.BaseViewModel

lemon-core-ui/architecture/src/main/kotlin/io/lemon/android/core/ui/architecture/BaseEffect.kt → ui-architecture/src/main/kotlin/io/lemon/core/ui/architecture/BaseEffect.kt

@@ -1,4 +1,4 @@
-package io.lemon.android.core.ui.architecture
+package io.lemon.core.ui.architecture
 
 /**
  * [BaseEffect]
@@ -13,4 +13,4 @@ package io.lemon.android.core.ui.architecture
  *
  * @author raine@lemoncloud.io
  */
-interface BaseEffect
+interface BaseEffect

lemon-core-ui/architecture/src/main/kotlin/io/lemon/android/core/ui/architecture/BaseError.kt → ui-architecture/src/main/kotlin/io/lemon/core/ui/architecture/BaseError.kt

@@ -1,4 +1,4 @@
-package io.lemon.android.core.ui.architecture
+package io.lemon.core.ui.architecture
 
 import android.util.Log
 
@@ -34,4 +34,4 @@ interface BaseError {
                 .trimIndent()
         )
     }
-}
+}

lemon-core-ui/architecture/src/main/kotlin/io/lemon/android/core/ui/architecture/BaseEvent.kt → ui-architecture/src/main/kotlin/io/lemon/core/ui/architecture/BaseEvent.kt

@@ -1,4 +1,4 @@
-package io.lemon.android.core.ui.architecture
+package io.lemon.core.ui.architecture
 
 /**
  * [BaseEvent]
@@ -13,4 +13,4 @@ package io.lemon.android.core.ui.architecture
  *
  * @author raine@lemoncloud.io
  **/
-interface BaseEvent
+interface BaseEvent

lemon-core-ui/architecture/src/main/kotlin/io/lemon/android/core/ui/architecture/BaseState.kt → ui-architecture/src/main/kotlin/io/lemon/core/ui/architecture/BaseState.kt

@@ -1,4 +1,4 @@
-package io.lemon.android.core.ui.architecture
+package io.lemon.core.ui.architecture
 
 /**
  * [BaseState]
@@ -16,4 +16,4 @@ package io.lemon.android.core.ui.architecture
  */
 interface BaseState{
     val isLoading : Boolean
-}
+}

lemon-core-ui/architecture/src/main/kotlin/io/lemon/android/core/ui/architecture/BaseViewModel.kt → ui-architecture/src/main/kotlin/io/lemon/core/ui/architecture/BaseViewModel.kt

@@ -1,4 +1,4 @@
-package io.lemon.android.core.ui.architecture
+package io.lemon.core.ui.architecture
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

lemon-core-ui/architecture/src/main/kotlin/io/lemon/android/core/ui/architecture/Config.kt → ui-architecture/src/main/kotlin/io/lemon/core/ui/architecture/Config.kt

@@ -1,4 +1,4 @@
-package io.lemon.android.core.ui.architecture
+package io.lemon.core.ui.architecture
 
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel.Factory.RENDEZVOUS
@@ -21,4 +21,4 @@ data class Config<EVENT>(
     val eventCapacity: Int = RENDEZVOUS,
     val eventOnBufferOverflow: BufferOverflow = BufferOverflow.DROP_OLDEST,
     val eventOnUndeliveredElement: ((EVENT) -> Unit)? = null
-)
+)