HW-7 Koin 적용

2003/mtjin/AndroidArchitectureStudy/app/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     //recyclerview
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     //retrofit2
-    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
+    implementation 'com.squareup.retrofit2:retrofit:2.7.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
     //glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -57,16 +57,19 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
     // Room
-    implementation "androidx.room:room-runtime:2.2.4"
-    testImplementation "androidx.room:room-testing:2.2.4"
-    kapt "androidx.room:room-compiler:2.2.4"
-    implementation 'androidx.room:room-ktx:2.2.4'
+    implementation "androidx.room:room-runtime:2.2.5"
+    testImplementation "androidx.room:room-testing:2.2.5"
+    kapt "androidx.room:room-compiler:2.2.5"
+    implementation 'androidx.room:room-ktx:2.2.5'
     //coroutine lifecycle
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha01"
     //ktx extensions
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.fragment:fragment-ktx:1.2.4'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
+    // koin
+    implementation 'org.koin:koin-androidx-viewmodel:2.1.5'
+
 
 }

2003/mtjin/AndroidArchitectureStudy/app/src/main/AndroidManifest.xml

@@ -7,13 +7,13 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name=".di.KoinApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name=".utils.MyApplication"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".ui.login.LoginActivity"

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/api/ApiClient.kt

@@ -1,40 +1,5 @@
 package com.mtjin.androidarchitecturestudy.api
 
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.io.IOException
-
 object ApiClient {
-    private const val BASE_URL = "https://openapi.naver.com/"
-    fun getApiClient(): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .client(provideOkHttpClient(AppInterceptor()))
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
-
-    private fun provideOkHttpClient(
-        interceptor: AppInterceptor
-    ): OkHttpClient = OkHttpClient.Builder()
-        .run {
-            addInterceptor(interceptor)
-            build()
-        }
-
-    class AppInterceptor : Interceptor {
-        @Throws(IOException::class)
-        override fun intercept(chain: Interceptor.Chain)
-                : Response = with(chain) {
-            val newRequest = request().newBuilder()
-                .addHeader("X-Naver-Client-Id", "33chRuAiqlSn5hn8tIme")
-                .addHeader("X-Naver-Client-Secret", "fyfwt9PCUN")
-                .build()
-
-            proceed(newRequest)
-        }
-    }
+    const val BASE_URL = "https://openapi.naver.com/"
 }

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/data/search/source/MovieRepositoryImpl.kt

@@ -72,7 +72,7 @@ class MovieRepositoryImpl(
                     fail(it)
                 }
             )
-        }else{
+        } else {
             fail(Throwable("네트워크가 연결이 되어있지 않습니다."))
         }
     }

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/data/search/source/local/MovieDatabase.kt

@@ -9,23 +9,4 @@ import com.mtjin.androidarchitecturestudy.data.search.Movie
 @Database(entities = [Movie::class], version = 1, exportSchema = false)
 abstract class MovieDatabase : RoomDatabase() {
     abstract fun movieDao(): MovieDao
-
-    companion object {
-
-        private var INSTANCE: MovieDatabase? = null
-
-        fun getInstance(context: Context): MovieDatabase {
-            synchronized(this) {
-                if (INSTANCE == null) {
-                    INSTANCE = Room.databaseBuilder(
-                            context.applicationContext,
-                            MovieDatabase::class.java, "Movie.db"
-                        )
-                        .allowMainThreadQueries()
-                        .build()
-                }
-                return INSTANCE!!
-            }
-        }
-    }
 }

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/di/KoinApplication.kt

@@ -0,0 +1,29 @@
+package com.mtjin.androidarchitecturestudy.di
+
+import android.app.Application
+import com.mtjin.androidarchitecturestudy.BuildConfig
+import com.mtjin.androidarchitecturestudy.module.*
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
+
+class KoinApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        startKoin {
+            if (BuildConfig.DEBUG) androidLogger()
+            else androidLogger(Level.NONE)
+            androidContext(this@KoinApplication)
+            modules(
+                repositoryModule,
+                localDataModule,
+                remoteDataModule,
+                networkModule,
+                viewModelModule,
+                apiModule
+            )
+
+        }
+    }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/module/ApiModule.kt

@@ -0,0 +1,45 @@
+package com.mtjin.androidarchitecturestudy.module
+
+import com.mtjin.androidarchitecturestudy.api.ApiClient
+import com.mtjin.androidarchitecturestudy.api.ApiInterface
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import org.koin.core.module.Module
+import org.koin.dsl.module
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+val apiModule: Module = module {
+
+    single<ApiInterface> { get<Retrofit>().create(ApiInterface::class.java) }
+
+    single<Retrofit> {
+        Retrofit.Builder()
+            .baseUrl(ApiClient.BASE_URL)
+            .client(get())
+            .addConverterFactory(get<GsonConverterFactory>())
+            .build()
+    }
+
+    single<GsonConverterFactory> { GsonConverterFactory.create() }
+
+    single<OkHttpClient> {
+        OkHttpClient.Builder()
+            .run {
+                addInterceptor(get<Interceptor>())
+                build()
+            }
+    }
+
+    single<Interceptor> {
+        Interceptor { chain ->
+            with(chain) {
+                val newRequest = request().newBuilder()
+                    .addHeader("X-Naver-Client-Id", "33chRuAiqlSn5hn8tIme")
+                    .addHeader("X-Naver-Client-Secret", "fyfwt9PCUN")
+                    .build()
+                proceed(newRequest)
+            }
+        }
+    }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/module/LocalDataModule.kt

@@ -0,0 +1,28 @@
+package com.mtjin.androidarchitecturestudy.module
+
+import androidx.room.Room
+import com.mtjin.androidarchitecturestudy.data.login.source.local.LoginLocalDataSource
+import com.mtjin.androidarchitecturestudy.data.login.source.local.LoginLocalDataSourceImpl
+import com.mtjin.androidarchitecturestudy.data.search.source.local.MovieDao
+import com.mtjin.androidarchitecturestudy.data.search.source.local.MovieDatabase
+import com.mtjin.androidarchitecturestudy.data.search.source.local.MovieLocalDataSource
+import com.mtjin.androidarchitecturestudy.data.search.source.local.MovieLocalDataSourceImpl
+import com.mtjin.androidarchitecturestudy.utils.PreferenceManager
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+val localDataModule: Module = module {
+    single<MovieLocalDataSource> { MovieLocalDataSourceImpl(get()) }
+    single<LoginLocalDataSource> { LoginLocalDataSourceImpl(get()) }
+    single<PreferenceManager> { PreferenceManager(get()) }
+    single<MovieDao> { get<MovieDatabase>().movieDao() }
+    single<MovieDatabase> {
+        Room.databaseBuilder(
+                get(),
+                MovieDatabase::class.java, "Movie.db"
+            )
+            .allowMainThreadQueries()
+            .build()
+    }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/module/NetworkModule.kt

@@ -0,0 +1,10 @@
+package com.mtjin.androidarchitecturestudy.module
+
+import com.mtjin.androidarchitecturestudy.utils.NetworkManager
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+val networkModule: Module = module {
+    single { NetworkManager(get()) }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/module/RemoteDataModule.kt

@@ -0,0 +1,10 @@
+package com.mtjin.androidarchitecturestudy.module
+
+import com.mtjin.androidarchitecturestudy.data.search.source.remote.MovieRemoteDataSource
+import com.mtjin.androidarchitecturestudy.data.search.source.remote.MovieRemoteDataSourceImpl
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+val remoteDataModule: Module = module {
+    single<MovieRemoteDataSource> { MovieRemoteDataSourceImpl(get()) }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/module/RepositoryModule.kt

@@ -0,0 +1,13 @@
+package com.mtjin.androidarchitecturestudy.module
+
+import com.mtjin.androidarchitecturestudy.data.login.source.LoginRepository
+import com.mtjin.androidarchitecturestudy.data.login.source.LoginRepositoryImpl
+import com.mtjin.androidarchitecturestudy.data.search.source.MovieRepository
+import com.mtjin.androidarchitecturestudy.data.search.source.MovieRepositoryImpl
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+val repositoryModule: Module = module {
+    single<MovieRepository> { MovieRepositoryImpl(get(), get(), get()) }
+    single<LoginRepository> { LoginRepositoryImpl(get()) }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/module/ViewModelModule.kt

@@ -0,0 +1,14 @@
+package com.mtjin.androidarchitecturestudy.module
+
+import com.mtjin.androidarchitecturestudy.ui.login.LoginViewModel
+import com.mtjin.androidarchitecturestudy.ui.search.MovieSearchViewModel
+import com.mtjin.androidarchitecturestudy.ui.splash.SplashViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+val viewModelModule: Module = module {
+    viewModel { SplashViewModel(get()) }
+    viewModel { LoginViewModel(get()) }
+    viewModel { MovieSearchViewModel(get()) }
+}

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/ui/login/LoginActivity.kt

@@ -2,46 +2,27 @@ package com.mtjin.androidarchitecturestudy.ui.login
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import com.mtjin.androidarchitecturestudy.R
 import com.mtjin.androidarchitecturestudy.base.BaseActivity
-import com.mtjin.androidarchitecturestudy.data.login.source.LoginRepository
-import com.mtjin.androidarchitecturestudy.data.login.source.LoginRepositoryImpl
-import com.mtjin.androidarchitecturestudy.data.login.source.local.LoginLocalDataSource
-import com.mtjin.androidarchitecturestudy.data.login.source.local.LoginLocalDataSourceImpl
 import com.mtjin.androidarchitecturestudy.databinding.ActivityLoginBinding
 import com.mtjin.androidarchitecturestudy.ui.search.MovieSearchActivity
-import com.mtjin.androidarchitecturestudy.utils.PreferenceManager
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class LoginActivity : BaseActivity() {
     private lateinit var binding: ActivityLoginBinding
-    private lateinit var preferenceManager: PreferenceManager
-    private lateinit var loginLocalDataSource: LoginLocalDataSource
-    private lateinit var loginRepository: LoginRepository
-    private val viewModel: LoginViewModel by viewModels {
-        object : ViewModelProvider.Factory {
-            override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-                return LoginViewModel(loginRepository) as T
-            }
-        }
-    }
+    private val viewModel: LoginViewModel by viewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        inject()
+        initBinding()
         initViewModelCallback()
     }
 
-    private fun inject() {
+    private fun initBinding() {
         binding =
             DataBindingUtil.setContentView(this, R.layout.activity_login)
-        preferenceManager = PreferenceManager(this)
-        loginLocalDataSource = LoginLocalDataSourceImpl(preferenceManager)
-        loginRepository = LoginRepositoryImpl(loginLocalDataSource)
         binding.vm = viewModel
     }
 

2003/mtjin/AndroidArchitectureStudy/app/src/main/java/com/mtjin/androidarchitecturestudy/ui/search/MovieSearchActivity.kt

@@ -3,40 +3,28 @@ package com.mtjin.androidarchitecturestudy.ui.search
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import com.mtjin.androidarchitecturestudy.R
 import com.mtjin.androidarchitecturestudy.base.BaseActivity
 import com.mtjin.androidarchitecturestudy.databinding.ActivityMovieSearchBinding
-import com.mtjin.androidarchitecturestudy.utils.MyApplication
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
 class MovieSearchActivity : BaseActivity() {
 
     private lateinit var binding: ActivityMovieSearchBinding
     private lateinit var movieAdapter: MovieAdapter
-    private lateinit var myApplication: MyApplication
-    private val viewModel: MovieSearchViewModel by viewModels {
-        object : ViewModelProvider.Factory {
-            override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-                return MovieSearchViewModel(myApplication.movieRepository) as T
-            }
-        }
-    }
+    private val viewModel: MovieSearchViewModel by viewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_movie_search)
-        inject()
+        initBinding()
         initViewModelCallback()
         initAdapter()
     }
 
-    private fun inject() {
-        myApplication = application as MyApplication
+    private fun initBinding() {
         binding = DataBindingUtil.setContentView(this, R.layout.activity_movie_search)
         binding.vm = viewModel
         binding.lifecycleOwner = this