diff --git a/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationActivity.kt b/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationActivity.kt index 6277153..c83d378 100644 --- a/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationActivity.kt +++ b/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationActivity.kt @@ -15,6 +15,9 @@ abstract class BottomNavigationActivity : NavigationActivity() { val innerNavigation: ViewControllerNavigation get() = getNavigationContainer(supportFragmentManager)?.navigation ?: navigation as ViewControllerNavigation + fun navigateTo(@IdRes navigationTabId: Int, state: Parcelable? = null) = + (supportFragmentManager.primaryNavigationFragment as? BottomNavigationFragment)?.navigateTo(navigationTabId, state) + private fun getNavigationContainer(fragmentManager: FragmentManager?): NavigationContainerFragment? = fragmentManager ?.primaryNavigationFragment @@ -23,7 +26,4 @@ abstract class BottomNavigationActivity : NavigationActivity() { ?: getNavigationContainer(navigationFragment.childFragmentManager) } - fun navigateTo(@IdRes navigationTabId: Int, state: Parcelable? = null) = - (supportFragmentManager.primaryNavigationFragment as? BottomNavigationFragment)?.navigateTo(navigationTabId, state) - } diff --git a/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationFragment.kt b/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationFragment.kt index debc3a7..fc659a9 100644 --- a/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationFragment.kt +++ b/tabbar-navigation/src/main/java/ru/touchin/roboswag/components/tabbarnavigation/BottomNavigationFragment.kt @@ -66,10 +66,10 @@ abstract class BottomNavigationFragment : Fragment() { bottomNavigationController.detach() } - private fun getNavigationActivity() = requireActivity() as BottomNavigationActivity - fun navigateTo(@IdRes navigationTabId: Int, state: Parcelable? = null) { bottomNavigationController.navigateTo(navigationTabId, state) } + private fun getNavigationActivity() = requireActivity() as BottomNavigationActivity + }