Fix: Card Browser Border and Header Height.

ankidroid · Feb 2, 2025 · 2c3f0de · 2c3f0de
1 parent b0d7b48
commit 2c3f0de
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 28 deletions.
diff --git 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
@@ -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>
diff --git 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"
 />
diff --git a/AnkiDroid/src/main/res/layout/browser_column_divider.xml b/AnkiDroid/src/main/res/layout/browser_column_divider.xml
diff --git 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"
 />
diff --git 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"