Merge pull request #12 from valueadd-poland/feature/handle_saved_instance

arkadiuszpalka · web-flow · commit 397d72b3923c · 2020-02-14T10:01:07.000+01:00
Feature/handle saved instance
diff --git a/app/build.gradle b/app/build.gradle
@@ -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"
 }
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBackMviFragment.kt b/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.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)
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBaseMviFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBaseMviFragment.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)
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutFragment.kt
@@ -23,8 +23,12 @@ class AboutFragment :
         R.string.about_title
 
     override fun render(state: AboutViewState) {
-        // TODO("not implemented")
+        // no-op
     }
 
     override fun provideViewIntents(): List<Observable<IBaseView.IBaseIntent>> = listOf()
+
+    override fun provideInitialViewState(): AboutViewState {
+        return restoredViewState ?: AboutViewState()
+    }
 }
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutPresenter.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutPresenter.kt
@@ -6,9 +6,7 @@ import pl.valueadd.mvi.fragment.mvi.IBaseView
 import javax.inject.Inject
 
 class AboutPresenter @Inject constructor() :
-    BaseMviPresenter<AboutViewState, AboutViewState.PartialState, IBaseView.IBaseIntent, AboutView>(
-        AboutViewState()
-    ) {
+    BaseMviPresenter<AboutViewState, AboutViewState.PartialState, IBaseView.IBaseIntent, AboutView>() {
 
     override fun reduce(
         previousState: AboutViewState,
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutViewState.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutViewState.kt
@@ -1,8 +1,10 @@
 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 {
 
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountFragment.kt
@@ -39,6 +39,10 @@ class AccountFragment :
         destroyViewIntent
     )
 
+    override fun provideInitialViewState(): AccountViewState {
+        return restoredViewState ?: AccountViewState()
+    }
+
     private fun provideDestroyViewIntent(): AccountView.Intent =
         AccountView.Intent.OnDestroyView(
             firstNameText.text.toString(),
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountPresenter.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountPresenter.kt
@@ -5,9 +5,7 @@ import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor() :
-    BaseMviPresenter<AccountViewState, AccountViewState.PartialState, AccountView.Intent, AccountView>(
-        AccountViewState()
-    ) {
+    BaseMviPresenter<AccountViewState, AccountViewState.PartialState, AccountView.Intent, AccountView>() {
 
     override fun reduce(
         previousState: AccountViewState,
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountViewState.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountViewState.kt
@@ -1,9 +1,11 @@
 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,
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstFragment.kt
@@ -32,6 +32,10 @@ class FirstFragment :
         initializeListeners()
     }
 
+    override fun provideInitialViewState(): FirstViewState {
+        return restoredViewState ?: FirstViewState()
+    }
+
     override fun navigateToAboutView() {
         val fragment = AboutFragment.createInstance()
 
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstPresenter.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstPresenter.kt
@@ -8,9 +8,7 @@ import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class FirstPresenter @Inject constructor() : BaseMviPresenter<FirstViewState, FirstViewState.PartialState, FirstView.Intent, FirstView>(
-    FirstViewState()
-) {
+class FirstPresenter @Inject constructor() : BaseMviPresenter<FirstViewState, FirstViewState.PartialState, FirstView.Intent, FirstView>() {
     companion object {
         private const val PROCESING_DELAY = 5L
     }
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstViewState.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/first/FirstViewState.kt
@@ -1,10 +1,12 @@
 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,
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootFragment.kt
@@ -77,6 +77,10 @@ class RootFragment :
 
     override fun provideViewIntents(): List<Observable<IBaseView.IBaseIntent>> = listOf()
 
+    override fun provideInitialViewState(): RootViewState {
+        return restoredViewState ?: RootViewState()
+    }
+
     private fun navigateToAccountView() {
 
         val fragment = AccountFragment.createInstance()
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootPresenter.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootPresenter.kt
@@ -6,9 +6,7 @@ import pl.valueadd.mvi.fragment.mvi.IBaseView
 import javax.inject.Inject
 
 class RootPresenter
-@Inject constructor() : BaseMviPresenter<RootViewState, RootViewState.PartialState, IBaseView.IBaseIntent, RootView>(
-    RootViewState()
-) {
+@Inject constructor() : BaseMviPresenter<RootViewState, RootViewState.PartialState, IBaseView.IBaseIntent, RootView>() {
 
     override fun mapViewIntentToPartialState(viewIntent: IBaseView.IBaseIntent): Observable<out RootViewState.PartialState> =
         Observable.never()
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootViewState.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/root/RootViewState.kt
@@ -1,8 +1,10 @@
 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 {
 
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondFragment.kt
@@ -42,6 +42,10 @@ class SecondFragment : AbstractBaseMviFragment<SecondView, SecondViewState, IBas
 
     override fun provideViewIntents(): List<Observable<IBaseView.IBaseIntent>> = listOf()
 
+    override fun provideInitialViewState(): SecondViewState {
+        return restoredViewState ?: SecondViewState()
+    }
+
     private fun bindDataToList(list: List<IItem<*>>) {
         listAdapter.setNewList(list)
     }
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondPresenter.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondPresenter.kt
@@ -7,9 +7,7 @@ import pl.valueadd.mvi.fragment.mvi.IBaseView
 import javax.inject.Inject
 
 class SecondPresenter
-@Inject constructor() : BaseMviPresenter<SecondViewState, SecondViewState.PartialState, IBaseView.IBaseIntent, SecondView>(
-    SecondViewState()
-) {
+@Inject constructor() : BaseMviPresenter<SecondViewState, SecondViewState.PartialState, IBaseView.IBaseIntent, SecondView>() {
 
     override fun reduce(
         previousState: SecondViewState,
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondViewState.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/second/SecondViewState.kt
@@ -1,10 +1,12 @@
 package pl.valueadd.mvi.example.presentation.main.second
 
+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
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdFragment.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdFragment.kt
@@ -50,4 +50,8 @@ class ThirdFragment : AbstractBaseMviFragment<ThirdView, ThirdViewState, IBaseVi
     }
 
     override fun provideViewIntents(): List<Observable<IBaseView.IBaseIntent>> = listOf()
+
+    override fun provideInitialViewState(): ThirdViewState {
+        return restoredViewState ?: ThirdViewState()
+    }
 }
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdPresenter.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdPresenter.kt
@@ -6,9 +6,7 @@ import pl.valueadd.mvi.fragment.mvi.IBaseView
 import javax.inject.Inject
 
 class ThirdPresenter @Inject constructor() :
-    BaseMviPresenter<ThirdViewState, ThirdViewState.PartialState, IBaseView.IBaseIntent, ThirdView>(
-        ThirdViewState()
-    ) {
+    BaseMviPresenter<ThirdViewState, ThirdViewState.PartialState, IBaseView.IBaseIntent, ThirdView>() {
 
     override fun reduce(
         previousState: ThirdViewState,
diff --git a/app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdViewState.kt b/app/src/main/java/pl/valueadd/mvi/example/presentation/main/third/ThirdViewState.kt
@@ -1,8 +1,10 @@
 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 {
 
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/base/BaseMviFragment.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/base/BaseMviFragment.kt
@@ -26,11 +26,9 @@ abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : I
     protected var disposables: CompositeDisposable =
         CompositeDisposable()
 
-    private val mviDelegate: MviFragmentDelegate
-        by lazy {
-            @Suppress("UNCHECKED_CAST")
-            MviFragmentDelegateImpl(this as V, presenter)
-        }
+    @Suppress("UNCHECKED_CAST")
+    protected open val mviDelegate: MviFragmentDelegate
+            by lazy { MviFragmentDelegateImpl(this as V, presenter) }
 
     /* IBaseView */
 
@@ -48,6 +46,11 @@ abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : I
 
     /* Life cycle */
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mviDelegate.onCreate(savedInstanceState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         disposables = CompositeDisposable()
@@ -63,6 +66,11 @@ abstract class BaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : I
         mviDelegate.onStop()
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mviDelegate.onSaveInstanceState(outState)
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         dispose()
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentDelegate.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentDelegate.kt
@@ -1,7 +1,13 @@
 package pl.valueadd.mvi.fragment.delegate.fragment
 
+import android.os.Bundle
+
 interface MviFragmentDelegate {
 
+    fun onCreate(savedInstanceState: Bundle?)
+
+    fun onSaveInstanceState(outState: Bundle)
+
     fun onStart()
 
     fun onStop()
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentDelegateImpl.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentDelegateImpl.kt
@@ -1,13 +1,27 @@
 package pl.valueadd.mvi.fragment.delegate.fragment
 
+import android.os.Bundle
 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>
+/**
+ * Minimal implementation of contract between fragment and presenter.
+ *
+ * This API requires call every fragment's lifecycle callback event defined at [MviFragmentDelegate].
+ */
+open class MviFragmentDelegateImpl<V : IBaseView<*, *>>(
+    protected val fragment: V,
+    protected val presenter: BaseMviPresenter<*, *, *, V>
 ) : MviFragmentDelegate {
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // no-op
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        // no-op
+    }
+
     override fun onStart() {
         presenter.attachView(fragment)
     }
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentSaveInstanceStateDelegate.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentSaveInstanceStateDelegate.kt
@@ -0,0 +1,8 @@
+package pl.valueadd.mvi.fragment.delegate.fragment
+
+import pl.valueadd.mvi.fragment.mvi.IBaseViewState
+
+interface MviFragmentSaveInstanceStateDelegate<VS : IBaseViewState> {
+
+    val restoredViewState: VS?
+}
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentSaveInstanceStateDelegateImpl.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/delegate/fragment/MviFragmentSaveInstanceStateDelegateImpl.kt
@@ -0,0 +1,38 @@
+package pl.valueadd.mvi.fragment.delegate.fragment
+
+import android.os.Bundle
+import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
+import pl.valueadd.mvi.fragment.mvi.IBaseView
+import pl.valueadd.mvi.fragment.mvi.IBaseViewState
+
+/**
+ * Extended [implementation][MviFragmentDelegateImpl] of fragment's MVI which handles
+ * that state can be restored after killing process by system.
+ *
+ * @see MviFragmentDelegateImpl
+ */
+class MviFragmentSaveInstanceStateDelegateImpl<V : IBaseView<VS, *>, VS : IBaseViewState>(
+    fragment: V,
+    presenter: BaseMviPresenter<VS, *, *, V>
+) : MviFragmentDelegateImpl<V>(fragment, presenter),
+    MviFragmentSaveInstanceStateDelegate<VS> {
+
+    companion object {
+        private const val VIEW_STATE_BUNDLE_KEY = "VIEW_STATE_BUNDLE_KEY"
+    }
+
+    override var restoredViewState: VS? = null
+        private set
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        this.restoredViewState =
+            savedInstanceState?.getParcelable(VIEW_STATE_BUNDLE_KEY)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putParcelable(
+            VIEW_STATE_BUNDLE_KEY,
+            presenter.currentState
+        )
+    }
+}
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/mvi/BaseMviPresenter.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/mvi/BaseMviPresenter.kt
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/mvi/IBaseView.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/mvi/IBaseView.kt
diff --git a/mvi/src/main/java/pl/valueadd/mvi/fragment/mvi/IBaseViewState.kt b/mvi/src/main/java/pl/valueadd/mvi/fragment/mvi/IBaseViewState.kt
diff --git a/mvi/src/test/java/pl/valueadd/mvi/fragment/base/BaseMviFragmentTest.kt b/mvi/src/test/java/pl/valueadd/mvi/fragment/base/BaseMviFragmentTest.kt
diff --git a/mvi/src/test/java/pl/valueadd/mvi/fragment/mvi/BaseMviPresenterTest.kt b/mvi/src/test/java/pl/valueadd/mvi/fragment/mvi/BaseMviPresenterTest.kt

Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,5 @@ dependencies {`
`82`	`82`	`implementation deps.androidx.material`
`83`	`83`	`implementation deps.androidx.multidex`
`84`	`84`	`implementation deps.androidx.annotation`
	`85`	`+ implementation "androidx.lifecycle:lifecycle-common:2.2.0"`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,12 @@ class AboutFragment :`
`23`	`23`	`R.string.about_title`
`24`	`24`
`25`	`25`	`override fun render(state: AboutViewState) {`
`26`		`- // TODO("not implemented")`
	`26`	`+ // no-op`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`override fun provideViewIntents(): List<Observable<IBaseView.IBaseIntent>> = listOf()`
	`30`	`+`
	`31`	`+ override fun provideInitialViewState(): AboutViewState {`
	`32`	`+ return restoredViewState ?: AboutViewState()`
	`33`	`+ }`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ class FirstFragment :`
`32`	`32`	`initializeListeners()`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ override fun provideInitialViewState(): FirstViewState {`
	`36`	`+ return restoredViewState ?: FirstViewState()`
	`37`	`+ }`
	`38`	`+`
`35`	`39`	`override fun navigateToAboutView() {`
`36`	`40`	`val fragment = AboutFragment.createInstance()`
`37`	`41`