From 2e143b35fc88f575671b6715d2efa4a86c963314 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 23 Apr 2022 15:13:26 -0400
Subject: [PATCH] Center big appbar icon for multi line titles

---
 .../tachiyomi/ui/base/ExpandedAppBarLayout.kt |  5 ++++
 .../ui/base/controller/BaseController.kt      |  2 +-
 .../main/res/layout-w720dp/main_activity.xml  | 28 +++++++++++-------
 app/src/main/res/layout/main_activity.xml     | 29 +++++++++++--------
 4 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
index 3f7a63339b..92d0083be9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
@@ -43,6 +43,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att
     val preferences: PreferencesHelper by injectLazy()
     var bigView: View? = null
     var imageView: ImageView? = null
+    var imageLayout: FrameLayout? = null
     private var tabsFrameLayout: FrameLayout? = null
     var mainActivity: MainActivity? = null
     private var isExtraSmall = false
@@ -183,6 +184,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att
         cardFrame = findViewById(R.id.card_frame)
         tabsFrameLayout = findViewById(R.id.tabs_frame_layout)
         imageView = findViewById(R.id.big_icon)
+        imageLayout = findViewById(R.id.big_icon_layout)
         shrinkAppBarIfNeeded(resources.configuration)
     }
 
@@ -244,6 +246,9 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att
                 height = 48.dpToPx
                 width = 48.dpToPx
             }
+            imageLayout?.updateLayoutParams<MarginLayoutParams> {
+                height = 48.dpToPx
+            }
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
index ba8de5ac12..4ba0b9db63 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
@@ -113,7 +113,7 @@ abstract class BaseController<VB : ViewBinding>(bundle: Bundle? = null) :
             (activity as? AppCompatActivity)?.title = getTitle()
             (activity as? MainActivity)?.searchTitle = getSearchTitle()
             val icon = getBigIcon()
-            activityBinding?.bigIcon?.isVisible = icon != null
+            activityBinding?.bigIconLayout?.isVisible = icon != null
             if (icon != null) {
                 activityBinding?.bigIcon?.setImageDrawable(getBigIcon())
             } else {
diff --git a/app/src/main/res/layout-w720dp/main_activity.xml b/app/src/main/res/layout-w720dp/main_activity.xml
index 5bb5692285..e2f07108fd 100644
--- a/app/src/main/res/layout-w720dp/main_activity.xml
+++ b/app/src/main/res/layout-w720dp/main_activity.xml
@@ -63,18 +63,26 @@
             android:paddingBottom="12dp"
             android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/big_icon"
-                android:visibility="gone"
-                tools:visibility="visible"
+            <FrameLayout
+                android:id="@+id/big_icon_layout"
                 android:layout_width="52dp"
-                android:layout_height="52dp"
-                tools:srcCompat="@mipmap/ic_launcher"
+                android:layout_height="0dp"
+                app:layout_constraintHeight_min="wrap"
+                app:layout_constraintVertical_bias="1.0"
+                android:layout_marginStart="16dp"
+                app:layout_constraintTop_toTopOf="@id/big_title"
                 app:layout_constraintBottom_toBottomOf="@id/big_title"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/big_title"
-                android:layout_marginStart="16dp"
-                />
+                app:layout_constraintEnd_toStartOf="@id/big_title">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/big_icon"
+                    android:visibility="gone"
+                    tools:visibility="visible"
+                    android:layout_width="52dp"
+                    android:layout_height="52dp"
+                    android:layout_gravity="center"
+                    tools:srcCompat="@mipmap/ic_launcher" />
+            </FrameLayout>
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/big_title"
@@ -86,7 +94,7 @@
                 android:layout_marginTop="52dp"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintStart_toEndOf="@id/big_icon"
+                app:layout_constraintStart_toEndOf="@id/big_icon_layout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:drawableTint="?actionBarTintColor"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 273d578fb5..a3588bc1d1 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -51,8 +51,6 @@
                 android:maxLines="1"
                 android:textColor="?actionBarTintColor"
                 android:textSize="20sp"
-                tools:drawableEnd="@drawable/ic_arrow_drop_down_24dp"
-                tools:drawableStart="@drawable/ic_blank_24dp"
                 tools:text="Title Text" />
         </eu.kanade.tachiyomi.ui.base.CenteredToolbar>
 
@@ -62,19 +60,26 @@
             android:paddingBottom="12dp"
             android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/big_icon"
+            <FrameLayout
+                android:id="@+id/big_icon_layout"
                 android:visibility="gone"
                 tools:visibility="visible"
                 android:layout_width="52dp"
-                android:layout_height="52dp"
-                tools:srcCompat="@mipmap/ic_launcher"
+                android:layout_height="0dp"
+                app:layout_constraintHeight_min="wrap"
+                app:layout_constraintVertical_bias="1.0"
+                android:layout_marginStart="16dp"
+                app:layout_constraintTop_toTopOf="@id/big_title"
                 app:layout_constraintBottom_toBottomOf="@id/big_title"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/big_title"
-                android:layout_marginStart="16dp"
-                />
-
+                app:layout_constraintEnd_toStartOf="@id/big_title">
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/big_icon"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:layout_gravity="center"
+                        tools:srcCompat="@mipmap/ic_launcher" />
+            </FrameLayout>
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/big_title"
                 android:paddingStart="16dp"
@@ -85,14 +90,14 @@
                 android:layout_marginTop="52dp"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintStart_toEndOf="@id/big_icon"
+                app:layout_constraintStart_toEndOf="@id/big_icon_layout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:drawableTint="?actionBarTintColor"
                 android:ellipsize="end"
                 android:layout_gravity="start"
                 android:textColor="?actionBarTintColor"
-                tools:text="Title Text" />
+                tools:text="Big Title" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <FrameLayout