fix #2723, do not use transparent navigation with horizontal scrolling
This commit is contained in:
parent
24dd37db2f
commit
c9468b754d
2 changed files with 4 additions and 4 deletions
|
@ -109,7 +109,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
|
||||||
setupOptionsMenu()
|
setupOptionsMenu()
|
||||||
refreshMenuItems()
|
refreshMenuItems()
|
||||||
|
|
||||||
updateMaterialActivityViews(directories_coordinator, directories_grid, useTransparentNavigation = true, useTopSearchMenu = true)
|
updateMaterialActivityViews(directories_coordinator, directories_grid, useTransparentNavigation = !config.scrollHorizontally, useTopSearchMenu = true)
|
||||||
|
|
||||||
directories_refresh_layout.setOnRefreshListener { getDirectories() }
|
directories_refresh_layout.setOnRefreshListener { getDirectories() }
|
||||||
storeStateVariables()
|
storeStateVariables()
|
||||||
|
@ -334,7 +334,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
main_menu.getToolbar().inflateMenu(menuId)
|
main_menu.getToolbar().inflateMenu(menuId)
|
||||||
main_menu.toggleHideOnScroll(true)
|
main_menu.toggleHideOnScroll(!config.scrollHorizontally)
|
||||||
main_menu.setupMenu()
|
main_menu.setupMenu()
|
||||||
|
|
||||||
main_menu.onSearchOpenListener = {
|
main_menu.onSearchOpenListener = {
|
||||||
|
|
|
@ -96,7 +96,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
|
||||||
setupOptionsMenu()
|
setupOptionsMenu()
|
||||||
refreshMenuItems()
|
refreshMenuItems()
|
||||||
storeStateVariables()
|
storeStateVariables()
|
||||||
updateMaterialActivityViews(media_coordinator, media_grid, useTransparentNavigation = true, useTopSearchMenu = true)
|
updateMaterialActivityViews(media_coordinator, media_grid, useTransparentNavigation = !config.scrollHorizontally, useTopSearchMenu = true)
|
||||||
|
|
||||||
if (mShowAll) {
|
if (mShowAll) {
|
||||||
registerFileUpdateListener()
|
registerFileUpdateListener()
|
||||||
|
@ -257,7 +257,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
|
||||||
|
|
||||||
private fun setupOptionsMenu() {
|
private fun setupOptionsMenu() {
|
||||||
media_menu.getToolbar().inflateMenu(R.menu.menu_media)
|
media_menu.getToolbar().inflateMenu(R.menu.menu_media)
|
||||||
media_menu.toggleHideOnScroll(true)
|
media_menu.toggleHideOnScroll(!config.scrollHorizontally)
|
||||||
media_menu.setupMenu()
|
media_menu.setupMenu()
|
||||||
|
|
||||||
media_menu.onSearchTextChangedListener = { text ->
|
media_menu.onSearchTextChangedListener = { text ->
|
||||||
|
|
Loading…
Reference in a new issue