From 54d8748c582295bce0728b4eae3a3a78d87d1b11 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 17 Apr 2021 13:07:25 -0400
Subject: [PATCH] Adjust ActionToolbar positioning
Have I ever mentioned that I hate insets?
(cherry picked from commit ad9bad3d17aa01140e5dc339c71e19f405caaf90)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
---
.../java/eu/kanade/tachiyomi/ui/library/LibraryController.kt | 5 +++++
.../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 3 ++-
.../java/eu/kanade/tachiyomi/ui/manga/MangaController.kt | 5 +++++
.../kanade/tachiyomi/ui/recent/updates/UpdatesController.kt | 5 +++++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index f5774b325..f21c120f8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -197,6 +197,11 @@ class LibraryController(
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
binding = LibraryControllerBinding.inflate(inflater)
+ binding.actionToolbar.applyInsetter {
+ type(navigationBars = true) {
+ margin(bottom = true)
+ }
+ }
return binding.root
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 95a09023b..2d7f0855d 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -14,6 +14,7 @@ import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible
+import androidx.core.view.marginTop
import androidx.core.view.updateLayoutParams
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceDialogController
@@ -501,7 +502,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
fun fixViewToBottom(view: View) {
val listener = AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
val maxAbsOffset = appBarLayout.measuredHeight - binding.tabs.measuredHeight
- view.translationY = -maxAbsOffset - verticalOffset.toFloat()
+ view.translationY = -maxAbsOffset - verticalOffset.toFloat() + appBarLayout.marginTop
}
binding.appbar.addOnOffsetChangedListener(listener)
fixedViewsToBottom[view] = listener
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
index 312be9c73..a99c34b10 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@@ -283,6 +283,11 @@ class MangaController :
padding()
}
}
+ binding.actionToolbar.applyInsetter {
+ type(navigationBars = true) {
+ margin(bottom = true)
+ }
+ }
return binding.root
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
index 3f1f3e577..4dca1f14a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
@@ -78,6 +78,11 @@ class UpdatesController :
padding()
}
}
+ binding.actionToolbar.applyInsetter {
+ type(navigationBars = true) {
+ margin(bottom = true)
+ }
+ }
return binding.root
}