filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tab hiding logic

Browse Source 
Change-Id: Ic6d80651e80c2ea57f72516cf9909e3691ac0367
This commit is contained in:
SpiritCroc 2021-06-27 12:13:28 +02:00
parent 098d98926a
commit 71b663db49
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
View File

@ -128,7 +128,7 @@ class HomeDetailFragment @Inject constructor(
setupKeysBackupBanner() setupKeysBackupBanner()
setupActiveCallView() setupActiveCallView()
loadNavigationView() checkNotificationTabStatus()
viewModel.selectSubscribe(this, HomeDetailViewState::roomGroupingMethod) { roomGroupingMethod -> viewModel.selectSubscribe(this, HomeDetailViewState::roomGroupingMethod) { roomGroupingMethod ->
when (roomGroupingMethod) { when (roomGroupingMethod) {
@ -147,6 +147,7 @@ class HomeDetailFragment @Inject constructor(
viewModel.selectSubscribe(this, HomeDetailViewState::showDialPadTab) { showDialPadTab -> viewModel.selectSubscribe(this, HomeDetailViewState::showDialPadTab) { showDialPadTab ->
updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab) updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab)
checkNotificationTabStatus(showDialPadTab)
} }
viewModel.observeViewEvents { viewEvent -> viewModel.observeViewEvents { viewEvent ->
@ -194,18 +195,6 @@ class HomeDetailFragment @Inject constructor(
}) })
} }
private fun loadNavigationView() {
withState(viewModel) {
// Update the navigation view if needed (for when we restore the tabs)
if (!vectorPreferences.enableOverviewTabs()) {
views.bottomNavigationView.isVisible = false
} else {
views.bottomNavigationView.selectedItemId = it.currentTab.toMenuId()
views.bottomNavigationView.isVisible = true
}
}
}
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
// update notification tab if needed // update notification tab if needed
@ -215,7 +204,7 @@ class HomeDetailFragment @Inject constructor(
callManager.checkForProtocolsSupportIfNeeded() callManager.checkForProtocolsSupportIfNeeded()
} }
private fun checkNotificationTabStatus() { private fun checkNotificationTabStatus(enableDialPad: Boolean? = null) {
val wasVisible = views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible val wasVisible = views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible
val combinedOverview = vectorPreferences.combinedOverview() val combinedOverview = vectorPreferences.combinedOverview()
val combinedOverviewWasVisible = views.bottomNavigationView.menu.findItem(R.id.bottom_action_all).isVisible val combinedOverviewWasVisible = views.bottomNavigationView.menu.findItem(R.id.bottom_action_all).isVisible
@ -251,13 +240,18 @@ class HomeDetailFragment @Inject constructor(
} }
} }
val wasBottomBarVisible = views.bottomNavigationView.isVisible val wasBottomBarVisible = views.bottomNavigationView.isVisible
viewModel.selectSubscribe(this, HomeDetailViewState::showDialPadTab) { showDialPadTab -> val showDialPad = enableDialPad ?: withState(viewModel) { it.showDialPadTab }
updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab) val showTabBar = vectorPreferences.enableOverviewTabs() || showDialPad
} if (wasBottomBarVisible != showTabBar) {
withState(viewModel) { withState(viewModel) {
val showTabBar = vectorPreferences.enableOverviewTabs() || it.showDialPadTab // Update the navigation view if needed (for when we restore the tabs)
if (wasBottomBarVisible != showTabBar) { if (showTabBar) {
loadNavigationView() views.bottomNavigationView.selectedItemId = it.currentTab.toMenuId()
views.bottomNavigationView.isVisible = true
} else {
views.bottomNavigationView.isVisible = false
}
} }
} }
} }
@ -469,7 +463,12 @@ class HomeDetailFragment @Inject constructor(
// As we hide it check if it's not the current item! // As we hide it check if it's not the current item!
withState(viewModel) { withState(viewModel) {
if (it.currentTab.toMenuId() == tabId) { if (it.currentTab.toMenuId() == tabId) {
viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.PEOPLE))) val combinedOverview = vectorPreferences.combinedOverview()
if (combinedOverview) {
viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.PEOPLE)))
} else {
viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.ALL)))
}
} }
} }
} }