refactor: split ui & data modules to enforce SOLID principles

Author: julienherrero

app/build.gradle

@@ -30,8 +30,11 @@ android {
 
 dependencies {
     implementation project(':ui')
+    implementation project(':presentation')
     implementation project(':domain')
     implementation project(':data')
+    implementation project(':remote')
+    implementation project(':local')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'

app/src/main/java/co/zsmb/rainbowcake/guardiandemo/di/AppComponent.kt

@@ -2,8 +2,8 @@ package co.zsmb.rainbowcake.guardiandemo.di
 
 import co.zsmb.rainbowcake.dagger.RainbowCakeComponent
 import co.zsmb.rainbowcake.dagger.RainbowCakeModule
-import co.zsmb.rainbowcake.guardiandemo.data.disk.DiskModule
-import co.zsmb.rainbowcake.guardiandemo.data.network.NetworkModule
+import co.zsmb.rainbowcake.guardiandemo.local.DiskModule
+import co.zsmb.rainbowcake.guardiandemo.remote.NetworkModule
 import dagger.Component
 import javax.inject.Singleton
 

app/src/main/java/co/zsmb/rainbowcake/guardiandemo/di/ViewModelModule.kt

@@ -2,9 +2,9 @@ package co.zsmb.rainbowcake.guardiandemo.di
 
 import androidx.lifecycle.ViewModel
 import co.zsmb.rainbowcake.dagger.ViewModelKey
-import co.zsmb.rainbowcake.guardiandemo.ui.detail.DetailViewModel
-import co.zsmb.rainbowcake.guardiandemo.ui.list.ListViewModel
-import co.zsmb.rainbowcake.guardiandemo.ui.saved.SavedViewModel
+import co.zsmb.rainbowcake.guardiandemo.presentation.detail.DetailViewModel
+import co.zsmb.rainbowcake.guardiandemo.presentation.list.ListViewModel
+import co.zsmb.rainbowcake.guardiandemo.presentation.saved.SavedViewModel
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap

build.gradle

@@ -2,7 +2,6 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
-        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -14,7 +13,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
 }
 

data/build.gradle

@@ -3,13 +3,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
-Properties localProps = new Properties()
-if (project.rootProject.file('local.properties').canRead()) {
-    localProps.load(new FileInputStream(project.rootProject.file('local.properties')))
-} else {
-    System.err.println("local.properties file is missing, please create it.")
-}
-
 android {
     compileSdkVersion 29
     buildToolsVersion "30.0.0"
@@ -20,9 +13,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        buildConfigField 'String', 'GUARDIAN_API_BASE_URL', "\"https://content.guardianapis.com/\""
-        buildConfigField 'String', 'GUARDIAN_API_KEY', "\"" + localProps['guardian.apikey'] + "\""
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -50,6 +40,9 @@ android {
 }
 
 dependencies {
+    implementation project(':remote')
+    implementation project(':local')
+
     implementation fileTree(dir: "libs", include: ["*.jar"])
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

data/src/main/java/co/zsmb/rainbowcake/guardiandemo/data/disk/DiskDataSource.kt

@@ -1,7 +1,8 @@
 package co.zsmb.rainbowcake.guardiandemo.data.disk
 
-import co.zsmb.rainbowcake.guardiandemo.News
-import co.zsmb.rainbowcake.guardiandemo.data.disk.entities.RoomNewsItem
+import co.zsmb.rainbowcake.guardiandemo.data.model.News
+import co.zsmb.rainbowcake.guardiandemo.local.NewsDao
+import co.zsmb.rainbowcake.guardiandemo.local.entities.RoomNewsItem
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject

data/src/main/java/co/zsmb/rainbowcake/guardiandemo/data/disk/DiskModelMapping.kt

@@ -1,7 +1,7 @@
 package co.zsmb.rainbowcake.guardiandemo.data.disk
 
-import co.zsmb.rainbowcake.guardiandemo.News
-import co.zsmb.rainbowcake.guardiandemo.data.disk.entities.RoomNewsItem
+import co.zsmb.rainbowcake.guardiandemo.data.model.News
+import co.zsmb.rainbowcake.guardiandemo.local.entities.RoomNewsItem
 
 fun News.toRoomNewsItem(): RoomNewsItem {
     return RoomNewsItem(

data/src/main/java/co/zsmb/rainbowcake/guardiandemo/News.kt renamed to data/src/main/java/co/zsmb/rainbowcake/guardiandemo/data/model/News.kt

@@ -1,4 +1,4 @@
-package co.zsmb.rainbowcake.guardiandemo
+package co.zsmb.rainbowcake.guardiandemo.data.model
 
 class News(
     val id: String,

data/src/main/java/co/zsmb/rainbowcake/guardiandemo/data/network/NetworkDataSource.kt

@@ -1,6 +1,7 @@
 package co.zsmb.rainbowcake.guardiandemo.data.network
 
-import co.zsmb.rainbowcake.guardiandemo.News
+import co.zsmb.rainbowcake.guardiandemo.data.model.News
+import co.zsmb.rainbowcake.guardiandemo.remote.GuardianApi
 import javax.inject.Inject
 import javax.inject.Singleton
 

domain/src/main/java/co/zsmb/rainbowcake/guardiandemo/domain/NewsInteractor.kt

@@ -1,6 +1,6 @@
 package co.zsmb.rainbowcake.guardiandemo.domain
 
-import co.zsmb.rainbowcake.guardiandemo.News
+import co.zsmb.rainbowcake.guardiandemo.data.model.News
 import co.zsmb.rainbowcake.guardiandemo.data.disk.DiskDataSource
 import co.zsmb.rainbowcake.guardiandemo.data.network.NetworkDataSource
 import kotlinx.coroutines.flow.Flow