Merge pull request #13 from valueadd-poland/feature/handle-instance-state-split-implementation

refactor: split implementation of mvi fragment with save instance state

Author: PiotrBandurski

.circleci/config.yml

@@ -10,6 +10,9 @@ jobs:
       - checkout
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Create empty local properties
+          command: touch local.properties
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies

README.md

@@ -46,7 +46,7 @@ android {
 dependencies {
 
     // Implement base library
-    implementation project(':mvi-valueadd')
+    implementation project(':mvi')
 
     // Annotation Processor
     kapt deps.di.toothpick_compiler
@@ -82,4 +82,5 @@ dependencies {
     implementation deps.androidx.material
     implementation deps.androidx.multidex
     implementation deps.androidx.annotation
+    implementation "androidx.lifecycle:lifecycle-common:2.2.0"
 }

app/build.gradle

@@ -4,13 +4,26 @@ import android.os.Bundle
 import androidx.annotation.LayoutRes
 import pl.valueadd.mvi.example.utility.dependencyinjection.DependencyUtil
 import pl.valueadd.mvi.fragment.back.BackMviFragment
+import pl.valueadd.mvi.fragment.delegate.fragment.MviFragmentSaveInstanceStateDelegateImpl
 import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
 import pl.valueadd.mvi.fragment.mvi.IBaseView
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
 abstract class AbstractBackMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : IBaseView.IBaseIntent, P : BaseMviPresenter<VS, *, *, V>>(@LayoutRes layoutId: Int) :
     BackMviFragment<V, VS, VI, P>(layoutId) {
 
+    protected val restoredViewState: VS?
+        get() = mviDelegate.restoredViewState
+
+    @Suppress("UNCHECKED_CAST")
+    override val mviDelegate: MviFragmentSaveInstanceStateDelegateImpl<V, VS>
+            by lazy {
+                MviFragmentSaveInstanceStateDelegateImpl(
+                    this as V,
+                    presenter
+                )
+            }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         DependencyUtil.inject(requireActivity(), this)
         super.onCreate(savedInstanceState)

app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBackMviFragment.kt

@@ -4,13 +4,26 @@ import android.os.Bundle
 import androidx.annotation.LayoutRes
 import pl.valueadd.mvi.example.utility.dependencyinjection.DependencyUtil
 import pl.valueadd.mvi.fragment.base.BaseMviFragment
+import pl.valueadd.mvi.fragment.delegate.fragment.MviFragmentSaveInstanceStateDelegateImpl
 import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
 import pl.valueadd.mvi.fragment.mvi.IBaseView
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
 abstract class AbstractBaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : IBaseView.IBaseIntent, P : BaseMviPresenter<VS, *, *, V>>(@LayoutRes layoutId: Int) :
     BaseMviFragment<V, VS, VI, P>(layoutId) {
 
+    protected val restoredViewState: VS?
+        get() = mviDelegate.restoredViewState
+
+    @Suppress("UNCHECKED_CAST")
+    override val mviDelegate: MviFragmentSaveInstanceStateDelegateImpl<V, VS>
+            by lazy {
+                MviFragmentSaveInstanceStateDelegateImpl(
+                    this as V,
+                    presenter
+                )
+            }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         DependencyUtil.inject(requireActivity(), this)
         super.onCreate(savedInstanceState)

app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBaseMviFragment.kt

@@ -24,8 +24,6 @@ class FirstFragment :
     @Inject
     override lateinit var presenter: FirstPresenter
 
-    override val shouldSaveViewStateInSavedInstanceState = true
-
     private val buttonDelay
         by lazy { resources.getInteger(R.integer.button_delay_100).toLong() }
 

app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstFragment.kt

@@ -9,7 +9,9 @@ buildscript {
     dependencies {
         classpath deps.build.android_gradle_plugin
         classpath deps.build.kotlin_gradle_plugin
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.3.2.0"
+        classpath deps.build.junit5_runner
+        classpath deps.build.android_maven
+        classpath deps.build.bintray
     }
 }
 

build.gradle

@@ -63,6 +63,9 @@ versions.fragmentation = "1.0.1"
 versions.material_progress_bar = "1.6.1"
 versions.fast_adapter = "4.0.1"
 versions.mockk = "1.9.3"
+versions.junit5_runner = "1.3.2.0"
+versions.android_maven = "1.4.1"
+versions.bintray = "1.7.3"
 deps.versions = versions
 ext.versions = versions
 
@@ -75,6 +78,9 @@ build.fabric = "io.fabric.tools:gradle:$versions.fabric"
 build.google_services_plugin = "com.google.gms:google-services:$versions.google_plugin"
 build.kotlin_gradle_plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
 build.realm_gradle_plugin = "io.realm:realm-gradle-plugin:$versions.realm"
+build.junit5_runner = "de.mannodermaus.gradle.plugins:android-junit5:$versions.junit5_runner"
+build.android_maven = "com.github.dcendents:android-maven-gradle-plugin:$versions.android_maven"
+build.bintray =  "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.bintray"
 deps.build = build
 
 /**