refactor: dagger2

app/build.gradle

@@ -55,7 +55,11 @@ android {
 }
 
 dependencies {
+    // Core module
+    implementation project(':core')
+
     def preference_version = "1.1.1"
+    def dagger_version = "2.48"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -130,5 +134,9 @@ dependencies {
 
     implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
 
+    // Dagger 2
+    implementation "com.google.dagger:dagger:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 }

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
             android:launchMode="singleTask" />
         <activity android:name=".ui.editor.EditorActivity" />
 
-        <service android:name=".network.FetchMetadataService" />
+        <service android:name=".service.FetchMetadataService" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

app/src/main/java/com/flamyoad/tsukiviewer/MainActivity.kt

@@ -17,20 +17,26 @@ import androidx.core.view.GravityCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.flamyoad.tsukiviewer.databinding.ActivityMainBinding
+import com.flamyoad.tsukiviewer.di.ViewModelFactory
 import com.flamyoad.tsukiviewer.ui.home.bookmarks.BookmarkFragment
 import com.flamyoad.tsukiviewer.ui.home.collections.CollectionFragment
 import com.flamyoad.tsukiviewer.ui.home.local.LocalDoujinsFragment
 import com.flamyoad.tsukiviewer.ui.home.tags.DoujinTagsFragment
 import com.flamyoad.tsukiviewer.ui.settings.SettingsActivity
 import com.google.android.material.navigation.NavigationView
+import javax.inject.Inject
 
 class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
 
     private lateinit var binding: ActivityMainBinding
 
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
     private var callback: ActionMode.Callback? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        (application as MyApplication).appComponent.inject(this)
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)

app/src/main/java/com/flamyoad/tsukiviewer/MyAppPreference.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import com.flamyoad.tsukiviewer.adapter.CollectionListAdapter
-import com.flamyoad.tsukiviewer.model.ViewMode
+import com.flamyoad.tsukiviewer.core.model.ViewMode
 import com.flamyoad.tsukiviewer.ui.doujinpage.GridViewStyle
 import com.flamyoad.tsukiviewer.ui.doujinpage.LandingPageMode
 import com.flamyoad.tsukiviewer.ui.reader.ReaderMode

app/src/main/java/com/flamyoad/tsukiviewer/MyApplication.kt

@@ -4,7 +4,10 @@ import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.VmPolicy
 import com.bumptech.glide.Glide
-import com.flamyoad.tsukiviewer.model.Doujin
+import com.flamyoad.tsukiviewer.di.AppComponent
+import com.flamyoad.tsukiviewer.di.AppModule
+import com.flamyoad.tsukiviewer.di.DaggerAppComponent
+import com.flamyoad.tsukiviewer.core.model.Doujin
 import com.flamyoad.tsukiviewer.utils.ActivityHistory
 import com.jakewharton.threetenabp.AndroidThreeTen
 import kotlinx.coroutines.CoroutineName
@@ -14,6 +17,9 @@ import kotlinx.coroutines.plus
 
 class MyApplication : Application() {
 
+    lateinit var appComponent: AppComponent
+        private set
+
     val coroutineScope = MainScope() + CoroutineName("Application Scope")
 
     val activityStack = mutableListOf<ActivityHistory>()
@@ -22,6 +28,12 @@ class MyApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
+
+        // Initialize Dagger
+        appComponent = DaggerAppComponent.builder()
+            .appModule(AppModule(this))
+            .build()
+
         AndroidThreeTen.init(this)
 
         /*
@@ -41,4 +53,8 @@ class MyApplication : Application() {
         super.onTrimMemory(level)
         Glide.with(this).onTrimMemory(TRIM_MEMORY_MODERATE)
     }
-}
+}
+
+// Extension function to get AppComponent from any Context
+val Application.appComponent: AppComponent
+    get() = (this as MyApplication).appComponent

app/src/main/java/com/flamyoad/tsukiviewer/adapter/BookmarkGroupAdapter.kt

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.BookmarkGroup
+import com.flamyoad.tsukiviewer.core.model.BookmarkGroup
 import de.hdodenhof.circleimageview.CircleImageView
 
 private const val BTN_ADD_NEW_GROUP = 0

app/src/main/java/com/flamyoad/tsukiviewer/adapter/BookmarkItemsAdapter.kt

@@ -15,9 +15,9 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.flamyoad.tsukiviewer.ActionModeListener
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.BookmarkItem
-import com.flamyoad.tsukiviewer.model.Doujin
-import com.flamyoad.tsukiviewer.model.ViewMode
+import com.flamyoad.tsukiviewer.core.model.BookmarkItem
+import com.flamyoad.tsukiviewer.core.model.Doujin
+import com.flamyoad.tsukiviewer.core.model.ViewMode
 import com.flamyoad.tsukiviewer.ui.doujinpage.DoujinDetailsActivity
 
 class BookmarkItemsAdapter(var actionModeEnabled: Boolean)

app/src/main/java/com/flamyoad/tsukiviewer/adapter/CollectionInfoTagAdapter.kt

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Tag
+import com.flamyoad.tsukiviewer.core.model.Tag
 import com.flamyoad.tsukiviewer.ui.home.collections.DialogTagPicker
 import com.google.android.material.chip.Chip
 

app/src/main/java/com/flamyoad/tsukiviewer/adapter/CollectionListAdapter.kt

@@ -14,9 +14,9 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Collection
-import com.flamyoad.tsukiviewer.model.CollectionCriteria
-import com.flamyoad.tsukiviewer.model.CollectionWithCriterias
+import com.flamyoad.tsukiviewer.core.model.Collection
+import com.flamyoad.tsukiviewer.core.model.CollectionCriteria
+import com.flamyoad.tsukiviewer.core.model.CollectionWithCriterias
 import com.flamyoad.tsukiviewer.ui.home.collections.CollectionFragment
 import com.flamyoad.tsukiviewer.ui.home.collections.DialogTagPicker.Mode
 import com.flamyoad.tsukiviewer.ui.home.collections.doujins.CollectionDoujinsActivity

app/src/main/java/com/flamyoad/tsukiviewer/adapter/CollectionListCriteriasAdapter.kt

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.CollectionCriteria
+import com.flamyoad.tsukiviewer.core.model.CollectionCriteria
 import com.flamyoad.tsukiviewer.ui.home.collections.DialogTagPicker
 import com.google.android.material.chip.Chip
 

app/src/main/java/com/flamyoad/tsukiviewer/adapter/CollectionPickerAdapter.kt

@@ -8,7 +8,7 @@ import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.BookmarkGroup
+import com.flamyoad.tsukiviewer.core.model.BookmarkGroup
 import com.flamyoad.tsukiviewer.ui.doujinpage.BookmarkGroupDialogListener
 
 class CollectionPickerAdapter(private val listener: BookmarkGroupDialogListener) :

app/src/main/java/com/flamyoad/tsukiviewer/adapter/DoujinTagsAdapter.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Tag
+import com.flamyoad.tsukiviewer.core.model.Tag
 import com.flamyoad.tsukiviewer.ui.search.SearchActivity
 import com.flamyoad.tsukiviewer.ui.search.SearchResultActivity
 import com.flamyoad.tsukiviewer.utils.ActivityStackUtils

app/src/main/java/com/flamyoad/tsukiviewer/adapter/EditorNewTagAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Tag
+import com.flamyoad.tsukiviewer.core.model.Tag
 import com.flamyoad.tsukiviewer.ui.editor.CreateTagListener
 import com.flamyoad.tsukiviewer.ui.search.TagSelectedListener
 import java.util.*

app/src/main/java/com/flamyoad/tsukiviewer/adapter/FetchHistoryAdapter.kt

@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.network.FetchHistory
-import com.flamyoad.tsukiviewer.network.FetchStatus
+import com.flamyoad.tsukiviewer.core.network.FetchHistory
+import com.flamyoad.tsukiviewer.core.network.FetchStatus
 
 
 class FetchHistoryAdapter :

app/src/main/java/com/flamyoad/tsukiviewer/adapter/IncludedFolderAdapter.kt

@@ -7,7 +7,7 @@ import android.widget.ImageButton
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.IncludedPath
+import com.flamyoad.tsukiviewer.core.model.IncludedPath
 import com.flamyoad.tsukiviewer.ui.settings.includedfolders.RemoveFolderListener
 import com.flamyoad.tsukiviewer.utils.ui.EmptyViewHolder
 import java.lang.IllegalArgumentException

app/src/main/java/com/flamyoad/tsukiviewer/adapter/LocalDoujinsAdapter.kt

@@ -13,8 +13,8 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
 import com.flamyoad.tsukiviewer.ActionModeListener
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Doujin
-import com.flamyoad.tsukiviewer.model.ViewMode
+import com.flamyoad.tsukiviewer.core.model.Doujin
+import com.flamyoad.tsukiviewer.core.model.ViewMode
 import com.flamyoad.tsukiviewer.ui.doujinpage.DoujinDetailsActivity
 import com.flamyoad.tsukiviewer.utils.ActivityStackUtils
 import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller

app/src/main/java/com/flamyoad/tsukiviewer/adapter/RecentTabsAdapter.kt

@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.RecentTab
+import com.flamyoad.tsukiviewer.core.model.RecentTab
 
 class RecentTabsAdapter(
     private val onTabClick: (RecentTab) -> Unit,

app/src/main/java/com/flamyoad/tsukiviewer/adapter/SearchHistoryAdapter.kt

@@ -10,7 +10,7 @@ import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.SearchHistory
+import com.flamyoad.tsukiviewer.core.model.SearchHistory
 import com.flamyoad.tsukiviewer.utils.ui.EmptyViewHolder
 
 private const val TITLE_ONLY = 1

app/src/main/java/com/flamyoad/tsukiviewer/adapter/SourceSelectorAdapter.kt

@@ -10,7 +10,8 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Source
+import com.flamyoad.tsukiviewer.core.model.Source
+import com.flamyoad.tsukiviewer.utils.extensions.drawableId
 
 class SourceSelectorAdapter(val checkBoxStates: HashMap<Source, Boolean>,
                             val onCheckBoxClick: (Source, Boolean) -> Unit)

app/src/main/java/com/flamyoad/tsukiviewer/adapter/TagPickerAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.flamyoad.tsukiviewer.R
-import com.flamyoad.tsukiviewer.model.Tag
+import com.flamyoad.tsukiviewer.core.model.Tag
 import com.flamyoad.tsukiviewer.ui.search.TagSelectedListener
 import java.util.*