refactoring

Author: aykuttasil

app/build.gradle

@@ -120,10 +120,8 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation(project(':common'))
     implementation(project(':domain'))
     implementation(project(':data'))
-    implementation(project(':network'))
 
     testImplementation Libs.kotlinx_coroutines_test
 
@@ -142,6 +140,7 @@ dependencies {
     implementation(Libs.annotation)
     implementation(Libs.gridlayout)
     implementation(Libs.multidex)
+    implementation(Libs.preference_ktx)
 
     implementation(Libs.lifecycle_extensions)
     implementation(Libs.lifecycle_viewmodel_ktx)
@@ -172,5 +171,9 @@ dependencies {
     // Assisted Inject
     compileOnly Libs.assisted_inject_annotations_dagger2
     kapt Libs.assisted_inject_processor_dagger2
+
+    api(Libs.anko)
+
+    api(Libs.rxandroid)
 }
 // apply(plugin = "com.google.gms.google-services")

app/src/main/kotlin/com/aykuttasil/modernapp/App.kt

@@ -7,7 +7,7 @@ import android.content.Context
 import android.os.Build
 import androidx.multidex.MultiDex
 import com.aykuttasil.modernapp.di.components.DaggerAppComponent
-import com.aykuttasil.common.util.Const
+import com.aykuttasil.modernapp.util.Const
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import org.jetbrains.anko.notificationManager

app/src/main/kotlin/com/aykuttasil/modernapp/di/modules/AppModule.kt

@@ -19,7 +19,7 @@ import android.app.Application
 import android.content.Context
 import com.aykuttasil.modernapp.App
 import com.aykuttasil.modernapp.di.ViewModelBuilder
-import com.aykuttasil.common.di.ApplicationContext
+import com.aykuttasil.domain.di.ApplicationContext
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton

app/src/main/kotlin/com/aykuttasil/modernapp/ui/common/DataBoundListAdapter.kt

@@ -20,7 +20,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
-import com.aykuttasil.common.util.AppExecutors
+import com.aykuttasil.modernapp.util.AppExecutors
 
 /**
  * A generic RecyclerView adapter that uses Data Binding & DiffUtil.

app/src/main/kotlin/com/aykuttasil/modernapp/ui/main/MainActivity.kt

@@ -6,7 +6,7 @@ import androidx.activity.viewModels
 import com.aykuttasil.modernapp.R
 import com.aykuttasil.modernapp.di.ViewModelFactory
 import com.aykuttasil.modernapp.ui.common.BaseActivity
-import com.aykuttasil.common.util.edit
+import com.aykuttasil.modernapp.util.edit
 import javax.inject.Inject
 
 class MainActivity : BaseActivity() {

app/src/main/kotlin/com/aykuttasil/modernapp/ui/main/pages/main/MainFragment.kt

@@ -25,8 +25,8 @@ import com.aykuttasil.modernapp.databinding.FragmentMainBinding
 import com.aykuttasil.modernapp.ui.common.BaseFragment
 import com.aykuttasil.modernapp.ui.widget.bottomdialog.MyBottomDialog
 import com.aykuttasil.modernapp.util.delegates.Inflate
-import com.aykuttasil.common.util.loadAsync
-import com.aykuttasil.common.util.then
+import com.aykuttasil.modernapp.util.loadAsync
+import com.aykuttasil.modernapp.util.then
 import kotlinx.coroutines.delay
 import timber.log.Timber
 

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserActivity.kt

@@ -24,9 +24,7 @@ import com.aykuttasil.modernapp.databinding.ActivityUserBinding
 import com.aykuttasil.modernapp.di.ViewModelFactory
 import com.aykuttasil.modernapp.ui.common.BaseActivity
 import com.aykuttasil.modernapp.util.delegates.contentView
-import com.aykuttasil.common.Resource
-import com.aykuttasil.common.util.logd
-import com.aykuttasil.domain.util.Optional
+import com.aykuttasil.domain.util.logd
 import javax.inject.Inject
 
 class UserActivity : BaseActivity() {

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserViewModel.kt

@@ -17,7 +17,7 @@ package com.aykuttasil.modernapp.ui.user
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.aykuttasil.common.util.SingleLiveEvent
+import com.aykuttasil.modernapp.util.SingleLiveEvent
 import com.aykuttasil.domain.entities.UserEntity
 import com.aykuttasil.domain.usecases.user.GetUserUseCase
 import com.aykuttasil.modernapp.App
@@ -32,7 +32,8 @@ class UserViewModel @Inject constructor(
 ) : BaseViewModel(app) {
 
   val viewState = MutableLiveData<UserActivityViewState>()
-  var errorState: SingleLiveEvent<Throwable?> = SingleLiveEvent()
+  var errorState: SingleLiveEvent<Throwable?> =
+    SingleLiveEvent()
 
   init {
     val viewState = UserActivityViewState()

app/src/main/kotlin/com/aykuttasil/modernapp/ui/widget/bottomdialog/MyBottomDialog.kt

@@ -8,8 +8,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import com.aykuttasil.modernapp.R
-import com.aykuttasil.common.util.extension.gone
-import com.aykuttasil.common.util.extension.visible
+import com.aykuttasil.modernapp.util.extension.gone
+import com.aykuttasil.modernapp.util.extension.visible
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment

app/src/main/kotlin/com/aykuttasil/modernapp/util/AppExecutors.kt

@@ -0,0 +1,44 @@
+package com.aykuttasil.modernapp.util
+
+import android.os.Handler
+import android.os.Looper
+
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppExecutors(
+  private val diskIO: Executor,
+  private val networkIO: Executor,
+  private val mainThread: Executor
+) {
+
+  @Inject
+  constructor() : this(
+    Executors.newSingleThreadExecutor(),
+    Executors.newFixedThreadPool(3),
+    MainThreadExecutor()
+  )
+
+  fun diskIO(): Executor {
+    return diskIO
+  }
+
+  fun networkIO(): Executor {
+    return networkIO
+  }
+
+  fun mainThread(): Executor {
+    return mainThread
+  }
+
+  private class MainThreadExecutor : Executor {
+    private val mainThreadHandler = Handler(Looper.getMainLooper())
+    override fun execute(command: Runnable) {
+      mainThreadHandler.post(command)
+    }
+  }
+}