From e4b4f6e350331a3b801cfd510c4a676b515d3080 Mon Sep 17 00:00:00 2001
From: "Mr.Karzari" <76250959+QM4RS@users.noreply.github.com>
Date: Thu, 23 Jul 2026 22:40:22 +0330
Subject: [PATCH] Fix home header logo and title layout (#11)

Use the current logo asset and a fixed-size custom toolbar layout so the home title and tagline stay aligned.
---
 .../com/qm4rs/fridabox/FridaBoxActivity.kt    |  3 +-
 app/src/main/res/layout/activity_fridabox.xml | 55 ++++++++++++++++---
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/qm4rs/fridabox/FridaBoxActivity.kt b/app/src/main/java/com/qm4rs/fridabox/FridaBoxActivity.kt
index 896f64a..995a11c 100644
--- a/app/src/main/java/com/qm4rs/fridabox/FridaBoxActivity.kt
+++ b/app/src/main/java/com/qm4rs/fridabox/FridaBoxActivity.kt
@@ -197,8 +197,7 @@ class FridaBoxActivity : AppCompatActivity() {
                 gravity = Gravity.CENTER_HORIZONTAL
                 setPadding(dp(24), dp(36), dp(24), dp(36))
                 addView(ImageView(this@FridaBoxActivity).apply {
-                    setImageResource(R.drawable.ic_fridabox_mark)
-                    imageTintList = ColorStateList.valueOf(color(R.color.fb_text_secondary))
+                    setImageResource(R.drawable.logo)
                 }, LinearLayout.LayoutParams(dp(52), dp(52)))
                 addView(labelText(getString(R.string.fb_no_guests), R.color.fb_text_primary, 19f, true).apply {
                     setPadding(0, dp(16), 0, 0)
diff --git a/app/src/main/res/layout/activity_fridabox.xml b/app/src/main/res/layout/activity_fridabox.xml
index af580db..86fb6cb 100644
--- a/app/src/main/res/layout/activity_fridabox.xml
+++ b/app/src/main/res/layout/activity_fridabox.xml
@@ -22,14 +22,53 @@
             android:layout_width="match_parent"
             android:layout_height="72dp"
             android:background="@color/fb_background"
-            android:contentInsetStart="18dp"
-            android:contentInsetEnd="18dp"
-            app:logo="@drawable/ic_fridabox_mark"
-            app:logoDescription="@string/fb_brand"
-            app:subtitle="@string/fb_brand_tagline"
-            app:subtitleTextColor="@color/fb_text_secondary"
-            app:title="@string/fb_brand"
-            app:titleTextColor="@color/fb_text_primary" />
+            android:contentInsetStart="0dp"
+            android:contentInsetEnd="0dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:layoutDirection="ltr"
+                android:orientation="horizontal"
+                android:paddingStart="18dp"
+                android:paddingEnd="18dp">
+
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:contentDescription="@string/fb_brand"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/logo" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:text="@string/fb_brand"
+                        android:textColor="@color/fb_text_primary"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/fb_brand_tagline"
+                        android:textColor="@color/fb_text_secondary"
+                        android:textSize="13sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </com.google.android.material.appbar.MaterialToolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView