Re-bootstrapping dagger2

app/build.gradle

@@ -1,83 +0,0 @@
-plugins{
-    id 'com.android.application'
-
-    id'kotlin-android'
-
-    id 'kotlin-android-extensions'
-
-    id 'kotlin-kapt'
-}
-
-android {
-    dataBinding {
-        enabled = true
-    }
-    compileSdkVersion 29
-    defaultConfig {
-        applicationId "com.sduduzog.slimlauncher"
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 41
-        versionName "2.4.6"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            minifyEnabled false
-            applicationIdSuffix ".debug"
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-
-    // Kotlin Libraries
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    // Support Libraries
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
-
-    // Arch Components
-    implementation 'androidx.core:core-ktx:1.2.0-alpha03'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'android.arch.navigation:navigation-fragment:1.0.0'
-    implementation 'androidx.room:room-runtime:2.1.0'
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0"
-    kapt "androidx.room:room-compiler:2.1.0"
-
-    //3rd party libs
-    implementation 'com.intuit.sdp:sdp-android:1.0.6'
-    implementation 'com.intuit.ssp:ssp-android:1.0.6'
-
-    // Test libs
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.19.0'
-    androidTestImplementation 'androidx.room:room-testing:2.1.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation "androidx.arch.core:core-testing:2.0.1"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-
-}

app/build.gradle.kts

@@ -0,0 +1,85 @@
+plugins {
+    id("com.android.application")
+
+    kotlin("android")
+
+    kotlin("android.extensions")
+
+    kotlin("kapt")
+}
+
+android {
+    compileSdkVersion(29)
+    defaultConfig {
+        applicationId = "com.sduduzog.slimlauncher"
+        minSdkVersion(21)
+        targetSdkVersion(29)
+        versionCode = 41
+        versionName = "2.4.6"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables{useSupportLibrary = true}
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile ("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+        getByName("debug") {
+            isMinifyEnabled = false
+            proguardFiles (getDefaultProguardFile ("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions{
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+
+    // Kotlin Libraries
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61")
+
+    // Support Libraries
+    implementation("androidx.appcompat:appcompat:1.1.0")
+    implementation("androidx.recyclerview:recyclerview:1.1.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta4")
+
+    // Arch Components
+    implementation("androidx.core:core-ktx:1.3.0-alpha02")
+    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
+    implementation("android.arch.navigation:navigation-fragment:1.0.0")
+    implementation("androidx.room:room-runtime:2.2.4")
+    implementation("androidx.lifecycle:lifecycle-common-java8:2.2.0")
+    kapt("androidx.room:room-compiler:2.2.4")
+
+    //3rd party libs
+    implementation("com.intuit.sdp:sdp-android:1.0.6")
+    implementation("com.intuit.ssp:ssp-android:1.0.6")
+
+    implementation("com.google.dagger:dagger-android:2.17")
+    implementation("com.google.dagger:dagger-android-support:2.17")
+    kapt("com.google.dagger:dagger-android-processor:2.17")
+    kapt("com.google.dagger:dagger-compiler:2.17")
+
+
+    // Test libs
+    testImplementation("junit:junit:4.12")
+    testImplementation("org.mockito:mockito-core:2.19.0")
+    androidTestImplementation("androidx.room:room-testing:2.2.4")
+    androidTestImplementation("androidx.test:runner:1.2.0")
+    androidTestImplementation("androidx.test:rules:1.2.0")
+    androidTestImplementation("androidx.annotation:annotation:1.1.0")
+    androidTestImplementation("androidx.test:runner:1.2.0")
+    androidTestImplementation("androidx.test:rules:1.2.0")
+    androidTestImplementation("androidx.arch.core:core-testing:2.1.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
+    androidTestImplementation("androidx.test.espresso:espresso-intents:3.2.0")
+
+}

app/src/androidTest/java/com/sduduzog/slimlauncher/TasksFragmentTest.kt

@@ -1,15 +1,9 @@
 package com.sduduzog.slimlauncher
 
 
-import android.view.KeyEvent
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.*
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.rule.ActivityTestRule
-import org.hamcrest.CoreMatchers.allOf
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -24,15 +18,15 @@ class TasksFragmentTest {
 
     @Test
     fun userCanAddTask() {
-        val taskButton = onView(allOf(withText(R.string.home_fragment_tasks), isDisplayed()))
-        taskButton.perform(click())
-        val inputField = onView(allOf(withHint(R.string.tasks_fragment_enter_a_new_task), isDisplayed()))
-
-        inputField.perform(typeText("Testing"))
-        inputField.perform(pressKey(KeyEvent.KEYCODE_ENTER))
-
-        val checkBox = onView(allOf(withText("Testing"), isDisplayed()))
-
-        checkBox.check(matches(isNotChecked()))
+//        val taskButton = onView(allOf(withText(R.string.home_fragment_tasks), isDisplayed()))
+//        taskButton.perform(click())
+//        val inputField = onView(allOf(withHint(R.string.tasks_fragment_enter_a_new_task), isDisplayed()))
+//
+//        inputField.perform(typeText("Testing"))
+//        inputField.perform(pressKey(KeyEvent.KEYCODE_ENTER))
+//
+//        val checkBox = onView(allOf(withText("Testing"), isDisplayed()))
+//
+//        checkBox.check(matches(isNotChecked()))
     }
 }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
 
     <application
+        android:name=".App"
         android:allowBackup="false"
         android:configChanges="orientation|keyboardHidden|screenSize"
         android:icon="@mipmap/ic_launcher"
@@ -18,7 +19,7 @@
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
+            android:screenOrientation="fullSensor"
             android:stateNotNeeded="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/sduduzog/slimlauncher/ActivityModule.kt

@@ -0,0 +1,10 @@
+package com.sduduzog.slimlauncher
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ActivityModule {
+    @ContributesAndroidInjector()
+    abstract fun contributeMainActivity(): MainActivity
+}

app/src/main/java/com/sduduzog/slimlauncher/App.kt

@@ -0,0 +1,25 @@
+package com.sduduzog.slimlauncher
+
+import android.app.Activity
+import android.app.Application
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasActivityInjector
+import javax.inject.Inject
+
+class App : Application(), HasActivityInjector {
+    @Inject
+    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
+
+    override fun activityInjector(): AndroidInjector<Activity> {
+        return dispatchingAndroidInjector
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        DaggerAppComponent.builder()
+                .application(this)
+                .build()
+                .inject(this)
+    }
+}

app/src/main/java/com/sduduzog/slimlauncher/AppComponent.kt

@@ -0,0 +1,27 @@
+package com.sduduzog.slimlauncher
+
+import android.app.Application
+import dagger.BindsInstance
+import dagger.Component
+import dagger.android.support.AndroidSupportInjectionModule
+import javax.inject.Singleton
+
+@Component(modules = [
+    ActivityModule::class,
+    DbModule::class,
+    FragmentModule::class,
+    ViewModelModule::class,
+    AndroidSupportInjectionModule::class
+])
+@Singleton
+interface AppComponent {
+    @Component.Builder
+    interface Builder{
+        @BindsInstance
+        fun application(application: Application): Builder
+
+        fun build(): AppComponent
+    }
+
+    fun inject(app: App)
+}

app/src/main/java/com/sduduzog/slimlauncher/DbModule.kt

@@ -0,0 +1,40 @@
+package com.sduduzog.slimlauncher
+
+import android.app.Application
+import androidx.room.Room
+import com.sduduzog.slimlauncher.data.BaseDao
+import com.sduduzog.slimlauncher.data.BaseDatabase
+import com.sduduzog.slimlauncher.data.BaseDatabase.Companion.MIGRATION_1_2
+import com.sduduzog.slimlauncher.data.BaseDatabase.Companion.MIGRATION_2_3
+import com.sduduzog.slimlauncher.data.BaseDatabase.Companion.MIGRATION_3_4
+import com.sduduzog.slimlauncher.data.BaseDatabase.Companion.MIGRATION_4_5
+import com.sduduzog.slimlauncher.data.BaseDatabase.Companion.MIGRATION_5_6
+import com.sduduzog.slimlauncher.data.BaseDatabase.Companion.MIGRATION_6_7
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class DbModule {
+    @Provides
+    @Singleton
+    internal fun provideBaseDatabase(application: Application) : BaseDatabase{
+        return Room.databaseBuilder(application,
+                        BaseDatabase::class.java, "app_database")
+                .addMigrations(
+                        MIGRATION_1_2,
+                        MIGRATION_2_3,
+                        MIGRATION_3_4,
+                        MIGRATION_4_5,
+                        MIGRATION_5_6,
+                        MIGRATION_6_7
+                )
+                .build()
+    }
+
+    @Provides
+    @Singleton
+    internal fun provideBaseDao(baseDatabase: BaseDatabase) : BaseDao {
+        return baseDatabase.baseDao()
+    }
+}

app/src/main/java/com/sduduzog/slimlauncher/FragmentModule.kt

@@ -0,0 +1,23 @@
+package com.sduduzog.slimlauncher
+
+import com.sduduzog.slimlauncher.ui.main.HomeFragment
+import com.sduduzog.slimlauncher.ui.options.AddAppFragment
+import com.sduduzog.slimlauncher.ui.options.CustomiseAppsFragment
+import com.sduduzog.slimlauncher.ui.options.OptionsFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class FragmentModule {
+    @ContributesAndroidInjector
+    abstract fun contributesHomeFragment() : HomeFragment
+    @ContributesAndroidInjector
+
+    abstract fun contributesOptionsFragment() : OptionsFragment
+    @ContributesAndroidInjector
+
+    abstract fun contributesCustomiseAppsFragment() : CustomiseAppsFragment
+    @ContributesAndroidInjector
+
+    abstract fun contributesAddAppFragment() : AddAppFragment
+}

app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt

@@ -5,14 +5,31 @@ import android.content.res.Resources
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.Navigation.findNavController
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.HomeWatcher
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
+import javax.inject.Inject
 
 
-class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener, HomeWatcher.OnHomePressedListener {
+class MainActivity : AppCompatActivity(),
+        SharedPreferences.OnSharedPreferenceChangeListener,
+        HomeWatcher.OnHomePressedListener , HasSupportFragmentInjector{
 
+    @Inject
+    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> {
+        return dispatchingAndroidInjector
+    }
+
+    @Inject
+    internal lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var settings: SharedPreferences
     private lateinit var navigator: NavController
     private lateinit var homeWatcher: HomeWatcher
@@ -37,6 +54,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AndroidInjection.inject(this)
         setContentView(R.layout.main_activity)
         settings = getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
         settings.registerOnSharedPreferenceChangeListener(this)

app/src/main/java/com/sduduzog/slimlauncher/ViewModelFactory.kt

@@ -0,0 +1,20 @@
+package com.sduduzog.slimlauncher
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
+import javax.inject.Provider
+
+class ViewModelFactory @Inject
+constructor(private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>) : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        val creator = viewModels[modelClass]
+                ?: viewModels.asIterable().firstOrNull{ modelClass.isAssignableFrom(it.key)}?.value
+        return try {
+            creator?.get() as T
+        } catch (e: Exception){
+            throw RuntimeException(e)
+        }
+    }
+}

app/src/main/java/com/sduduzog/slimlauncher/ViewModelKey.kt

@@ -0,0 +1,11 @@
+package com.sduduzog.slimlauncher
+
+import androidx.lifecycle.ViewModel
+import dagger.MapKey
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.FUNCTION,
+        AnnotationTarget.PROPERTY_GETTER,
+        AnnotationTarget.PROPERTY_SETTER)
+@MapKey
+annotation class ViewModelKey(val value: KClass<out ViewModel>)

app/src/main/java/com/sduduzog/slimlauncher/ViewModelModule.kt

@@ -0,0 +1,29 @@
+package com.sduduzog.slimlauncher
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.sduduzog.slimlauncher.models.AddAppViewModel
+import com.sduduzog.slimlauncher.models.CustomiseAppsViewModel
+import com.sduduzog.slimlauncher.models.MainViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+
+@Module
+internal abstract class ViewModelModule {
+    @Binds
+    internal abstract fun bindViewModelFactory(factory: ViewModelFactory) : ViewModelProvider.Factory
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(MainViewModel::class)
+    protected abstract fun mainViewModel(mainViewModel: MainViewModel): ViewModel
+    @Binds
+    @IntoMap
+    @ViewModelKey(AddAppViewModel::class)
+    protected abstract fun addAppViewModel(addAppViewModel: AddAppViewModel): ViewModel
+    @Binds
+    @IntoMap
+    @ViewModelKey(CustomiseAppsViewModel::class)
+    protected abstract fun customiseAppsViewModel(customiseAppsViewModel: CustomiseAppsViewModel): ViewModel
+}

app/src/main/java/com/sduduzog/slimlauncher/data/BaseDatabase.kt

@@ -38,7 +38,7 @@ abstract class BaseDatabase : RoomDatabase() {
             }
         }
 
-        private val MIGRATION_1_2 = object : Migration(1, 2) {
+         val MIGRATION_1_2 = object : Migration(1, 2) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE `home_apps` ADD COLUMN `sorting_index` INTEGER NOT NULL DEFAULT 0")
                 val cursor = database.query("SELECT package_name FROM home_apps")
@@ -53,20 +53,20 @@ abstract class BaseDatabase : RoomDatabase() {
             }
         }
 
-        private val MIGRATION_2_3 = object : Migration(2, 3) {
+         val MIGRATION_2_3 = object : Migration(2, 3) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("CREATE TABLE IF NOT EXISTS `notes` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `body` TEXT NOT NULL, `edited` INTEGER NOT NULL)")
             }
         }
 
-        private val MIGRATION_3_4 = object : Migration(3, 4) {
+         val MIGRATION_3_4 = object : Migration(3, 4) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("DROP TABLE IF EXISTS `apps`")
                 database.execSQL("CREATE TABLE IF NOT EXISTS `tasks` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `body` TEXT NOT NULL, `is_complete` INTEGER NOT NULL, `sorting_index` INTEGER NOT NULL)")
             }
         }
 
-        private val MIGRATION_4_5 = object : Migration(4, 5) {
+         val MIGRATION_4_5 = object : Migration(4, 5) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE `notes` RENAME TO `notes_old`")
                 database.execSQL("CREATE TABLE IF NOT EXISTS `notes` (`id` INTEGER PRIMARY KEY NOT NULL, `body` TEXT NOT NULL, `title` TEXT, `edited` INTEGER NOT NULL)")
@@ -75,13 +75,13 @@ abstract class BaseDatabase : RoomDatabase() {
                 database.execSQL("ALTER TABLE `notes` ADD COLUMN `filename` TEXT")
             }
         }
-        private val MIGRATION_5_6 = object : Migration(5, 6) {
+         val MIGRATION_5_6 = object : Migration(5, 6) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("DROP TABLE IF EXISTS `notes`")
                 database.execSQL("DROP TABLE IF EXISTS `tasks`")
             }
         }
-        private val MIGRATION_6_7 = object : Migration(6, 7){
+         val MIGRATION_6_7 = object : Migration(6, 7){
             override fun migrate(database: SupportSQLiteDatabase) {
                database.execSQL("ALTER TABLE `home_apps` ADD COLUMN `app_nickname` TEXT")
             }

app/src/main/java/com/sduduzog/slimlauncher/models/AddAppViewModel.kt

@@ -1,13 +1,14 @@
 package com.sduduzog.slimlauncher.models
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModel
+import com.sduduzog.slimlauncher.data.BaseDao
 import com.sduduzog.slimlauncher.data.model.App
+import javax.inject.Inject
 
-class AddAppViewModel(application: Application) : AndroidViewModel(application) {
-    private val repository = Repository(application)
+class AddAppViewModel @Inject constructor (baseDao: BaseDao) : ViewModel() {
+    private val repository = Repository(baseDao)
     private var filterQuery = ""
     private val _installedApps = mutableListOf<App>()
     private val _homeApps = mutableListOf<App>()

app/src/main/java/com/sduduzog/slimlauncher/models/CustomiseAppsViewModel.kt

@@ -1,12 +1,13 @@
 package com.sduduzog.slimlauncher.models
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import com.sduduzog.slimlauncher.data.BaseDao
+import javax.inject.Inject
 
-class CustomiseAppsViewModel(application: Application) : AndroidViewModel(application) {
+class CustomiseAppsViewModel @Inject constructor(baseDao: BaseDao) : ViewModel() {
 
-    private val repository = Repository(application)
+    private val repository = Repository(baseDao)
     private var _apps: LiveData<List<HomeApp>>
 
     init {

app/src/main/java/com/sduduzog/slimlauncher/models/MainViewModel.kt

@@ -1,13 +1,14 @@
 package com.sduduzog.slimlauncher.models
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import com.sduduzog.slimlauncher.data.BaseDao
 import com.sduduzog.slimlauncher.data.model.App
+import javax.inject.Inject
 
-class MainViewModel(application: Application) : AndroidViewModel(application) {
+class MainViewModel @Inject constructor(baseDao: BaseDao) : ViewModel() {
 
-    private val _baseRepository = Repository(application)
+    private val _baseRepository = Repository(baseDao)
 
     private var _apps: LiveData<List<HomeApp>>
 

app/src/main/java/com/sduduzog/slimlauncher/models/Repository.kt

@@ -1,16 +1,12 @@
 package com.sduduzog.slimlauncher.models
 
-import android.app.Application
 import android.os.AsyncTask
 import androidx.lifecycle.LiveData
 import com.sduduzog.slimlauncher.data.BaseDao
-import com.sduduzog.slimlauncher.data.BaseDatabase
+import javax.inject.Singleton
 
-class Repository(application: Application) {
-
-    private val database: BaseDatabase = BaseDatabase.getDatabase(application)!!
-
-    private val baseDao: BaseDao = database.baseDao()
+@Singleton
+class Repository(private val baseDao: BaseDao) {
 
     private val _apps = baseDao.apps
 

app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt

@@ -8,24 +8,32 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.adapters.HomeAdapter
-import com.sduduzog.slimlauncher.models.MainViewModel
 import com.sduduzog.slimlauncher.models.HomeApp
+import com.sduduzog.slimlauncher.models.MainViewModel
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.OnLaunchAppListener
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.home_fragment.*
 import java.text.SimpleDateFormat
 import java.util.*
+import javax.inject.Inject
 
 
 class HomeFragment : BaseFragment(), OnLaunchAppListener {
 
+    @Inject
+    internal lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var receiver: BroadcastReceiver
     private lateinit var viewModel: MainViewModel
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View {
         return inflater.inflate(R.layout.home_fragment, container, false)
@@ -39,10 +47,10 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
         home_fragment_list_exp.adapter = adapter2
 
         activity?.let {
-            viewModel = ViewModelProviders.of(it).get(MainViewModel::class.java)
+            viewModel = ViewModelProvider(it, viewModelFactory).get(MainViewModel::class.java)
         } ?: throw Error("Activity null, something here is fucked up")
 
-        viewModel.apps.observe(this, Observer { list ->
+        viewModel.apps.observe(viewLifecycleOwner, Observer { list ->
             list?.let { apps ->
                 adapter1.setItems(apps.filter {
                     it.sortingIndex < 4

app/src/main/java/com/sduduzog/slimlauncher/ui/options/AddAppFragment.kt

@@ -9,7 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 import com.sduduzog.slimlauncher.BuildConfig
 import com.sduduzog.slimlauncher.R
@@ -18,15 +18,22 @@ import com.sduduzog.slimlauncher.data.model.App
 import com.sduduzog.slimlauncher.models.AddAppViewModel
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.OnAppClickedListener
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.add_app_fragment.*
 import java.util.*
+import javax.inject.Inject
 
 class AddAppFragment : BaseFragment(), OnAppClickedListener {
 
     override fun getFragmentView(): ViewGroup = add_app_fragment
 
+    @Inject
+    internal lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: AddAppViewModel
-
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.add_app_fragment, container, false)
     }
@@ -38,9 +45,9 @@ class AddAppFragment : BaseFragment(), OnAppClickedListener {
         add_app_fragment_list.adapter = adapter
 
         activity?.let {
-            viewModel = ViewModelProviders.of(it).get(AddAppViewModel::class.java)
+            viewModel = ViewModelProvider(it, viewModelFactory).get(AddAppViewModel::class.java)
         } ?: throw Error("How the fuck is this fragment alive while there's no activity?")
-        viewModel.apps.observe(this, Observer {
+        viewModel.apps.observe(viewLifecycleOwner, Observer {
             it?.let { apps ->
                 adapter.setItems(apps)
                 add_app_fragment_progress_bar.visibility = View.GONE

app/src/main/java/com/sduduzog/slimlauncher/ui/options/CustomiseAppsFragment.kt

@@ -7,26 +7,33 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.adapters.CustomAppsAdapter
-import com.sduduzog.slimlauncher.models.HomeApp
 import com.sduduzog.slimlauncher.models.CustomiseAppsViewModel
+import com.sduduzog.slimlauncher.models.HomeApp
 import com.sduduzog.slimlauncher.ui.dialogs.RemoveAllAppsDialog
 import com.sduduzog.slimlauncher.ui.dialogs.RenameAppDialog
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.OnItemActionListener
 import com.sduduzog.slimlauncher.utils.OnShitDoneToAppsListener
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.customise_apps_fragment.*
+import javax.inject.Inject
 
 
 class CustomiseAppsFragment : BaseFragment(), OnShitDoneToAppsListener {
 
     override fun getFragmentView(): ViewGroup = customise_apps_fragment
-
+    @Inject
+    internal lateinit var viewModelFactory: ViewModelProvider.Factory
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
     private lateinit var viewModel: CustomiseAppsViewModel
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -38,10 +45,10 @@ class CustomiseAppsFragment : BaseFragment(), OnShitDoneToAppsListener {
 
         val adapter = CustomAppsAdapter(this)
         activity?.let {
-            viewModel = ViewModelProviders.of(it).get(CustomiseAppsViewModel::class.java)
+            viewModel = ViewModelProvider(it, viewModelFactory).get(CustomiseAppsViewModel::class.java)
         } ?: throw Error("Activity null, something here is fucked up")
 
-        viewModel.apps.observe(this, Observer {
+        viewModel.apps.observe(viewLifecycleOwner, Observer {
             it?.let { apps ->
                 adapter.setItems(apps)
                 when (apps.size) {
@@ -55,7 +62,7 @@ class CustomiseAppsFragment : BaseFragment(), OnShitDoneToAppsListener {
             } ?: adapter.setItems(listOf())
         })
         customise_apps_fragment_remove_all.setOnClickListener {
-            RemoveAllAppsDialog.getInstance(viewModel.apps.value!!, viewModel).show(fragmentManager, "REMOVE_APPS")
+            RemoveAllAppsDialog.getInstance(viewModel.apps.value!!, viewModel).show(childFragmentManager, "REMOVE_APPS")
         }
 
         customise_apps_fragment_list.adapter = adapter

app/src/main/java/com/sduduzog/slimlauncher/ui/options/OptionsFragment.kt

@@ -14,11 +14,16 @@ import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.ui.dialogs.ChangeThemeDialog
 import com.sduduzog.slimlauncher.ui.dialogs.ChooseTimeFormatDialog
 import com.sduduzog.slimlauncher.utils.BaseFragment
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.options_fragment.*
 
 class OptionsFragment : BaseFragment() {
     override fun getFragmentView(): ViewGroup = options_fragment
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.options_fragment, container, false)
     }
@@ -40,11 +45,11 @@ class OptionsFragment : BaseFragment() {
         }
         options_fragment_change_theme.setOnClickListener {
             val changeThemeDialog = ChangeThemeDialog.getThemeChooser()
-            changeThemeDialog.showNow(fragmentManager, "THEME_CHOOSER")
+            changeThemeDialog.showNow(childFragmentManager, "THEME_CHOOSER")
         }
         options_fragment_choose_time_format.setOnClickListener {
             val chooseTimeFormatDialog = ChooseTimeFormatDialog.getInstance()
-            chooseTimeFormatDialog.showNow(fragmentManager, "TIME_FORMAT_CHOOSER")
+            chooseTimeFormatDialog.showNow(childFragmentManager, "TIME_FORMAT_CHOOSER")
         }
         options_fragment_toggle_status_bar.setOnClickListener {
             val settings = context!!.getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)

build.gradle → build.gradle.kts

@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:3.6.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,6 +21,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register("clean", Delete::class) {
+    delete(rootProject.buildDir)
 }

gradle.properties

@@ -9,7 +9,6 @@
 org.gradle.jvmargs=-Xmx6114m
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Aug 24 16:44:55 CAT 2019
+#Sat Mar 14 22:31:59 CAT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

settings.gradle

@@ -1 +0,0 @@
-include ':app'

settings.gradle.kts

@@ -0,0 +1 @@
+include(":app")