prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix search opening/closing

Browse Source
This commit is contained in:
Koitharu
2022-07-04 16:56:54 +03:00
parent e0d93b0630
commit b81aeaebd3
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
View File

@@ -114,8 +114,10 @@ class MainActivity :
binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> { binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> {
scrollFlags = SCROLL_FLAG_NO_SCROLL scrollFlags = SCROLL_FLAG_NO_SCROLL
} }
binding.toolbarCard.background = null
binding.appbar.setBackgroundColor(getThemeColor(materialR.attr.colorSurfaceVariant)) binding.appbar.setBackgroundColor(getThemeColor(materialR.attr.colorSurfaceVariant))
binding.appbar.updatePadding(left = 0, right = 0) binding.appbar.updatePadding(left = 0, right = 0)
supportActionBar?.setHomeAsUpIndicator(materialR.drawable.abc_ic_ab_back_material)
} }
adjustFabVisibility(isSearchOpened = isSearchOpened) adjustFabVisibility(isSearchOpened = isSearchOpened)
} }
@@ -137,6 +139,14 @@ class MainActivity :
return onNavigationItemSelected(item.itemId) return onNavigationItemSelected(item.itemId)
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == android.R.id.home && !isSearchOpened()) {
binding.searchView.requestFocus()
return true
}
return super.onOptionsItemSelected(item)
}
override fun onClick(v: View) { override fun onClick(v: View) {
when (v.id) { when (v.id) {
R.id.fab -> viewModel.openLastReader() R.id.fab -> viewModel.openLastReader()
@@ -277,9 +287,11 @@ class MainActivity :
binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> { binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> {
scrollFlags = SCROLL_FLAG_NO_SCROLL scrollFlags = SCROLL_FLAG_NO_SCROLL
} }
binding.toolbarCard.background = null
binding.appbar.setBackgroundColor(getThemeColor(materialR.attr.colorSurfaceVariant)) binding.appbar.setBackgroundColor(getThemeColor(materialR.attr.colorSurfaceVariant))
binding.appbar.updatePadding(left = 0, right = 0) binding.appbar.updatePadding(left = 0, right = 0)
adjustFabVisibility(isSearchOpened = true) adjustFabVisibility(isSearchOpened = true)
supportActionBar?.setHomeAsUpIndicator(materialR.drawable.abc_ic_ab_back_material)
showBottomNav(false) showBottomNav(false)
} }
@@ -288,10 +300,12 @@ class MainActivity :
binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> { binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> {
scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS
} }
binding.toolbarCard.setBackgroundResource(R.drawable.toolbar_background)
binding.appbar.background = null binding.appbar.background = null
val padding = resources.getDimensionPixelOffset(R.dimen.margin_normal) val padding = resources.getDimensionPixelOffset(R.dimen.margin_normal)
binding.appbar.updatePadding(left = padding, right = padding) binding.appbar.updatePadding(left = padding, right = padding)
adjustFabVisibility(isSearchOpened = false) adjustFabVisibility(isSearchOpened = false)
supportActionBar?.setHomeAsUpIndicator(materialR.drawable.abc_ic_search_api_material)
showBottomNav(true) showBottomNav(true)
} }