blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #11406 - Scrolls to selected tab when switching modes

master
Jeff Boek 2020-06-24 17:33:01 -07:00 committed by Emily Kager
parent 2c39d3ebca
commit 177e7a400f
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
View File

@ -122,7 +122,7 @@ class TabTrayView(
}
if (!hasLoaded) {
hasLoaded = true
tray.layoutManager?.scrollToPosition(selectedBrowserTabIndex)
scrollToSelectedTab()
if (view.context.settings().accessibilityServicesEnabled) {
lifecycleScope.launch {
delay(SELECTION_DELAY.toLong())
@ -194,6 +194,7 @@ class TabTrayView(
filterTabs.invoke(filter)
updateState(view.context.components.core.store.state)
scrollToSelectedTab()
}
override fun onTabReselected(tab: TabLayout.Tab?) { /*noop*/ }
@ -225,16 +226,6 @@ class TabTrayView(
}
}
private fun toggleFabText(private: Boolean) {
if (private) {
fabView.new_tab_button.extend()
fabView.new_tab_button.contentDescription = view.context.resources.getString(R.string.add_private_tab)
} else {
fabView.new_tab_button.shrink()
fabView.new_tab_button.contentDescription = view.context.resources.getString(R.string.add_tab)
}
}
fun setTopOffset(landscape: Boolean) {
val topOffset = if (landscape) {
0
@ -249,6 +240,31 @@ class TabTrayView(
menu?.dismiss()
}
private fun toggleFabText(private: Boolean) {
if (private) {
fabView.new_tab_button.extend()
fabView.new_tab_button.contentDescription = view.context.resources.getString(R.string.add_private_tab)
} else {
fabView.new_tab_button.shrink()
fabView.new_tab_button.contentDescription = view.context.resources.getString(R.string.add_tab)
}
}
private fun scrollToSelectedTab() {
(view.tabsTray as? BrowserTabsTray)?.also { tray ->
val tabs = if (isPrivateModeSelected) {
view.context.components.core.store.state.privateTabs
} else {
view.context.components.core.store.state.normalTabs
}
val selectedBrowserTabIndex = tabs
.indexOfFirst { it.id == view.context.components.core.store.state.selectedTabId }
tray.layoutManager?.scrollToPosition(selectedBrowserTabIndex)
}
}
companion object {
private const val DEFAULT_TAB_ID = 0
private const val PRIVATE_TAB_ID = 1