feat(mvi) Removed deprecated back fragment

Author: PiotrBandurskiVA

app/build.gradle

@@ -14,6 +14,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
     defaultConfig {
         applicationId "pl.valueadd.mvi"
         minSdkVersion deps.build_version.min_sdk
@@ -88,5 +92,5 @@ dependencies {
     implementation deps.androidx.nav_runtime
     implementation deps.androidx.nav_fragment
     implementation deps.androidx.nav_ui_ktx
-    implementation "androidx.lifecycle:lifecycle-common:2.2.0"
+    implementation deps.lifecycle.commons
 }

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

@@ -1,6 +1,10 @@
 package pl.valueadd.mvi.example.presentation.base
 
 import android.os.Bundle
+import androidx.appcompat.widget.Toolbar
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupWithNavController
 import androidx.viewbinding.ViewBinding
 import pl.valueadd.mvi.IBaseViewState
 import pl.valueadd.mvi.example.utility.dependencyinjection.DependencyUtil
@@ -28,4 +32,10 @@ abstract class AbstractBaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState
         DependencyUtil.inject(requireActivity(), this)
         super.onCreate(savedInstanceState)
     }
+
+    protected fun Toolbar.setupWithNavController(appBarConfiguration: AppBarConfiguration? = null) {
+        val navController = findNavController()
+        val configuration = appBarConfiguration ?: AppBarConfiguration(navController.graph)
+        setupWithNavController(navController, configuration)
+    }
 }

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

@@ -1,24 +1,19 @@
 package pl.valueadd.mvi.example.presentation.main.about
 
-import androidx.appcompat.widget.Toolbar
+import android.os.Bundle
+import android.view.View
 import io.reactivex.Observable
 import pl.valueadd.mvi.example.R
 import pl.valueadd.mvi.example.databinding.FragmentAboutBinding
-import pl.valueadd.mvi.example.presentation.base.AbstractBackMviFragment
+import pl.valueadd.mvi.example.presentation.base.AbstractBaseMviFragment
 import pl.valueadd.mvi.fragment.base.FragmentBindingInflater
 import pl.valueadd.mvi.presenter.IBaseView
 import javax.inject.Inject
 
 class AboutFragment :
-    AbstractBackMviFragment<AboutView, AboutViewState, IBaseView.IBaseIntent, AboutPresenter, FragmentAboutBinding>(),
+    AbstractBaseMviFragment<AboutView, AboutViewState, IBaseView.IBaseIntent, AboutPresenter, FragmentAboutBinding>(),
     AboutView {
 
-    override val navigationIcon: Int
-        get() = R.drawable.ic_arrow_back_white_24dp
-
-    override val toolbarNavigation: Toolbar
-        get() = requireBinding.baseAppBarLayout.baseToolbar
-
     override val bindingInflater: FragmentBindingInflater<FragmentAboutBinding>
         get() = FragmentAboutBinding::inflate
 
@@ -31,8 +26,15 @@ class AboutFragment :
     @Inject
     override lateinit var presenter: AboutPresenter
 
-    override val titleRes: Int =
-        R.string.about_title
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar()
+    }
+
+    private fun setupToolbar() = with(requireBinding.baseAppBarLayout.baseToolbar) {
+        setTitle(R.string.about_title)
+        setupWithNavController()
+    }
 
     override fun render(state: AboutViewState) {
         // no-op

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

@@ -1,37 +1,39 @@
 package pl.valueadd.mvi.example.presentation.main.account
 
-import androidx.appcompat.widget.Toolbar
+import android.os.Bundle
+import android.view.View
 import io.reactivex.Observable
 import pl.valueadd.mvi.example.R
 import pl.valueadd.mvi.example.databinding.FragmentAccountBinding
-import pl.valueadd.mvi.example.presentation.base.AbstractBackMviFragment
+import pl.valueadd.mvi.example.presentation.base.AbstractBaseMviFragment
 import pl.valueadd.mvi.example.utility.extension.applyTextChanges
 import pl.valueadd.mvi.fragment.base.FragmentBindingInflater
 import pl.valueadd.mvi.fragment.delegate.destroyview.DestroyViewIntentDelegate
 import javax.inject.Inject
 
 class AccountFragment :
-    AbstractBackMviFragment<AccountView, AccountViewState, AccountView.Intent, AccountPresenter, FragmentAccountBinding>(),
+    AbstractBaseMviFragment<AccountView, AccountViewState, AccountView.Intent, AccountPresenter, FragmentAccountBinding>(),
     AccountView {
 
     @Inject
     override lateinit var presenter: AccountPresenter
 
-    override val navigationIcon: Int
-        get() = R.drawable.ic_arrow_back_white_24dp
-
-    override val toolbarNavigation: Toolbar
-        get() = requireBinding.baseAppBarLayout.baseToolbar
-
     override val bindingInflater: FragmentBindingInflater<FragmentAccountBinding>
         get() = FragmentAccountBinding::inflate
 
-    override val titleRes: Int =
-        R.string.account_title
-
     private val destroyViewIntent
             by DestroyViewIntentDelegate(this, ::provideDestroyViewIntent)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar()
+    }
+
+    private fun setupToolbar() = with(requireBinding.baseAppBarLayout.baseToolbar) {
+        setTitle(R.string.account_title)
+        setupWithNavController()
+    }
+
     override fun render(state: AccountViewState): Unit = with(requireBinding) {
         firstNameText.applyTextChanges(state.firstName)
         surnameText.applyTextChanges(state.surname)
@@ -53,10 +55,4 @@ class AccountFragment :
             emailText.text.toString()
         )
     }
-
-    companion object {
-
-        fun createInstance(): AccountFragment =
-            AccountFragment()
-    }
 }

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

@@ -69,9 +69,4 @@ class FirstFragment :
             .throttleClicks()
             .onSuccess(disposables, { navigateToAboutView() })
     }
-
-    companion object {
-        fun createInstance(): FirstFragment =
-            FirstFragment()
-    }
 }

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

@@ -10,7 +10,7 @@ import javax.inject.Inject
 
 class FirstPresenter @Inject constructor() : AbstractPresenter<FirstViewState, FirstViewState.PartialState, FirstView.Intent, FirstView>() {
     companion object {
-        private const val PROCESING_DELAY = 5L
+        private const val PROCESSING_DELAY = 5L
     }
 
     override fun mapViewIntentToPartialState(viewIntent: FirstView.Intent): Observable<out FirstViewState.PartialState> =
@@ -46,7 +46,7 @@ class FirstPresenter @Inject constructor() : AbstractPresenter<FirstViewState, F
         return Observable
             .just(currentState.count)
             .doOnNext { Log.d("MVI-FirstPresenter", "processData") }
-            .delay(PROCESING_DELAY, TimeUnit.SECONDS)
+            .delay(PROCESSING_DELAY, TimeUnit.SECONDS)
             .map { count -> FirstViewState.PartialState.ProcessDataSuccess("$count%") }
     }
 }

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

@@ -5,7 +5,6 @@ import android.view.View
 import com.mikepenz.fastadapter.IItem
 import com.mikepenz.fastadapter.adapters.FastItemAdapter
 import io.reactivex.Observable
-import pl.valueadd.mvi.example.R
 import pl.valueadd.mvi.example.databinding.FragmentSecondBinding
 import pl.valueadd.mvi.example.presentation.base.AbstractBaseMviFragment
 import pl.valueadd.mvi.fragment.base.FragmentBindingInflater
@@ -51,9 +50,4 @@ class SecondFragment : AbstractBaseMviFragment<SecondView, SecondViewState, IBas
     private fun setupView(): Unit = with(requireBinding) {
         recyclerView.adapter = listAdapter
     }
-
-    companion object {
-        fun createInstance(): SecondFragment =
-            SecondFragment()
-    }
 }

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

@@ -13,7 +13,8 @@ import pl.valueadd.mvi.fragment.base.FragmentBindingInflater
 import pl.valueadd.mvi.presenter.IBaseView
 import javax.inject.Inject
 
-class ThirdFragment : AbstractBaseMviFragment<ThirdView, ThirdViewState, IBaseView.IBaseIntent, ThirdPresenter, FragmentThirdBinding>(),
+class ThirdFragment :
+    AbstractBaseMviFragment<ThirdView, ThirdViewState, IBaseView.IBaseIntent, ThirdPresenter, FragmentThirdBinding>(),
     ThirdView {
 
     @Inject
@@ -33,7 +34,7 @@ class ThirdFragment : AbstractBaseMviFragment<ThirdView, ThirdViewState, IBaseVi
     }
 
     private fun bindListeners() {
-       requireBinding.aboutButton
+        requireBinding.aboutButton
             .throttleClicks()
             .onSuccess(disposables, { navigateToAboutView() })
     }
@@ -47,10 +48,4 @@ class ThirdFragment : AbstractBaseMviFragment<ThirdView, ThirdViewState, IBaseVi
     override fun provideInitialViewState(): ThirdViewState {
         return restoredViewState ?: ThirdViewState()
     }
-
-    companion object {
-
-        fun createInstance(): ThirdFragment =
-            ThirdFragment()
-    }
 }