TouchInstinct
/
RoboSwag
303
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

changed vars name from viewController to fragment

This commit is contained in:
Stanisalv 2019-09-27 21:44:51 +03:00
parent 4f51610170
commit 1b47075f73
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,11 +18,11 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException
class BottomNavigationController(
private val context: Context,
private val fragmentManager: FragmentManager,
private val viewControllers: SparseArray<Pair<Class<out BaseFragment<*, *>>, Parcelable>>,
private val fragments: SparseArray<Pair<Class<out BaseFragment<*, *>>, Parcelable>>,
@IdRes private val contentContainerViewId: Int,
@LayoutRes private val contentContainerLayoutId: Int,
private val wrapWithNavigationContainer: Boolean = false,
@IdRes private val topLevelViewControllerId: Int = 0, // If it zero back press with empty fragment back stack would close the app
@IdRes private val topLevelFragmentId: Int = 0, // If it zero back press with empty fragment back stack would close the app
private val onReselectListener: (() -> Unit)? = null
) {
@ -36,8 +36,8 @@ class BottomNavigationController(
//This is provides to set pressed tab status to isActivated providing an opportunity to specify custom style
callback = object : FragmentManager.FragmentLifecycleCallbacks() {
override fun onFragmentViewCreated(fragmentManager: FragmentManager, fragment: Fragment, view: View, savedInstanceState: Bundle?) {
viewControllers.forEach { itemId, (viewControllerClass, _) ->
if (isViewControllerFragment(fragment, viewControllerClass)) {
fragments.forEach { itemId, (fragmentClass, _) ->
if (isViewControllerFragment(fragment, fragmentClass)) {
navigationTabsContainer.children.forEach { itemView -> itemView.isActivated = itemView.id == itemId }
}
}
@ -46,7 +46,7 @@ class BottomNavigationController(
fragmentManager.registerFragmentLifecycleCallbacks(callback!!, false)
navigationTabsContainer.children.forEach { itemView ->
viewControllers[itemView.id]?.let { (viewControllerClass, _) ->
fragments[itemView.id]?.let { (viewControllerClass, _) ->
itemView.setOnClickListener {
if (!isViewControllerFragment(fragmentManager.primaryNavigationFragment, viewControllerClass)) {
navigateTo(itemView.id)
@ -62,18 +62,18 @@ class BottomNavigationController(
fun navigateTo(@IdRes itemId: Int, state: Parcelable? = null) {
// Find view controller class that needs to open
val (viewControllerClass, defaultViewControllerState) = viewControllers[itemId] ?: return
if (state != null && state::class != defaultViewControllerState::class) {
val (fragmentClass, defaultFragmentState) = fragments[itemId] ?: return
if (state != null && state::class != defaultFragmentState::class) {
throw ShouldNotHappenException(
"Incorrect state type for navigation tab root ViewController. Should be ${defaultViewControllerState::class}"
"Incorrect state type for navigation tab root ViewController. Should be ${defaultFragmentState::class}"
)
}
val viewControllerState = state ?: defaultViewControllerState
val fragmentState = state ?: defaultFragmentState
val transaction = fragmentManager.beginTransaction()
// Detach current primary fragment
fragmentManager.primaryNavigationFragment?.let(transaction::detach)
val viewControllerName = viewControllerClass.canonicalName
var fragment = fragmentManager.findFragmentByTag(viewControllerName)
val fragmentName = fragmentClass.canonicalName
var fragment = fragmentManager.findFragmentByTag(fragmentName)
if (state == null && fragment != null) {
transaction.attach(fragment)
@ -84,17 +84,17 @@ class BottomNavigationController(
fragment = if (wrapWithNavigationContainer) {
Fragment.instantiate(
context,
viewControllerClass.name,
NavigationContainerFragment.args(viewControllerClass, viewControllerState, contentContainerViewId, contentContainerLayoutId)
fragmentClass.name,
NavigationContainerFragment.args(fragmentClass, fragmentState, contentContainerViewId, contentContainerLayoutId)
)
} else {
Fragment.instantiate(
context,
viewControllerClass.name,
BaseFragment.args(viewControllerState)
fragmentClass.name,
BaseFragment.args(fragmentState)
)
}
transaction.add(contentContainerViewId, fragment, viewControllerName)
transaction.add(contentContainerViewId, fragment, fragmentName)
}
transaction
@ -108,18 +108,18 @@ class BottomNavigationController(
// When you are in any tab instead of main you firstly navigate to main tab before exit application
fun onBackPressed() =
if (fragmentManager.primaryNavigationFragment?.childFragmentManager?.backStackEntryCount == 0
&& topLevelViewControllerId != 0
&& currentViewControllerId != topLevelViewControllerId) {
navigateTo(topLevelViewControllerId)
&& topLevelFragmentId != 0
&& currentViewControllerId != topLevelFragmentId) {
navigateTo(topLevelFragmentId)
true
} else {
false
}
private fun isViewControllerFragment(fragment: Fragment?, viewControllerClass: Class<out BaseFragment<*, *>>) =
private fun isViewControllerFragment(fragment: Fragment?, fragmentClass: Class<out BaseFragment<*, *>>) =
if (wrapWithNavigationContainer) {
(fragment as NavigationContainerFragment).getViewControllerClass()
(fragment as NavigationContainerFragment).getFragmentClass()
} else {
(fragment as BaseFragment<*, *>).javaClass
} === viewControllerClass
} === fragmentClass
}

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

@ -38,7 +38,7 @@ abstract class BottomNavigationFragment : Fragment() {
bottomNavigationController = BottomNavigationController(
context = requireContext(),
fragmentManager = childFragmentManager,
viewControllers = navigationViewControllers,
fragments = navigationViewControllers,
contentContainerViewId = contentContainerViewId,
contentContainerLayoutId = contentContainerLayoutId,
topLevelViewControllerId = topLevelViewControllerId,

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

@ -55,7 +55,7 @@ class NavigationContainerFragment : Fragment() {
private var transition = 0
@Suppress("UNCHECKED_CAST")
fun getViewControllerClass(): Class<out BaseFragment<out BottomNavigationActivity, Parcelable>> =
fun getFragmentClass(): Class<out BaseFragment<out BottomNavigationActivity, Parcelable>> =
arguments?.getSerializable(VIEW_CONTROLLER_CLASS_ARG) as Class<out BaseFragment<out BottomNavigationActivity, Parcelable>>
override fun onCreate(savedInstanceState: Bundle?) {
@ -67,7 +67,7 @@ class NavigationContainerFragment : Fragment() {
containerLayoutId = getInt(CONTAINER_LAYOUT_ID_ARG)
transition = getInt(TRANSITION_ARG)
}
navigation.setInitial(getViewControllerClass(), args.getParcelable(VIEW_CONTROLLER_STATE_ARG))
navigation.setInitial(getFragmentClass(), args.getParcelable(VIEW_CONTROLLER_STATE_ARG))
}
}