NavActions added

Author: Kirito398

app/src/main/java/ru/bis/basearchitectureexample/ui/MainActivity.kt

@@ -2,7 +2,7 @@ package ru.bis.basearchitectureexample.ui
 
 import androidx.navigation.findNavController
 import ru.bis.basearchitectureexample.R
-import ru.bis.example1.ui.fragments.Example1
+import ru.bis.example1.ui.fragments.NavActions
 import ru.sir.presentation.base.BaseActivity
 import ru.sir.presentation.navigation.UiAction
 
@@ -11,8 +11,8 @@ class MainActivity : BaseActivity() {
     override fun getNavController() = findNavController(R.id.navHostFragment)
 
     override fun navigateTo(action: UiAction) {
-        when(action.action) {
-            Example1.ACTION_OPEN_EXAMPLE_2 -> { navigator.navigate(R.id.example2) }
+        when(action.id) {
+            NavActions.OPEN_EXAMPLE_2 -> { navigator.navigate(R.id.example2) }
         }
     }
 }

deps/deps_versions.gradle

@@ -21,6 +21,7 @@ ext {
     circleImageViewVersion = '3.1.0'
     mpAndroidChartVersion = 'v3.1.0'
     lifecycleVersion = '1.1.0'
+    navigationVersion = '2.3.4'
 
     //Lifecycle
     lifecycleExtensions = "android.arch.lifecycle:extensions:$lifecycleVersion"
@@ -75,6 +76,10 @@ ext {
     //Coagent
     coagent = files("$rootDir/libs/coagentproxy.jar")
 
+    //Navigation Component
+    navigationFragment = "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
+    navigationUi = "androidx.navigation:navigation-ui-ktx:$navigationVersion"
+
     //Other
     circularProgressBar = "com.mikhaellopez:circularprogressbar:$circularProgressBarVersion"
     speedView = "com.github.anastr:speedviewlib:$speedViewVersion"

entities/presentation/build.gradle

@@ -50,8 +50,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
 
-    api 'androidx.navigation:navigation-fragment-ktx:2.3.4'
-    api 'androidx.navigation:navigation-ui-ktx:2.3.4'
+    api navigationFragment
+    api navigationUi
 
     implementation lifecycleExtensions
     annotationProcessor lifecycleCompiler

entities/presentation/src/main/java/ru/sir/presentation/base/BaseFragment.kt

@@ -13,6 +13,7 @@ import javax.inject.Inject
 abstract class BaseFragment<T : BaseViewModel, B : ViewBinding>(private val type: Class<out T>) : Fragment() {
     protected lateinit var viewModel: T
     protected lateinit var binding: B
+    protected lateinit var navigator: BaseActivity
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -28,6 +29,8 @@ abstract class BaseFragment<T : BaseViewModel, B : ViewBinding>(private val type
 
         binding = initBinding(inflater, container, savedInstanceState)
         viewModel.init()
+
+        navigator = requireActivity() as BaseActivity
         return binding.root
     }
 

entities/presentation/src/main/java/ru/sir/presentation/navigation/UiAction.kt

@@ -3,6 +3,6 @@ package ru.sir.presentation.navigation
 import android.os.Bundle
 
 data class UiAction(
-    val action: String,
+    val id: String,
     val data: Bundle? = null
 )

features/example1/src/main/java/ru/bis/example1/ui/fragments/Example1.kt

@@ -5,17 +5,13 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import ru.bis.example1.databinding.FragmentExample1Binding
 import ru.bis.example1.di.components.Example1Component
+import ru.bis.example1.ui.fragments.NavActions.OPEN_EXAMPLE_2
 import ru.bis.example1.view_models.Example1ViewModel
-import ru.sir.presentation.base.BaseActivity
 import ru.sir.presentation.base.BaseApplication
 import ru.sir.presentation.base.BaseFragment
 import ru.sir.presentation.navigation.UiAction
 
 class Example1 : BaseFragment<Example1ViewModel, FragmentExample1Binding>(Example1ViewModel::class.java) {
-    companion object {
-        const val ACTION_OPEN_EXAMPLE_2 = "action_open_example_2"
-    }
-
     override fun inject(app: BaseApplication) {
         app.getComponent<Example1Component>().inject(this)
     }
@@ -27,7 +23,7 @@ class Example1 : BaseFragment<Example1ViewModel, FragmentExample1Binding>(Exampl
 
     override fun setListeners() {
         binding.nextBtn.setOnClickListener {
-            (requireActivity() as BaseActivity).navigateTo(UiAction(ACTION_OPEN_EXAMPLE_2))
+            navigator.navigateTo(UiAction(OPEN_EXAMPLE_2))
         }
     }
 }

features/example1/src/main/java/ru/bis/example1/ui/fragments/NavActions.kt

@@ -0,0 +1,5 @@
+package ru.bis.example1.ui.fragments
+
+object NavActions {
+    const val OPEN_EXAMPLE_2 = "action_open_example_2"
+}