2019-12-26 Version 2.1.1: Refactored project structure and implemented Dagger 2

Author: fartem

.travis.yml

@@ -8,7 +8,6 @@ android:
     - platform-tools
     - build-tools-29.0.2
     - android-29
-    - android-22
     - extra-android-m2repository
     - extra-android-support
     - extra-google-m2repository

app/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'io.gitlab.arturbosch.detekt'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 29
@@ -11,7 +12,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName "2.1.0"
+        versionName "2.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -50,6 +51,10 @@ dependencies {
     // FAB menu
     implementation 'me.jahirfiquitiva:FABsMenu:1.1.4'
 
+    // Dagger 2
+    implementation 'com.google.dagger:dagger:2.24'
+    kapt 'com.google.dagger:dagger-compiler:2.24'
+
     // Unit tests
     testImplementation 'junit:junit:4.12'
 

app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/AndroidTestSuite.kt

@@ -1,23 +1,48 @@
 package com.smlnskgmail.jaman.randomnotes
 
 import android.app.Application
-import com.smlnskgmail.jaman.randomnotes.logic.sources.ormlite.OrmLiteDataSource
-import com.smlnskgmail.jaman.randomnotes.logic.sources.parse.ParseDataSource
-import com.smlnskgmail.jaman.randomnotes.repository.DataRepositoryAccessor
+import com.smlnskgmail.jaman.randomnotes.di.ApplicationComponent
+import com.smlnskgmail.jaman.randomnotes.di.CloudAuthModule
+import com.smlnskgmail.jaman.randomnotes.di.DaggerApplicationComponent
+import com.smlnskgmail.jaman.randomnotes.di.DataRepositoryModule
+import com.smlnskgmail.jaman.randomnotes.logic.repository.DataRepository
+import com.smlnskgmail.jaman.randomnotes.logic.repository.sources.ormlite.OrmLiteDataSource
+import com.smlnskgmail.jaman.randomnotes.logic.repository.sources.parse.ParseAuth
+import com.smlnskgmail.jaman.randomnotes.logic.repository.sources.parse.ParseDataSource
+import javax.inject.Inject
 
 @Suppress("unused")
 class Application : Application() {
 
+    companion object {
+
+        lateinit var applicationComponent: ApplicationComponent
+
+    }
+
+    @Inject
+    lateinit var dataRepository: DataRepository
+
     override fun onCreate() {
         super.onCreate()
-        DataRepositoryAccessor.initWith(
-            OrmLiteDataSource(this),
-            ParseDataSource(this)
-        )
+        applicationComponent = DaggerApplicationComponent.builder()
+            .withDataRepository(
+                DataRepositoryModule(
+                    OrmLiteDataSource(this),
+                    ParseDataSource(this)
+                )
+            )
+            .withCloudAuth(
+                CloudAuthModule(
+                    ParseAuth()
+                )
+            )
+            .build()
+        applicationComponent.inject(this)
     }
 
     override fun onTerminate() {
-        DataRepositoryAccessor.free()
+        dataRepository.destroy()
         super.onTerminate()
     }
 

app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/db/NoteDBTest.kt

@@ -4,8 +4,8 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import com.smlnskgmail.jaman.randomnotes.components.BaseFragment
-import com.smlnskgmail.jaman.randomnotes.components.FragmentResume
+import com.smlnskgmail.jaman.randomnotes.components.fragments.BaseFragment
+import com.smlnskgmail.jaman.randomnotes.components.fragments.lifecycle.FragmentResume
 import com.smlnskgmail.jaman.randomnotes.logic.login.LoginFragment
 import com.smlnskgmail.jaman.randomnotes.logic.main.MainFragment
 

app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/ui/note/BaseNoteTest.kt

@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.randomnotes.components
+package com.smlnskgmail.jaman.randomnotes.components.bottomsheets
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,12 +8,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 abstract class BaseBottomSheet : BottomSheetDialogFragment() {
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        initialize()
-    }
-
-    abstract fun initialize()
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?, savedInstanceState: Bundle?

app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/ui/note/NoteCreationTest.kt

@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.randomnotes.components.views;
+package com.smlnskgmail.jaman.randomnotes.components.containers;
 
 import android.content.Context;
 import android.util.AttributeSet;

app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/ui/utils/ChildClick.kt

@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.randomnotes.components
+package com.smlnskgmail.jaman.randomnotes.components.dialogs
 
 import android.app.Dialog
 import android.content.Context
@@ -10,15 +10,12 @@ abstract class BaseDialog(context: Context) : Dialog(context) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(getLayoutResId())
-        initializeDialog()
         window!!.setLayout(
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
     }
 
-    abstract fun initializeDialog()
-
     abstract fun getLayoutResId(): Int
 
 }

app/src/main/java/com/smlnskgmail/jaman/randomnotes/Application.kt

@@ -1,26 +1,23 @@
-package com.smlnskgmail.jaman.randomnotes.components
+package com.smlnskgmail.jaman.randomnotes.components.fragments
 
 import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.Fragment
+import com.smlnskgmail.jaman.randomnotes.components.fragments.lifecycle.FragmentResume
 
 abstract class BaseFragment : Fragment(), FragmentResume {
 
     private lateinit var menu: Menu
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        onViewCreated()
+        setHasOptionsMenu(true)
+        setTitle()
     }
 
     private fun setTitle() {
         activity!!.setTitle(getTitleResId())
     }
 
-    open fun onViewCreated() {
-        setHasOptionsMenu(true)
-        setTitle()
-    }
-
     override fun onFragmentResume() {
         setTitle()
     }
@@ -65,9 +62,3 @@ abstract class BaseFragment : Fragment(), FragmentResume {
     }
 
 }
-
-interface FragmentResume {
-
-    fun onFragmentResume()
-
-}

app/src/main/java/com/smlnskgmail/jaman/randomnotes/MainActivity.kt

@@ -0,0 +1,7 @@
+package com.smlnskgmail.jaman.randomnotes.components.fragments.lifecycle
+
+interface FragmentResume {
+
+    fun onFragmentResume()
+
+}

app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/BaseBottomSheet.kt renamed to app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/bottomsheets/BaseBottomSheet.kt

@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.randomnotes.components
+package com.smlnskgmail.jaman.randomnotes.components.views
 
 import android.content.Context
 import android.widget.Toast

app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/views/AdaptiveRecyclerView.java renamed to app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/containers/AdaptiveRecyclerView.java

@@ -75,8 +75,13 @@ private void initSupportVectorDrawablesAttrs(AttributeSet attrs) {
             }
         }
 
-        TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(this,
-                drawableStart, drawableTop, drawableEnd, drawableBottom);
+        TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                this,
+                drawableStart,
+                drawableTop,
+                drawableEnd,
+                drawableBottom
+        );
 
         attributeArray.recycle();
     }