Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-22 10:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overlap of multiselect in toolbar.

Browse Source
This commit is contained in:
Alex Hart
2022-05-27 14:43:59 -03:00
committed by Greyson Parrelli
parent b2b6f98294
commit f2d5bfe51d
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
View File

@@ -178,6 +178,13 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
}
}
private fun presentToolbarForMultiselect() {
_toolbar.visible = false
if (_basicToolbar.resolved()) {
_basicToolbar.get().visible = false
}
}
override fun onDestroyView() {
previousTopToastPopup = null
super.onDestroyView()
@@ -212,12 +219,16 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
}
override fun onMultiSelectStarted() {
_toolbar.visible = false
presentToolbarForMultiselect()
conversationListTabsViewModel.onMultiSelectStarted()
}
override fun onMultiSelectFinished() {
_toolbar.visible = true
val currentDestination: NavDestination? = requireView().findViewById<View>(R.id.fragment_container).findNavController().currentDestination
if (currentDestination != null) {
presentToolbarForDestination(currentDestination)
}
conversationListTabsViewModel.onMultiSelectFinished()
}
@@ -301,22 +312,26 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
return viewGroup.children.find { it is ActionMenuView }
}
private fun presentToolbarForDestination(destination: NavDestination) {
when (destination.id) {
R.id.conversationListFragment -> {
conversationListTabsViewModel.isShowingArchived(false)
presentToolbarForConversationListFragment()
}
R.id.conversationListArchiveFragment -> {
conversationListTabsViewModel.isShowingArchived(true)
presentToolbarForConversationListArchiveFragment()
}
R.id.storiesLandingFragment -> {
conversationListTabsViewModel.isShowingArchived(false)
presentToolbarForStoriesLandingFragment()
}
}
}
private inner class DestinationChangedListener : NavController.OnDestinationChangedListener {
override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
when (destination.id) {
R.id.conversationListFragment -> {
conversationListTabsViewModel.isShowingArchived(false)
presentToolbarForConversationListFragment()
}
R.id.conversationListArchiveFragment -> {
conversationListTabsViewModel.isShowingArchived(true)
presentToolbarForConversationListArchiveFragment()
}
R.id.storiesLandingFragment -> {
conversationListTabsViewModel.isShowingArchived(false)
presentToolbarForStoriesLandingFragment()
}
}
presentToolbarForDestination(destination)
}
}
@@ -325,7 +340,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
Material3OnScrollHelper(
requireActivity(),
listOf(_toolbarBackground),
listOf(_searchToolbar, _basicToolbar)
listOf(_searchToolbar)
)
)
}