Merge pull request #27 from TeamOwori/feat/#18-DI-라이브러리-Koin에서-Dagger…

…-Hilt로-Migration feat/#18-DI 라이브러리 Koin에서 Dagger Hilt로 Migration
TeamOwori · Sep 25, 2023 · 23ecc59 · 23ecc59
2 parents 7a86860 + 4952160
commit 23ecc59
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 53 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kapt)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.dagger.hilt)
 }
 
 android {
@@ -79,8 +80,6 @@ dependencies {
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.lifecycle.viewmodel.savedstate)
     kapt(libs.lifecycle.compiler)
-    implementation(libs.koin.core)
-    implementation(libs.koin.android)
     implementation(libs.glide)
     implementation(libs.glide.compiler)
     implementation(libs.lottie)
@@ -90,4 +89,10 @@ dependencies {
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.auth)
     implementation(libs.play.service.auth)
+    implementation(libs.dagger.hilt)
+    kapt(libs.dagger.hilt.compiler)
+}
+
+kapt {
+    correctErrorTypes = true
 }
diff --git a/google-services.json → app/google-services.json b/google-services.json → app/google-services.json
@@ -7,9 +7,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:191948284640:android:d0e8d4fd97b74529e3e685",
+        "mobilesdk_app_id": "1:191948284640:android:be4f5d3774729ec3e3e685",
         "android_client_info": {
-          "package_name": "com.android.owori"
+          "package_name": "com.owori.android"
         }
       },
       "oauth_client": [

diff --git a/app/src/main/java/com/owori/android/OworiApplication.kt b/app/src/main/java/com/owori/android/OworiApplication.kt
@@ -1,15 +1,11 @@
 package com.owori.android
 
 import android.app.Application
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class OworiApplication: Application() {
     override fun onCreate() {
         super.onCreate()
-        startKoin {
-            androidContext(this@OworiApplication)
-            modules(appModules)
-        }
     }
 }
diff --git a/app/src/main/java/com/owori/android/OworiModule.kt b/app/src/main/java/com/owori/android/OworiModule.kt
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/AuthActivity.kt b/app/src/main/java/com/owori/android/auth/ui/view/AuthActivity.kt
@@ -1,16 +1,17 @@
 package com.owori.android.auth.ui.view
 
+import androidx.activity.viewModels
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
 import com.owori.android.common.ui.view.BaseActivity
 import com.owori.android.R
 import com.owori.android.databinding.ActivityAuthBinding
 import com.owori.android.auth.ui.viewmodel.AuthViewModel
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class AuthActivity : BaseActivity<ActivityAuthBinding, AuthViewModel>(R.layout.activity_auth) {
-    override val viewModel: AuthViewModel by inject()
-
+    override val viewModel : AuthViewModel by viewModels()
     override fun initView() {
         initNavGraph()
     }

diff --git a/app/src/main/java/com/owori/android/auth/ui/view/LoginFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/LoginFragment.kt
@@ -1,15 +1,18 @@
 package com.owori.android.auth.ui.view
 
 import androidx.activity.addCallback
+import androidx.fragment.app.viewModels
 import com.owori.android.auth.ui.viewmodel.LoginViewModel
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.R
 import com.owori.android.databinding.FragmentLoginBinding
 import com.owori.android.common.navigateTo
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
 
+
+@AndroidEntryPoint
 class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(R.layout.fragment_login) {
-    override val viewModel: LoginViewModel by inject()
+    override val viewModel: LoginViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

diff --git a/app/src/main/java/com/owori/android/auth/ui/view/OnBoardingFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/OnBoardingFragment.kt
@@ -1,18 +1,20 @@
 package com.owori.android.auth.ui.view
 
 import androidx.activity.addCallback
+import androidx.fragment.app.viewModels
 import androidx.viewpager2.widget.ViewPager2
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.R
 import com.owori.android.databinding.FragmentOnboardingBinding
 import com.owori.android.auth.ui.adapter.OnBoardingViewPagerAdapter
 import com.owori.android.auth.ui.viewmodel.OnBoardingViewModel
 import com.owori.android.common.navigateTo
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
 
-class OnBoardingFragment :
-    BaseFragment<FragmentOnboardingBinding, OnBoardingViewModel>(R.layout.fragment_onboarding) {
-    override val viewModel: OnBoardingViewModel by inject()
+
+@AndroidEntryPoint
+class OnBoardingFragment : BaseFragment<FragmentOnboardingBinding, OnBoardingViewModel>(R.layout.fragment_onboarding) {
+    override val viewModel: OnBoardingViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

diff --git a/app/src/main/java/com/owori/android/auth/ui/view/PolicyFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/PolicyFragment.kt
@@ -1,14 +1,15 @@
 package com.owori.android.auth.ui.view
 
+import androidx.fragment.app.viewModels
 import com.owori.android.R
 import com.owori.android.databinding.FragmentPolicyBinding
 import com.owori.android.auth.ui.viewmodel.PolicyViewModel
 import com.owori.android.common.ui.view.BaseFragment
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
 
-class PolicyFragment :
-    BaseFragment<FragmentPolicyBinding, PolicyViewModel>(R.layout.fragment_policy) {
-    override val viewModel: PolicyViewModel by inject()
+@AndroidEntryPoint
+class PolicyFragment : BaseFragment<FragmentPolicyBinding, PolicyViewModel>(R.layout.fragment_policy) {
+    override val viewModel: PolicyViewModel by viewModels()
     override fun setBindingVariables() {}
 
     override fun initView() {}

diff --git a/app/src/main/java/com/owori/android/auth/ui/view/SplashFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/SplashFragment.kt
@@ -2,16 +2,18 @@ package com.owori.android.auth.ui.view
 
 import android.os.Handler
 import android.os.Looper
+import androidx.fragment.app.viewModels
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.R
 import com.owori.android.databinding.FragmentSplashBinding
 import com.owori.android.auth.ui.viewmodel.SplashViewModel
 import com.owori.android.common.navigateTo
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
 
-class SplashFragment :
-    BaseFragment<FragmentSplashBinding, SplashViewModel>(R.layout.fragment_splash) {
-    override val viewModel: SplashViewModel by inject()
+
+@AndroidEntryPoint
+class SplashFragment : BaseFragment<FragmentSplashBinding, SplashViewModel>(R.layout.fragment_splash) {
+    override val viewModel: SplashViewModel by viewModels()
     override fun setBindingVariables() {}
 
     override fun initView() {

diff --git a/app/src/main/java/com/owori/android/auth/ui/viewmodel/AuthViewModel.kt b/app/src/main/java/com/owori/android/auth/ui/viewmodel/AuthViewModel.kt
@@ -1,5 +1,8 @@
 package com.owori.android.auth.ui.viewmodel
 
 import com.owori.android.common.ui.viewmodel.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class AuthViewModel : BaseViewModel() {}
+@HiltViewModel
+class AuthViewModel @Inject constructor() : BaseViewModel() {}
diff --git a/app/src/main/java/com/owori/android/auth/ui/viewmodel/LoginViewModel.kt b/app/src/main/java/com/owori/android/auth/ui/viewmodel/LoginViewModel.kt
@@ -3,8 +3,11 @@ package com.owori.android.auth.ui.viewmodel
 import androidx.lifecycle.LiveData
 import com.owori.android.common.SingleLiveEvent
 import com.owori.android.common.ui.viewmodel.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class LoginViewModel : BaseViewModel() {
+@HiltViewModel
+class LoginViewModel @Inject constructor() : BaseViewModel() {
     private val _callKakaoLogin: SingleLiveEvent<Unit> = SingleLiveEvent()
     val callKakaoLogin: LiveData<Unit> = _callKakaoLogin
     private val _callGoogleLogin: SingleLiveEvent<Unit> = SingleLiveEvent()

diff --git a/app/src/main/java/com/owori/android/auth/ui/viewmodel/OnBoardingViewModel.kt b/app/src/main/java/com/owori/android/auth/ui/viewmodel/OnBoardingViewModel.kt
@@ -4,8 +4,11 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.owori.android.common.SingleLiveEvent
 import com.owori.android.common.ui.viewmodel.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class OnBoardingViewModel : BaseViewModel() {
+@HiltViewModel
+class OnBoardingViewModel @Inject constructor() : BaseViewModel() {
     private val _currentItemIndex: MutableLiveData<Int> = MutableLiveData(0)
     val currentItemIndex: LiveData<Int> = _currentItemIndex
     private val _finishOnBoarding: SingleLiveEvent<Unit> = SingleLiveEvent();

diff --git a/app/src/main/java/com/owori/android/auth/ui/viewmodel/PolicyViewModel.kt b/app/src/main/java/com/owori/android/auth/ui/viewmodel/PolicyViewModel.kt
@@ -1,5 +1,8 @@
 package com.owori.android.auth.ui.viewmodel
 
 import com.owori.android.common.ui.viewmodel.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class PolicyViewModel : BaseViewModel() {}
+@HiltViewModel
+class PolicyViewModel @Inject constructor() : BaseViewModel() {}
diff --git a/app/src/main/java/com/owori/android/auth/ui/viewmodel/SplashViewModel.kt b/app/src/main/java/com/owori/android/auth/ui/viewmodel/SplashViewModel.kt
@@ -1,5 +1,8 @@
 package com.owori.android.auth.ui.viewmodel
 
 import com.owori.android.common.ui.viewmodel.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class SplashViewModel : BaseViewModel() {}
+@HiltViewModel
+class SplashViewModel @Inject constructor() : BaseViewModel() {}
diff --git a/app/src/main/java/com/owori/android/common/ui/viewmodel/BaseViewModel.kt b/app/src/main/java/com/owori/android/common/ui/viewmodel/BaseViewModel.kt
@@ -4,9 +4,10 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.navigation.Navigation
 import com.owori.android.common.SingleLiveEvent
-import org.koin.core.component.KoinComponent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-open class BaseViewModel : ViewModel(), KoinComponent {
+open class BaseViewModel : ViewModel() {
     protected val _navigation = SingleLiveEvent<Navigation>()
     val navigation: LiveData<Navigation> = _navigation
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,5 +7,6 @@ plugins {
     alias(libs.plugins.kapt) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
+    alias(libs.plugins.dagger.hilt) apply false
 }
 true // Needed to make the Suppress annotation work for the plugins block
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -30,6 +30,8 @@ firebase-bom = "32.3.1"
 firebase-crashlytics = "2.9.9"
 google-services = "4.3.15"
 play-service-auth = "20.7.0"
+dagger-hilt = "2.44"
+hilt-compiler = "2.44"
 
 [libraries]
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
@@ -68,6 +70,8 @@ firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashly
 firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx"}
 firebase-auth = { group = "com.google.firebase", name = "firebase-auth-ktx" }
 play-service-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "play-service-auth" }
+dagger-hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger-hilt" }
+dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt-compiler" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
@@ -76,6 +80,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }
+dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt" }
 
 [bundles]