Major code changes and improvement on the project

Author: nuhkoca

.circleci/config.yml

@@ -35,7 +35,7 @@ jobs:
           command: ./gradlew detekt
       - run:
           name: Run Ktlint
-          command: ./gradlew ktlintFormat
+          command: ./gradlew ktlintCheck
       - run:
           name: Run Lint
           command: ./gradlew lintDebug

README.md

@@ -51,9 +51,10 @@ Users are able to search tv series by query.
 * [MVVM](https://www.raywenderlich.com/8984-mvvm-on-android)
 
 ### Patterns 
-* [Repository](https://developer.android.com/jetpack/docs/guide)
-* [Observer](https://code.tutsplus.com/tutorials/android-design-patterns-the-observer-pattern--cms-28963)
-* [UseCase](https://caminao.blog/how-to-implement-symbolic-representations/patterns/functional-patterns/use-case-patterns/)
+* [Repository Pattern](https://developer.android.com/jetpack/docs/guide)
+* [Observer Pattern](https://code.tutsplus.com/tutorials/android-design-patterns-the-observer-pattern--cms-28963)
+* [UseCase Pattern](https://caminao.blog/how-to-implement-symbolic-representations/patterns/functional-patterns/use-case-patterns/)
+* [Delegation Pattern](https://en.wikipedia.org/wiki/Delegation_pattern)
 
 ### Approaches
 * [SOLID Principle](https://itnext.io/solid-principles-explanation-and-examples-715b975dcad4?gi=79443348411d)

app/build.gradle.kts

@@ -91,39 +91,30 @@ android {
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
-    api(project(Modules.data))
-    api(project(Modules.domain))
     api(project(Modules.base))
+    api(project(Modules.data))
+    implementation(project(Modules.domain))
 
-    api(Dependencies.kotlin)
-    api(Dependencies.material)
+    implementation(Dependencies.material)
     implementation(Dependencies.constraint_layout)
     implementation(Dependencies.core_ktx)
     implementation(Dependencies.appcompat)
 
-    api(Dependencies.coroutines_core)
-    api(Dependencies.coroutines_android)
+    implementation(Dependencies.coroutines_core)
 
-    api(Dependencies.lifecycle_extensions)
-    implementation(Dependencies.lifecycle_viewmodel)
+    implementation(Dependencies.lifecycle_extensions)
     implementation(Dependencies.lifecycle_viewmodel_ktx)
     kapt(Dependencies.lifecycle_compiler)
 
     implementation(Dependencies.dagger)
     implementation(Dependencies.dagger_android)
-    api(Dependencies.dagger_android_support)
     compileOnly(Dependencies.javax_annotation)
     kapt(Dependencies.dagger_android_processor)
     kapt(Dependencies.dagger_compiler)
 
     implementation(Dependencies.timberkt)
 
-    api(Dependencies.gson)
-    api(Dependencies.retrofit)
-    api(Dependencies.okHttp)
-    api(Dependencies.logging)
-
-    api(Dependencies.glide)
+    implementation(Dependencies.glide)
 
     testImplementation(TestDependencies.test_core)
     testImplementation(TestDependencies.runner)

app/src/test/java/com/mobilemovement/kotlintvmaze/MainViewModelTest.kt

@@ -8,25 +8,25 @@ import com.mobilemovement.kotlintvmaze.data.ImageViewItem
 import com.mobilemovement.kotlintvmaze.data.SeriesViewItem
 import com.mobilemovement.kotlintvmaze.data.ShowViewItem
 import com.mobilemovement.kotlintvmaze.domain.GetSeriesUseCase
-import com.mobilemovement.kotlintvmaze.ext.observeOnce
 import com.mobilemovement.kotlintvmaze.ui.MainViewModel
 import com.mobilemovement.kotlintvmaze.ui.MainViewModel.SeriesUiState
 import com.mobilemovement.kotlintvmaze.util.CoroutinesTestRule
+import com.mobilemovement.kotlintvmaze.util.observeOnce
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk
 import io.mockk.mockkObject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.ArgumentMatchers.any
 
+@ExperimentalCoroutinesApi
 class MainViewModelTest {
 
-    @ExperimentalCoroutinesApi
     @get:Rule
     val coroutinesTestRule = CoroutinesTestRule()
 
@@ -39,7 +39,7 @@ class MainViewModelTest {
     private lateinit var viewModel: MainViewModel
 
     @Before
-    fun setUp() = runBlocking {
+    fun setUp() = coroutinesTestRule.testDispatcher.runBlockingTest {
         getSeriesUseCase = mockk()
 
         mockkObject(SeriesUiState())

app/src/test/java/com/mobilemovement/kotlintvmaze/util/CoroutinesTestRule.kt

@@ -1,6 +1,5 @@
 package com.mobilemovement.kotlintvmaze.util
 
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestCoroutineDispatcher
@@ -11,16 +10,17 @@ import org.junit.runner.Description
 
 @ExperimentalCoroutinesApi
 class CoroutinesTestRule(
-    private val dispatcher: CoroutineDispatcher = TestCoroutineDispatcher()
+    val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
 ) : TestWatcher() {
 
     override fun starting(description: Description?) {
         super.starting(description)
-        Dispatchers.setMain(dispatcher)
+        Dispatchers.setMain(testDispatcher)
     }
 
     override fun finished(description: Description?) {
         super.finished(description)
         Dispatchers.resetMain()
+        testDispatcher.cleanupTestCoroutines()
     }
 }

app/src/test/java/com/mobilemovement/kotlintvmaze/ext/LiveData.kt renamed to app/src/test/java/com/mobilemovement/kotlintvmaze/util/LiveData.kt

@@ -1,7 +1,6 @@
-package com.mobilemovement.kotlintvmaze.ext
+package com.mobilemovement.kotlintvmaze.util
 
 import androidx.lifecycle.LiveData
-import com.mobilemovement.kotlintvmaze.util.OneTimeObserver
 
 fun <T> LiveData<T>.observeOnce(onChangeHandler: (T) -> Unit) {
     val observer = OneTimeObserver(handler = onChangeHandler)

base/build.gradle.kts

@@ -76,22 +76,21 @@ android {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation(Dependencies.kotlin)
+
+    api(Dependencies.kotlin)
     implementation(Dependencies.material)
 
     implementation(Dependencies.coroutines_core)
-    implementation(Dependencies.coroutines_android)
+    api(Dependencies.coroutines_android)
 
     implementation(Dependencies.lifecycle_extensions)
 
     implementation(Dependencies.timberkt)
 
     implementation(Dependencies.glide)
-    implementation(Dependencies.glide_okhttp) {
-        exclude(mapOf("group" to "glide-parent"))
-    }
+    implementation(Dependencies.glide_okhttp)
     kapt(Dependencies.glide_compiler)
     kapt(Dependencies.android_annotation)
 
-    implementation(Dependencies.dagger_android_support)
+    api(Dependencies.dagger_android_support)
 }

base/src/main/java/com/mobilemovement/kotlintvmaze/base/util/coroutines/DefaultDispatcherProvider.kt

@@ -1,19 +1,3 @@
 package com.mobilemovement.kotlintvmaze.base.util.coroutines
 
-import kotlinx.coroutines.Dispatchers
-
-object DefaultDispatcherProvider : DispatcherProvider {
-
-    private val main = Dispatchers.Main
-    private val ui = Dispatchers.Main
-    private val io = Dispatchers.IO
-    private val default = Dispatchers.Default
-
-    override fun main() = main
-
-    override fun ui() = ui
-
-    override fun io() = io
-
-    override fun default() = default
-}
+object DefaultDispatcherProvider : DispatcherProvider

base/src/main/java/com/mobilemovement/kotlintvmaze/base/util/coroutines/DispatcherProvider.kt

@@ -1,13 +1,12 @@
 package com.mobilemovement.kotlintvmaze.base.util.coroutines
 
-import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 
 interface DispatcherProvider {
-    fun main(): CoroutineContext
 
-    fun ui(): CoroutineContext
-
-    fun io(): CoroutineContext
-
-    fun default(): CoroutineContext
+    fun main(): CoroutineDispatcher = Dispatchers.Main
+    fun default(): CoroutineDispatcher = Dispatchers.Default
+    fun io(): CoroutineDispatcher = Dispatchers.IO
+    fun unconfined(): CoroutineDispatcher = Dispatchers.Unconfined
 }