Merge pull request #10 from valueadd-poland/feature/MVI-2-delegation

Feature/mvi 2 delegation

Author: arkadiuszpalka

app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutViewState.kt

@@ -1,10 +1,8 @@
 package pl.valueadd.mvi.example.presentation.main.about
 
-import kotlinx.android.parcel.Parcelize
 import pl.valueadd.mvi.fragment.mvi.IBasePartialState
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
-@Parcelize
 class AboutViewState :
     IBaseViewState {
 

app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountViewState.kt

@@ -1,11 +1,9 @@
 package pl.valueadd.mvi.example.presentation.main.account
 
-import kotlinx.android.parcel.Parcelize
 import org.apache.commons.lang3.StringUtils
 import pl.valueadd.mvi.fragment.mvi.IBasePartialState
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
-@Parcelize
 data class AccountViewState(
     var firstName: String = StringUtils.EMPTY,
     var surname: String = StringUtils.EMPTY,

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

@@ -1,12 +1,10 @@
 package pl.valueadd.mvi.example.presentation.main.first
 
-import kotlinx.android.parcel.Parcelize
 import org.apache.commons.lang3.StringUtils.EMPTY
 import org.apache.commons.lang3.math.NumberUtils.INTEGER_ZERO
 import pl.valueadd.mvi.fragment.mvi.IBasePartialState
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
-@Parcelize
 data class FirstViewState(
     val count: Int = INTEGER_ZERO,
     val error: String = EMPTY,

app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootViewState.kt

@@ -1,10 +1,8 @@
 package pl.valueadd.mvi.example.presentation.main.root
 
-import kotlinx.android.parcel.Parcelize
 import pl.valueadd.mvi.fragment.mvi.IBasePartialState
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
-@Parcelize
 class RootViewState :
     IBaseViewState {
 

app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondViewState.kt

@@ -1,12 +1,10 @@
 package pl.valueadd.mvi.example.presentation.main.second
 
-import pl.valueadd.mvi.example.presentation.main.second.item.ExampleItem
-import kotlinx.android.parcel.Parcelize
 import org.apache.commons.lang3.StringUtils.EMPTY
+import pl.valueadd.mvi.example.presentation.main.second.item.ExampleItem
 import pl.valueadd.mvi.fragment.mvi.IBasePartialState
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
-@Parcelize
 data class SecondViewState(
     val list: List<ExampleItem> = emptyList(),
     val error: String = EMPTY

app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdViewState.kt

@@ -1,10 +1,8 @@
 package pl.valueadd.mvi.example.presentation.main.third
 
-import kotlinx.android.parcel.Parcelize
 import pl.valueadd.mvi.fragment.mvi.IBasePartialState
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
 
-@Parcelize
 class ThirdViewState :
     IBaseViewState {
 

mvi-valueadd/src/main/java/pl/valueadd/mvi/fragment/base/BaseMviFragment.kt

@@ -5,11 +5,12 @@ import android.view.View
 import androidx.annotation.LayoutRes
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
+import pl.valueadd.mvi.fragment.delegate.fragment.MviFragmentDelegate
+import pl.valueadd.mvi.fragment.delegate.fragment.MviFragmentDelegateImpl
 import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
 import pl.valueadd.mvi.fragment.mvi.IBaseView
 import pl.valueadd.mvi.fragment.mvi.IBaseView.IBaseIntent
 import pl.valueadd.mvi.fragment.mvi.IBaseViewState
-import java.util.UUID
 
 abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : IBaseIntent, P : BaseMviPresenter<VS, *, *, V>>(@LayoutRes layoutId: Int) :
     BaseFragment(layoutId),
@@ -25,7 +26,11 @@ abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : I
     protected var disposables: CompositeDisposable =
         CompositeDisposable()
 
-    private val viewStateKey = "ARG_STATE_VIEW_${UUID.randomUUID()}"
+    private val mviDelegate: MviFragmentDelegate
+        by lazy {
+            @Suppress("UNCHECKED_CAST")
+            MviFragmentDelegateImpl(this as V, presenter)
+        }
 
     /* IBaseView */
 
@@ -43,25 +48,19 @@ abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : I
 
     /* Life cycle */
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putParcelable(viewStateKey, presenter.currentState)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         disposables = CompositeDisposable()
     }
 
-    @Suppress("UNCHECKED_CAST")
     override fun onStart() {
         super.onStart()
-        presenter.attachView(this as V)
+        mviDelegate.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        presenter.detachView()
+        mviDelegate.onStop()
     }
 
     override fun onDestroyView() {
@@ -71,6 +70,6 @@ abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : I
 
     override fun onDestroy() {
         super.onDestroy()
-        presenter.destroy()
+        mviDelegate.onDestroy()
     }
 }

mvi-valueadd/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentDelegate.kt

@@ -0,0 +1,10 @@
+package pl.valueadd.mvi.fragment.delegate.fragment
+
+interface MviFragmentDelegate {
+
+    fun onStart()
+
+    fun onStop()
+
+    fun onDestroy()
+}

mvi-valueadd/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentDelegateImpl.kt

@@ -0,0 +1,22 @@
+package pl.valueadd.mvi.fragment.delegate.fragment
+
+import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
+import pl.valueadd.mvi.fragment.mvi.IBaseView
+
+class MviFragmentDelegateImpl<V : IBaseView<*, *>>(
+    private val fragment: V,
+    private val presenter: BaseMviPresenter<*, *, *, V>
+) : MviFragmentDelegate {
+
+    override fun onStart() {
+        presenter.attachView(fragment)
+    }
+
+    override fun onStop() {
+        presenter.detachView()
+    }
+
+    override fun onDestroy() {
+        presenter.destroy()
+    }
+}

mvi-valueadd/src/main/java/pl/valueadd/mvi/fragment/mvi/IBaseViewState.kt

@@ -1,5 +1,3 @@
 package pl.valueadd.mvi.fragment.mvi
 
-import android.os.Parcelable
-
-interface IBaseViewState : Parcelable
+interface IBaseViewState