bug fix navigation

app/build.gradle

@@ -62,6 +62,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(':utils')
-    implementation project(':feature_showperson')
     implementation project(':feature_splash')
 }

app/src/main/java/com/mrozon/healthdiary/navigation/SplashNavigatorImpl.kt

@@ -2,11 +2,10 @@ package com.mrozon.healthdiary.navigation
 
 import com.mrozon.core_api.navigation.SplashNavigator
 import com.mrozon.healthdiary.R
-import com.mrozon.utils.base.BaseNavigator
 import javax.inject.Inject
 
 class SplashNavigatorImpl @Inject constructor()
-    : SplashNavigator, BaseNavigator() {
+    : SplashNavigator {
 
 //    override fun navigateToGameVideo() {
 //        navController?.navigate(R.id.action_gameListFragment_to_gameVideoFragment)

app/src/main/java/com/mrozon/healthdiary/presentation/main/MainActivityViewModel.kt

@@ -1,6 +1,7 @@
 package com.mrozon.healthdiary.presentation.main
 
+import androidx.lifecycle.ViewModel
 import com.mrozon.utils.base.BaseViewModel
 import javax.inject.Inject
 
-class MainActivityViewModel @Inject constructor(): com.mrozon.utils.base.BaseViewModel()
+class MainActivityViewModel @Inject constructor(): ViewModel()

core_api/src/main/java/com/mrozon/core_api/navigation/SplashNavigator.kt

@@ -1,7 +1,6 @@
 package com.mrozon.core_api.navigation
 
-import com.mrozon.utils.base.Navigator
 
-interface SplashNavigator : Navigator {
+interface SplashNavigator {
 
 }

core_api/src/main/java/com/mrozon/core_api/providers/ProvidersFacade.kt

@@ -1,6 +1,7 @@
 package com.mrozon.core_api.providers
 
 import com.mrozon.core_api.db.DatabaseProvider
+import com.mrozon.core_api.navigation.NavigatorProvider
 import com.mrozon.core_api.network.NetworkProvider
 
-interface ProvidersFacade : NetworkProvider, DatabaseProvider, AppProvider
+interface ProvidersFacade : NetworkProvider, DatabaseProvider, AppProvider, NavigatorProvider

feature_splash/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     implementation constraintlayout
     //Timber
     implementation timber
+    implementation navigationFragment
 
 //    implementation 'androidx.core:core-ktx:1.3.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

feature_splash/src/main/java/com/mrozon/feature_splash/di/SplashFragmentComponent.kt

@@ -1,5 +1,6 @@
 package com.mrozon.feature_splash.di
 
+import com.mrozon.core_api.navigation.SplashNavigator
 import com.mrozon.core_api.providers.AppWithFacade
 import com.mrozon.core_api.providers.ProvidersFacade
 import com.mrozon.core_api.viewmodel.ViewModelsFactoryProvider
@@ -9,7 +10,7 @@ import dagger.Component
 //@Singleton
 @Component(
     modules = [SplashFragmentModule::class],
-    dependencies = [ProvidersFacade::class]
+    dependencies = [SplashNavigator::class]
 )
 interface SplashFragmentComponent: ViewModelsFactoryProvider {
 
@@ -17,7 +18,8 @@ interface SplashFragmentComponent: ViewModelsFactoryProvider {
 
         fun create(providersFacade: ProvidersFacade): SplashFragmentComponent {
             return DaggerSplashFragmentComponent.builder()
-                .providersFacade(providersFacade)
+                .splashNavigator(providersFacade.provideSplashNavigator())
+//                .providersFacade(providersFacade)
                 .build()
         }
 

feature_splash/src/main/java/com/mrozon/feature_splash/presentation/SplashFragment.kt

@@ -33,4 +33,7 @@ class SplashFragment : BaseFragment<FragmentSplashBinding>() {
         SplashFragmentComponent.injectFragment(this)
     }
 
+
+
+
 }

feature_splash/src/main/java/com/mrozon/feature_splash/presentation/SplashFragmentViewModel.kt

@@ -1,5 +1,6 @@
 package com.mrozon.feature_splash.presentation
 
+import com.mrozon.core_api.navigation.SplashNavigator
 import com.mrozon.utils.base.BaseViewModel
 import timber.log.Timber
 import javax.inject.Inject

settings.gradle

@@ -4,5 +4,4 @@ include ':utils'
 include ':core_api'
 include ':core_impl'
 include ':core'
-include ':feature_showperson'
 include ':feature_splash'

utils/build.gradle

@@ -39,6 +39,7 @@ apply from: "$project.rootDir/scripts/deps_versions.gradle"
 
 dependencies {
 
+    implementation navigationFragment
     implementation navigationUi
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 

utils/src/main/java/com/mrozon/utils/base/BaseFragment.kt

@@ -10,6 +10,8 @@ import androidx.annotation.LayoutRes
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
+import androidx.navigation.Navigation.findNavController
+import androidx.navigation.fragment.NavHostFragment
 
 abstract class BaseFragment<T : ViewDataBinding>: Fragment(),
     ViewTreeObserver.OnGlobalLayoutListener {
@@ -46,5 +48,4 @@ abstract class BaseFragment<T : ViewDataBinding>: Fragment(),
         }
         return rootView
     }
-
 }

utils/src/main/java/com/mrozon/utils/base/BaseNavigator.kt

@@ -1,9 +0,0 @@
-package com.mrozon.utils.base
-
-import androidx.navigation.NavController
-
-abstract class BaseNavigator : Navigator {
-
-    override var navController: NavController? = null
-
-}

utils/src/main/java/com/mrozon/utils/base/BaseViewModel.kt

@@ -2,7 +2,7 @@ package com.mrozon.utils.base
 
 import androidx.lifecycle.ViewModel
 
-abstract class BaseViewModel: ViewModel() {
+abstract class BaseViewModel(): ViewModel() {
 //    private var compositeDisposable: CompositeDisposable = CompositeDisposable()
 //
 //    override fun onCleared() {

utils/src/main/java/com/mrozon/utils/base/Navigator.kt

@@ -1,15 +0,0 @@
-package com.mrozon.utils.base
-
-import androidx.navigation.NavController
-
-interface Navigator {
-    var navController: NavController?
-
-    fun bind(navController: NavController) {
-        this.navController = navController
-    }
-
-    fun unbind() {
-        this.navController = null
-    }
-}