Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Less hacky way to make sure bottom action toolbar doesn't scroll down (#5871)

Browse Source 
* Less hacky way to make sure bottom action toolbar doesn't scroll down

* Fix action toolbar overlapping on landscape

* Disable app bar transparency when ActionMode is present

(cherry picked from commit 7b3c18bb97e1ca6b8889d7aa271d715cfee684d4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
This commit is contained in:
Ivan Iskandar 2021-09-11 21:22:01 +07:00 committed by Jobobby04
parent 889a61704f
commit 035a1518ad
4 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -202,7 +202,7 @@ class LibraryController(
binding.actionToolbar.applyInsetter {
type(navigationBars = true) {
margin(bottom = true)
margin(bottom = true, horizontal = true)
}
}
@ -255,8 +255,6 @@ class LibraryController(
)
}
.launchIn(viewScope)
(activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
}
override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
@ -269,7 +267,6 @@ class LibraryController(
override fun onDestroyView(view: View) {
destroyActionModeIfNeeded()
(activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
binding.actionToolbar.destroy()
adapter?.onDestroy()
adapter = null

41
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -12,6 +12,7 @@ import android.view.Menu
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.appcompat.view.ActionMode
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.animation.doOnEnd
import androidx.core.splashscreen.SplashScreen
@ -99,8 +100,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
private var isConfirmingExit: Boolean = false
private var isHandlingShortcut: Boolean = false
private var fixedViewsToBottom = mutableMapOf<View, AppBarLayout.OnOffsetChangedListener>()
/**
* App bar lift state for backstack
*/
@ -531,6 +530,24 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
}
}
override fun onSupportActionModeStarted(mode: ActionMode) {
binding.appbar.apply {
tag = isTransparentWhenNotLifted
isTransparentWhenNotLifted = false
}
setToolbarScrolls(false)
super.onSupportActionModeStarted(mode)
}
override fun onSupportActionModeFinished(mode: ActionMode) {
binding.appbar.apply {
isTransparentWhenNotLifted = (tag as? Boolean) ?: false
tag = null
}
setToolbarScrolls(true)
super.onSupportActionModeFinished(mode)
}
private suspend fun resetExitConfirmation() {
isConfirmingExit = true
val toast = toast(R.string.confirm_exit, Toast.LENGTH_LONG)
@ -662,21 +679,15 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
// SY <--
/**
* Used to manually offset a view within the activity's child views that might be cut off due to
* the collapsing AppBarLayout.
* Sets toolbar CoordinatorLayout scroll flags
*/
fun fixViewToBottom(view: View) {
val listener = AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
val maxAbsOffset = appBarLayout.measuredHeight - binding.tabs.measuredHeight
view.translationY = -maxAbsOffset - verticalOffset.toFloat() + appBarLayout.paddingTop
private fun setToolbarScrolls(enabled: Boolean) = binding.toolbar.updateLayoutParams<AppBarLayout.LayoutParams> {
if (isTablet()) return@updateLayoutParams
scrollFlags = if (enabled) {
AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
} else {
0
}
binding.appbar.addOnOffsetChangedListener(listener)
fixedViewsToBottom[view] = listener
}
fun clearFixViewToBottom(view: View) {
val listener = fixedViewsToBottom.remove(view)
binding.appbar.removeOnOffsetChangedListener(listener)
}
private fun setBottomNavBehaviorOnScroll() {

5
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View File

@ -289,7 +289,7 @@ class MangaController :
}
binding.actionToolbar.applyInsetter {
type(navigationBars = true) {
margin(bottom = true)
margin(bottom = true, horizontal = true)
}
}
@ -400,8 +400,6 @@ class MangaController :
}
.launchIn(viewScope)
(activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
settingsSheet = ChaptersSettingsSheet(router, presenter) { group ->
if (group is ChaptersSettingsSheet.Filter.FilterGroup) {
updateFilterIconState()
@ -481,7 +479,6 @@ class MangaController :
override fun onDestroyView(view: View) {
destroyActionModeIfNeeded()
(activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
binding.actionToolbar.destroy()
mangaInfoAdapter?.onDestroyView()
mangaInfoAdapter = null

5
app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
View File

@ -82,7 +82,7 @@ class UpdatesController :
}
binding.actionToolbar.applyInsetter {
type(navigationBars = true) {
margin(bottom = true)
margin(bottom = true, horizontal = true)
}
}
@ -113,13 +113,10 @@ class UpdatesController :
binding.swipeRefresh.isRefreshing = false
}
.launchIn(viewScope)
(activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
}
override fun onDestroyView(view: View) {
destroyActionModeIfNeeded()
(activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
binding.actionToolbar.destroy()
adapter = null
super.onDestroyView(view)