Merge pull request EyuCoder#14 from ouattararomuald/configure-dagger

EyuCoder · web-flow · commit 409b0f084246 · 2021-09-07T13:32:07.000+03:00
Configure dagger 👌🏽
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,9 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/.name
+/.idea/inspectionProfiles
+/.idea/codeStyles
 .DS_Store
 /build
 /captures
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,6 +4,7 @@ plugins {
     id 'kotlin-android-extensions'
     id 'kotlin-kapt'
     id 'androidx.navigation.safeargs'
+    id 'dagger.hilt.android.plugin'
 }
 
 android {
@@ -80,4 +81,12 @@ dependencies {
 
     //Kotlin SharedPreference
     implementation 'androidx.preference:preference-ktx:1.1.1'
+
+    // Dagger Hilt
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-compiler:$hilt_version"
+}
+
+kapt {
+    correctErrorTypes true
 }
diff --git a/app/src/main/java/com/codexo/notes/JottyApp.kt b/app/src/main/java/com/codexo/notes/JottyApp.kt
@@ -5,7 +5,9 @@ import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import com.codexo.notes.utils.THEME_PREF_KEY
 import com.codexo.notes.utils.ThemeUtil
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class JottyApp : Application() {
 
     override fun onCreate() {
diff --git a/app/src/main/java/com/codexo/notes/core/DatabaseModule.kt b/app/src/main/java/com/codexo/notes/core/DatabaseModule.kt
@@ -0,0 +1,30 @@
+package com.codexo.notes.core
+
+import android.content.Context
+import androidx.room.Room
+import com.codexo.notes.data.NoteDao
+import com.codexo.notes.data.NoteDatabase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+
+    @Singleton
+    @Provides
+    fun provideDatabase(@ApplicationContext applicationContext: Context): NoteDatabase {
+        return Room.databaseBuilder(
+                applicationContext,
+                NoteDatabase::class.java,
+                "notes_db"
+        ).fallbackToDestructiveMigration().build()
+    }
+
+    @Provides
+    fun provideNoteDao(noteDatabase: NoteDatabase): NoteDao = noteDatabase.noteDao()
+}
diff --git a/app/src/main/java/com/codexo/notes/data/PrefsManager.kt b/app/src/main/java/com/codexo/notes/data/PrefsManager.kt
@@ -4,8 +4,10 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import com.codexo.notes.utils.SortBy
 import com.codexo.notes.utils.VIEW_PREF_KEY
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 
-class PrefsManager(private val context: Context) {
+class PrefsManager @Inject constructor(@ApplicationContext private val context: Context) {
 
     companion object {
         private const val PREFS_NAME = "JottyNotes"
diff --git a/app/src/main/java/com/codexo/notes/ui/MainActivity.kt b/app/src/main/java/com/codexo/notes/ui/MainActivity.kt
@@ -1,17 +1,16 @@
 package com.codexo.notes.ui
 
-import android.content.SharedPreferences
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupActionBarWithNavController
-import androidx.preference.PreferenceManager
 import com.codexo.notes.R
-import com.codexo.notes.utils.ThemeUtil
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private lateinit var navController: NavController
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/codexo/notes/ui/SharedViewModel.kt b/app/src/main/java/com/codexo/notes/ui/SharedViewModel.kt
@@ -1,15 +1,17 @@
 package com.codexo.notes.ui
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
+
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.codexo.notes.data.Note
-import com.codexo.notes.data.NoteDatabase
+import com.codexo.notes.data.NoteDao
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class SharedViewModel constructor(application: Application) : AndroidViewModel(application) {
-    private val noteDao = NoteDatabase.getInstance(application).noteDao()
+@HiltViewModel
+class SharedViewModel @Inject constructor(private val noteDao: NoteDao) : ViewModel() {
 
     fun insertNote(note: Note) = viewModelScope.launch(Dispatchers.IO) { noteDao.insert(note) }
 
diff --git a/app/src/main/java/com/codexo/notes/ui/add/AddFragment.kt b/app/src/main/java/com/codexo/notes/ui/add/AddFragment.kt
@@ -13,18 +13,20 @@ import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.codexo.notes.R
 import com.codexo.notes.data.Note
 import com.codexo.notes.databinding.FragmentDetailBinding
 import com.codexo.notes.ui.SharedViewModel
 import com.codexo.notes.utils.HideKeyboard.Companion.hideKeyboard
 import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
 import java.util.*
 
+@AndroidEntryPoint
 class AddFragment : Fragment(R.layout.fragment_detail) {
-    private val viewModel: SharedViewModel by activityViewModels()
+    private val viewModel: SharedViewModel by viewModels()
     private var _binding: FragmentDetailBinding? = null
     private val binding
         get() = _binding
diff --git a/app/src/main/java/com/codexo/notes/ui/edit/EditFragment.kt b/app/src/main/java/com/codexo/notes/ui/edit/EditFragment.kt
@@ -12,7 +12,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -23,12 +22,13 @@ import com.codexo.notes.ui.SharedViewModel
 import com.codexo.notes.utils.HideKeyboard.Companion.hideKeyboard
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
 import java.util.*
 
-
+@AndroidEntryPoint
 class EditFragment : Fragment(R.layout.fragment_detail) {
     private val args: EditFragmentArgs by navArgs()
-    private val viewModel: SharedViewModel by activityViewModels()
+    private val viewModel: SharedViewModel by viewModels()
     private var _binding: FragmentDetailBinding? = null
     private val binding
         get() = _binding
diff --git a/app/src/main/java/com/codexo/notes/ui/notes/NotesFragment.kt b/app/src/main/java/com/codexo/notes/ui/notes/NotesFragment.kt
@@ -23,8 +23,11 @@ import com.codexo.notes.ui.SharedViewModel
 import com.codexo.notes.utils.SortBy
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.android.synthetic.main.fragment_notes.*
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class NotesFragment : Fragment(R.layout.fragment_notes), NotesAdapter.OnItemClickListener {
 
     private val TAG = NotesFragment::class.java.simpleName
@@ -34,7 +37,7 @@ class NotesFragment : Fragment(R.layout.fragment_notes), NotesAdapter.OnItemClic
     private val binding
         get() = _binding
     private val notesAdapter = NotesAdapter(this)
-    private val prefs: PrefsManager by lazy { PrefsManager(requireContext()) }
+    @Inject lateinit var prefs: PrefsManager
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/com/codexo/notes/ui/notes/NotesViewModel.kt b/app/src/main/java/com/codexo/notes/ui/notes/NotesViewModel.kt
@@ -1,23 +1,26 @@
 package com.codexo.notes.ui.notes
 
-import android.app.Application
 import android.util.Log
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.codexo.notes.data.Note
-import com.codexo.notes.data.NoteDatabase
+import com.codexo.notes.data.NoteDao
 import com.codexo.notes.data.PrefsManager
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class NotesViewModel @Inject constructor(
+    private val prefs: PrefsManager,
+    private val noteDao: NoteDao
+) : ViewModel() {
 
-class NotesViewModel constructor(application: Application) : AndroidViewModel(application) {
     private val TAG = NotesViewModel::class.java.simpleName
-    private val noteDao = NoteDatabase.getInstance(application).noteDao()
 
     lateinit var searchQuery: String
 
-    private val prefs = PrefsManager(application)
-
     val allNotes: LiveData<List<Note>>
         get() = getNotes()
 
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@ buildscript {
     ext{
         kotlin_version = "1.5.20"
         gradle_version = '7.0.1'
+        hilt_version = '2.38.1'
         coroutines_version = "1.5.0"
         navigation_version = "2.3.5"
         room_version = "2.3.0"
@@ -16,6 +17,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
         classpath "com.android.tools.build:gradle:$gradle_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
