From 4229b2b9c8f2e7abfe8313a3d3fa43766d5f1c5e Mon Sep 17 00:00:00 2001 From: Daniil Borisovskii Date: Tue, 24 Sep 2019 11:24:00 +0300 Subject: [PATCH] =?UTF-8?q?Fixed=20comment=20https://github.com/TouchInsti?= =?UTF-8?q?nct/RoboSwag/pull/78#discussion=5Fr327384826=20=E2=80=93=20publ?= =?UTF-8?q?ic=20method=20was=20moved=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/tabbarnavigation/BottomNavigationActivity.kt | 6 +++--- .../components/tabbarnavigation/BottomNavigationFragment.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 + }