di 모듈 분리

build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt

@@ -10,6 +10,7 @@ internal class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
+                apply("kotlin-kapt")
             }
             extensions.configure<ApplicationExtension> {
                 configureAndroidCompose(this)

business/KoinBusinessApplication.kt

@@ -0,0 +1,5 @@
+import android.app.Application
+
+@HiltAndroidApp
+class KoinBusinessApplication: Application() {
+}

business/build.gradle.kts

@@ -1,3 +1,5 @@
+import `in`.koreatech.convention.kapt
+
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.koin.compose)
@@ -34,7 +36,8 @@ dependencies {
     implementation(libs.orbit.core)
     implementation(libs.orbit.viewmodel)
     implementation(libs.hilt.android)
-    implementation(libs.hilt.compiler)
+    implementation(libs.hilt.compose)
+    kapt(libs.hilt.compiler)
     implementation(project(mapOf("path" to ":domain")))
     implementation(project(mapOf("path" to ":data")))
     implementation(project(mapOf("path" to ":core")))

business/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="in.koreatech.business"
     >
-
-    <application>
+    <application
+        android:name=".KoinBusinessApplication">
         <activity
             android:name=".SplashActivity"
             android:exported="true"

business/src/main/java/in/koreatech/business/KoinBusinessApplication.kt

@@ -0,0 +1,7 @@
+package `in`.koreatech.business
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class KoinBusinessApplication : Application()

business/src/main/java/in/koreatech/business/di/network/AuthNetworkModule.kt

@@ -1,22 +1,19 @@
 package `in`.koreatech.business.di.network
 
+import `in`.koreatech.koin.core.qualifier.Auth
+import `in`.koreatech.koin.core.qualifier.ServerUrl
+import `in`.koreatech.koin.data.api.auth.UserAuthApi
+import `in`.koreatech.koin.data.source.local.TokenLocalDataSource
 import android.content.Context
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import `in`.koreatech.business.util.RefreshTokenInterceptor
-import `in`.koreatech.koin.core.qualifier.Auth
-import `in`.koreatech.koin.core.qualifier.OwnerAuth
-import `in`.koreatech.koin.core.qualifier.PreSignedUrl
+import javax.inject.Singleton
 import `in`.koreatech.koin.core.qualifier.REFRESH
-import `in`.koreatech.koin.core.qualifier.ServerUrl
-import `in`.koreatech.koin.data.api.PreSignedUrlApi
-import `in`.koreatech.koin.data.api.UploadUrlApi
 import `in`.koreatech.koin.data.api.UserApi
-import `in`.koreatech.koin.data.api.auth.UserAuthApi
-import `in`.koreatech.koin.data.source.local.TokenLocalDataSource
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
@@ -25,7 +22,6 @@ import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)

business/src/main/java/in/koreatech/business/feature_changepassword/passwordauthentication/PasswordAuthenticationScreen.kt

@@ -39,6 +39,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.koreatech.business.R
@@ -54,7 +55,7 @@ fun PasswordAuthenticationScreen(
     modifier: Modifier = Modifier,
     onAuthenticationButtonClicked: () -> Unit,
     onBackPressed: () -> Unit,
-    viewModel: PasswordAuthenticationViewModel = viewModel()
+    viewModel: PasswordAuthenticationViewModel = hiltViewModel()
 ) {
     val state = viewModel.collectAsState().value
     val context = LocalContext.current
@@ -165,7 +166,7 @@ fun PasswordAuthenticationScreen(
             )
 
             Button(
-                onClick = { /*viewModel.sendAuthCode(state.email)*/ },
+                onClick = { viewModel.sendAuthCode(state.email) },
                 shape = RectangleShape,
                 colors = ButtonDefaults.buttonColors(ColorPrimary),
                 contentPadding = PaddingValues(1.dp),

core/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'com.google.dagger.hilt.android'
+    id 'org.jetbrains.kotlin.android'
 }
 
 android {
@@ -46,6 +47,7 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.core:core-ktx:+'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.code.findbugs'

koin/src/main/java/in/koreatech/koin/di/CoroutineDispatchersModule.kt → core/src/main/java/in/koreatech/koin/core/di/CoroutineDispatchersModule.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.di
+package `in`.koreatech.koin.core.di
 
 import dagger.Module
 import dagger.Provides

data/build.gradle

@@ -41,6 +41,7 @@ android {
 
 dependencies {
     implementation project(':domain')
+    implementation project(':core')
     implementation libs.core.ktx
     implementation libs.kotlinx.coroutines.android
 

koin/src/main/java/in/koreatech/koin/di/error/ErrorHandlerModule.kt → data/src/main/java/in/koreatech/koin/data/di/error/ErrorHandlerModule.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.di.error
+package `in`.koreatech.koin.data.di.error
 
 import `in`.koreatech.koin.data.error.BusErrorHandlerImpl
 import `in`.koreatech.koin.data.error.DeptErrorHandlerImpl

koin/src/main/java/in/koreatech/koin/di/network/NetworkModule.kt → data/src/main/java/in/koreatech/koin/data/di/network/NetworkModule.kt

@@ -1,15 +1,16 @@
-package `in`.koreatech.koin.di.network
+package `in`.koreatech.koin.data.di.network
 
 import `in`.koreatech.koin.core.qualifier.ServerUrl
 import `in`.koreatech.koin.data.constant.URLConstant
-import `in`.koreatech.koin.util.ext.isDebug
 import android.content.Context
 import android.util.Log
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import `in`.koreatech.koin.data.BuildConfig
+//import `in`.koreatech.koin.domain.util.ext.isDebug
 import javax.inject.Singleton
 import okhttp3.logging.HttpLoggingInterceptor
 
@@ -19,9 +20,9 @@ object NetworkModule {
     @Provides
     @Singleton
     fun provideHttpLoggingInterceptor(
-        @ApplicationContext applicationContext: Context
+
     ) = HttpLoggingInterceptor().apply {
-        level = if (applicationContext.isDebug) {
+        level = if (BuildConfig.DEBUG) {
             HttpLoggingInterceptor.Level.BODY
         } else {
             HttpLoggingInterceptor.Level.HEADERS
@@ -32,12 +33,12 @@ object NetworkModule {
     @Provides
     @Singleton
     fun provideServerUrl(
-        @ApplicationContext applicationContext: Context
+
     ): String {
-        return if (applicationContext.isDebug) {
+        return if (BuildConfig.DEBUG) {
             URLConstant.BASE_URL_STAGE
         } else {
             URLConstant.BASE_URL_PRODUCTION
         }
     }
-}
+}

koin/src/main/java/in/koreatech/koin/di/network/NoAuthNetworkModule.kt → data/src/main/java/in/koreatech/koin/data/di/network/NoAuthNetworkModule.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.di.network
+package `in`.koreatech.koin.data.di.network
 
 import `in`.koreatech.koin.core.qualifier.Auth
 import `in`.koreatech.koin.core.qualifier.NoAuth

koin/src/main/java/in/koreatech/koin/di/repository/RepositoryModule.kt → data/src/main/java/in/koreatech/koin/data/di/repository/RepositoryModule.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.di.repository
+package `in`.koreatech.koin.data.di.repository
 
 import `in`.koreatech.koin.data.repository.*
 import `in`.koreatech.koin.domain.repository.*
@@ -129,7 +129,7 @@ object RepositoryModule {
     ): StoreRepository {
         return StoreRepositoryImpl(storeRemoteDataSource)
     }
-    
+
     @Provides
     @Singleton
     fun provideLandRepository(

koin/src/main/java/in/koreatech/koin/di/source/LocalDataSourceModule.kt → data/src/main/java/in/koreatech/koin/data/di/source/LocalDataSourceModule.kt

@@ -1,13 +1,17 @@
-package `in`.koreatech.koin.di.source
+package `in`.koreatech.koin.data.di.source
 
-import `in`.koreatech.koin.data.source.local.*
 import android.content.Context
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import `in`.koreatech.koin.core.qualifier.IoDispatcher
+import `in`.koreatech.koin.data.source.local.BusLocalDataSource
+import `in`.koreatech.koin.data.source.local.DeptLocalDataSource
+import `in`.koreatech.koin.data.source.local.SignupTermsLocalDataSource
+import `in`.koreatech.koin.data.source.local.TokenLocalDataSource
+import `in`.koreatech.koin.data.source.local.VersionLocalDataSource
 import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Singleton
 

koin/src/main/java/in/koreatech/koin/di/source/RemoteDataSourceModule.kt → data/src/main/java/in/koreatech/koin/data/di/source/RemoteDataSourceModule.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.di.source
+package `in`.koreatech.koin.data.di.source
 
 import `in`.koreatech.koin.data.api.*
 import `in`.koreatech.koin.data.api.auth.UserAuthApi
@@ -76,7 +76,7 @@ object RemoteDataSourceModule {
     ): StoreRemoteDataSource {
         return StoreRemoteDataSource(storeApi)
     }
-    
+
     @Provides
     @Singleton
     fun provideLandRemoteDataSource(

gradle/libs.versions.toml

@@ -47,6 +47,7 @@ butterknifeVersion = "10.1.0"
 googleServiceVersion = "4.3.14"
 composeNavigationVersion = "2.7.7"
 orbitVersion="7.0.1"
+hiltComposeVersion="1.0.0"
 
 [libraries]
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtxVersion" }
@@ -121,6 +122,8 @@ orbit-core = {module= "org.orbit-mvi:orbit-core", version.ref = "orbitVersion"}
 orbit-viewmodel = {module= "org.orbit-mvi:orbit-viewmodel", version.ref = "orbitVersion"}
 orbit-compose = {module= "org.orbit-mvi:orbit-compose", version.ref = "orbitVersion"}
 
+hilt-compose= {module= "androidx.hilt:hilt-navigation-compose", version.ref = "hiltComposeVersion"}
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradleVersion" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }

koin/build.gradle

@@ -6,6 +6,7 @@ plugins {
     id 'com.google.firebase.crashlytics'
     id 'com.google.firebase.appdistribution'
     id 'com.google.dagger.hilt.android'
+    id 'org.jetbrains.kotlin.android'
 }
 
 def applicationName = 'koin'