Adjust ActionToolbar positioning

(cherry picked from commit 1f8c5b0120177ecd160110026ab2e018e20dd0c1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt

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

@@ -197,11 +197,6 @@ 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
     }
 

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

@@ -14,7 +14,6 @@ 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
@@ -507,7 +506,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() - appBarLayout.marginTop
+            view.translationY = -maxAbsOffset - verticalOffset.toFloat()
         }
         binding.appbar.addOnOffsetChangedListener(listener)
         fixedViewsToBottom[view] = listener

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

@@ -283,11 +283,6 @@ class MangaController :
                 padding()
             }
         }
-        binding.actionToolbar.applyInsetter {
-            type(navigationBars = true) {
-                margin(bottom = true)
-            }
-        }
         return binding.root
     }
 

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

@@ -78,11 +78,6 @@ class UpdatesController :
                 padding()
             }
         }
-        binding.actionToolbar.applyInsetter {
-            type(navigationBars = true) {
-                margin(bottom = true)
-            }
-        }
         return binding.root
     }
 

app/src/main/java/eu/kanade/tachiyomi/widget/ActionToolbar.kt

@@ -12,7 +12,7 @@ import androidx.annotation.MenuRes
 import androidx.appcompat.view.ActionMode
 import androidx.core.view.isVisible
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.databinding.CommonActionToolbarBinding
+import eu.kanade.tachiyomi.databinding.ActionToolbarBinding
 
 /**
  * A toolbar holding only menu items.
@@ -20,25 +20,21 @@ import eu.kanade.tachiyomi.databinding.CommonActionToolbarBinding
 class ActionToolbar @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
     FrameLayout(context, attrs) {
 
-    private val binding: CommonActionToolbarBinding
+    private val binding = ActionToolbarBinding.inflate(LayoutInflater.from(context), this, true)
-
-    init {
-        binding = CommonActionToolbarBinding.inflate(LayoutInflater.from(context), this, true)
-    }
 
     /**
      * Remove menu items and remove listener.
      */
     fun destroy() {
-        binding.commonActionMenu.menu.clear()
+        binding.menu.menu.clear()
-        binding.commonActionMenu.setOnMenuItemClickListener(null)
+        binding.menu.setOnMenuItemClickListener(null)
     }
 
     /**
      * Gets a menu item if found.
      */
     fun findItem(@IdRes itemId: Int): MenuItem? {
-        return binding.commonActionMenu.menu.findItem(itemId)
+        return binding.menu.menu.findItem(itemId)
     }
 
     /**
@@ -46,14 +42,14 @@ class ActionToolbar @JvmOverloads constructor(context: Context, attrs: Attribute
      */
     fun show(mode: ActionMode, @MenuRes menuRes: Int, listener: (item: MenuItem?) -> Boolean) {
         // Avoid re-inflating the menu
-        if (binding.commonActionMenu.menu.size() == 0) {
+        if (binding.menu.menu.size() == 0) {
-            mode.menuInflater.inflate(menuRes, binding.commonActionMenu.menu)
+            mode.menuInflater.inflate(menuRes, binding.menu.menu)
-            binding.commonActionMenu.setOnMenuItemClickListener { listener(it) }
+            binding.menu.setOnMenuItemClickListener { listener(it) }
         }
 
-        binding.commonActionToolbar.isVisible = true
+        binding.actionToolbar.isVisible = true
         val bottomAnimation = AnimationUtils.loadAnimation(context, R.anim.enter_from_bottom)
-        binding.commonActionToolbar.startAnimation(bottomAnimation)
+        binding.actionToolbar.startAnimation(bottomAnimation)
     }
 
     /**
@@ -64,10 +60,10 @@ class ActionToolbar @JvmOverloads constructor(context: Context, attrs: Attribute
         bottomAnimation.setAnimationListener(
             object : SimpleAnimationListener() {
                 override fun onAnimationEnd(animation: Animation) {
-                    binding.commonActionToolbar.isVisible = false
+                    binding.actionToolbar.isVisible = false
                 }
             }
         )
-        binding.commonActionToolbar.startAnimation(bottomAnimation)
+        binding.actionToolbar.startAnimation(bottomAnimation)
     }
 }

app/src/main/res/layout/action_toolbar.xml

@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/common_action_toolbar"
+    android:id="@+id/action_toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clipToPadding="false"
@@ -25,7 +25,7 @@
             app:contentInsetStart="8dp">
 
             <androidx.appcompat.widget.ActionMenuView
-                android:id="@+id/common_action_menu"
+                android:id="@+id/menu"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />