From 2c3f0de1a285b35117a7552efd9e4c34f71276d1 Mon Sep 17 00:00:00 2001
From: Arman Singh <armansinghof@gmail.com>
Date: Thu, 30 Jan 2025 23:46:00 +0530
Subject: [PATCH] Fix: Card Browser Border and Header Height.

---
 .../anki/browser/BrowserMultiColumnAdapter.kt |  4 ----
 .../browser_heading_bottom_divider.xml        | 15 ++++++++++++++
 .../main/res/layout/browser_column_cell.xml   |  2 +-
 .../res/layout/browser_column_divider.xml     | 20 -------------------
 .../res/layout/browser_column_heading.xml     |  5 +++--
 .../src/main/res/layout/card_browser.xml      |  2 +-
 6 files changed, 20 insertions(+), 28 deletions(-)
 create mode 100644 AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml
 delete mode 100644 AnkiDroid/src/main/res/layout/browser_column_divider.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
index e1c3567f1287..ea0081d54083 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
@@ -102,10 +102,6 @@ class BrowserMultiColumnAdapter(
                     inflate(R.layout.browser_column_cell).apply {
                         columnViews.add(this as TextView)
                     }
-
-                    if (index <= value) {
-                        inflate(R.layout.browser_column_divider)
-                    }
                 }
 
                 columnViews.forEach { it.setupTextSize() }
diff --git a/AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml b/AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml
new file mode 100644
index 000000000000..3d5e43a03de2
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+
+    <item android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <size android:height="1dp" />
+            <solid android:color="?attr/cardBrowserDivider" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/browser_column_cell.xml b/AnkiDroid/src/main/res/layout/browser_column_cell.xml
index 6f75fda7214c..058b77e7a39c 100644
--- a/AnkiDroid/src/main/res/layout/browser_column_cell.xml
+++ b/AnkiDroid/src/main/res/layout/browser_column_cell.xml
@@ -18,7 +18,7 @@
     android:layout_width="0dp"
     android:layout_height="match_parent"
     android:layout_weight="1"
-    android:paddingStart="4dp"
+    android:paddingStart="8dp"
     android:paddingVertical="1dp"
     android:layout_gravity="top"
 />
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/browser_column_divider.xml b/AnkiDroid/src/main/res/layout/browser_column_divider.xml
deleted file mode 100644
index 2cdee641e6aa..000000000000
--- a/AnkiDroid/src/main/res/layout/browser_column_divider.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~  Copyright (c) 2025 David Allison <davidallisongithub@gmail.com>
-  ~
-  ~  This program is free software; you can redistribute it and/or modify it under
-  ~  the terms of the GNU General Public License as published by the Free Software
-  ~  Foundation; either version 3 of the License, or (at your option) any later
-  ~  version.
-  ~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~  PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License along with
-  ~  this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0.5dp"
-    android:layout_height="match_parent"
-    android:background="?attr/cardBrowserDivider"/>
diff --git a/AnkiDroid/src/main/res/layout/browser_column_heading.xml b/AnkiDroid/src/main/res/layout/browser_column_heading.xml
index 919b5466f4d9..ea761226c618 100644
--- a/AnkiDroid/src/main/res/layout/browser_column_heading.xml
+++ b/AnkiDroid/src/main/res/layout/browser_column_heading.xml
@@ -17,9 +17,10 @@
 <com.ichi2.ui.FixedTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="0dp"
     android:layout_height="match_parent"
+    android:minHeight="48dp"
     android:layout_weight="1"
     android:textFontWeight="700"
-    android:paddingStart="4dp"
+    android:paddingStart="8dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
-    android:layout_gravity="center_vertical"
+    android:gravity="center_vertical"
 />
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/card_browser.xml b/AnkiDroid/src/main/res/layout/card_browser.xml
index 755bafbadacb..f55d83242882 100644
--- a/AnkiDroid/src/main/res/layout/card_browser.xml
+++ b/AnkiDroid/src/main/res/layout/card_browser.xml
@@ -18,7 +18,7 @@
         <LinearLayout
             android:id="@+id/browser_column_headings"
             android:layout_width="match_parent"
-            android:background="?attr/selectableItemBackground"
+            android:background="@drawable/browser_heading_bottom_divider"
             android:orientation="horizontal"
             android:paddingVertical="2dp"
             android:layout_height="wrap_content"