TouchInstinct
/
RoboSwag
311
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

review

This commit is contained in:
Stanisalv 2019-09-27 21:49:55 +03:00
parent 1b47075f73
commit 54fc5f1f3b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/BottomNavigationController.kt
View File

@ -37,7 +37,7 @@ class BottomNavigationController(
callback = object : FragmentManager.FragmentLifecycleCallbacks() {
override fun onFragmentViewCreated(fragmentManager: FragmentManager, fragment: Fragment, view: View, savedInstanceState: Bundle?) {
fragments.forEach { itemId, (fragmentClass, _) ->
if (isViewControllerFragment(fragment, fragmentClass)) {
if (isFragment(fragment, fragmentClass)) {
navigationTabsContainer.children.forEach { itemView -> itemView.isActivated = itemView.id == itemId }
}
}
@ -48,7 +48,7 @@ class BottomNavigationController(
navigationTabsContainer.children.forEach { itemView ->
fragments[itemView.id]?.let { (viewControllerClass, _) ->
itemView.setOnClickListener {
if (!isViewControllerFragment(fragmentManager.primaryNavigationFragment, viewControllerClass)) {
if (!isFragment(fragmentManager.primaryNavigationFragment, viewControllerClass)) {
navigateTo(itemView.id)
} else {
onReselectListener?.invoke()
@ -116,7 +116,7 @@ class BottomNavigationController(
false
}
private fun isViewControllerFragment(fragment: Fragment?, fragmentClass: Class<out BaseFragment<*, *>>) =
private fun isFragment(fragment: Fragment?, fragmentClass: Class<out BaseFragment<*, *>>) =
if (wrapWithNavigationContainer) {
(fragment as NavigationContainerFragment).getFragmentClass()
} else {