From f54c12c7289743eaf761b5126822fa1916ccf8e1 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 30 Jan 2021 18:32:48 +0100
Subject: [PATCH] Relax list entry layouts.

---
 oeffi/res/layout/directions_query_history_entry.xml   |  7 +++----
 oeffi/res/layout/favorites_list_entry.xml             | 11 +++++------
 oeffi/res/layout/navigation_drawer_entry.xml          |  2 +-
 oeffi/res/layout/network_picker_entry.xml             | 11 +++++------
 oeffi/res/layout/network_picker_separator.xml         |  6 +++---
 oeffi/res/layout/plans_picker_entry.xml               | 11 +++++------
 oeffi/res/layout/stations_station_details_entry.xml   |  8 ++++----
 oeffi/res/layout/stations_station_details_header.xml  |  4 ++--
 .../layout/stations_station_details_header_line.xml   |  2 +-
 oeffi/res/layout/stations_station_entry.xml           |  8 ++++----
 10 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/oeffi/res/layout/directions_query_history_entry.xml b/oeffi/res/layout/directions_query_history_entry.xml
index 7979cb1..ce350ab 100644
--- a/oeffi/res/layout/directions_query_history_entry.xml
+++ b/oeffi/res/layout/directions_query_history_entry.xml
@@ -7,8 +7,7 @@
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:foreground="?android:attr/selectableItemBackground">
 
     <LinearLayout
         style="?android:attr/buttonBarStyle"
@@ -29,7 +28,7 @@
                 android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
                 android:drawableTint="@color/fg_less_significant"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+                android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
                 android:paddingRight="@dimen/list_entry_padding_horizontal_cram"
                 android:paddingTop="@dimen/list_entry_padding_vertical_verylax" />
 
@@ -41,7 +40,7 @@
                 android:drawableTint="@color/fg_less_significant"
                 android:gravity="center_vertical"
                 android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+                android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
                 android:paddingRight="@dimen/list_entry_padding_horizontal_cram" />
         </LinearLayout>
 
diff --git a/oeffi/res/layout/favorites_list_entry.xml b/oeffi/res/layout/favorites_list_entry.xml
index c597836..eaff9cc 100644
--- a/oeffi/res/layout/favorites_list_entry.xml
+++ b/oeffi/res/layout/favorites_list_entry.xml
@@ -6,18 +6,17 @@
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:foreground="?android:attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
         <TextView
             android:id="@+id/favorites_list_entry_network"
diff --git a/oeffi/res/layout/navigation_drawer_entry.xml b/oeffi/res/layout/navigation_drawer_entry.xml
index b49426e..44b602d 100644
--- a/oeffi/res/layout/navigation_drawer_entry.xml
+++ b/oeffi/res/layout/navigation_drawer_entry.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
         android:paddingRight="0px"
         android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
diff --git a/oeffi/res/layout/network_picker_entry.xml b/oeffi/res/layout/network_picker_entry.xml
index e2802b9..1922511 100644
--- a/oeffi/res/layout/network_picker_entry.xml
+++ b/oeffi/res/layout/network_picker_entry.xml
@@ -6,16 +6,15 @@
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:foreground="?android:attr/selectableItemBackground">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
         <ImageView
             android:id="@+id/network_picker_entry_icon"
diff --git a/oeffi/res/layout/network_picker_separator.xml b/oeffi/res/layout/network_picker_separator.xml
index d4890f9..f7d15e9 100644
--- a/oeffi/res/layout/network_picker_separator.xml
+++ b/oeffi/res/layout/network_picker_separator.xml
@@ -6,9 +6,9 @@
     android:layout_height="wrap_content"
     android:background="@color/bg_divider"
     android:focusable="false"
-    android:paddingBottom="1dp"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+    android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
+    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
     android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="1dp"
+    android:paddingTop="@dimen/list_entry_padding_vertical_cram"
     android:textColor="@color/fg_less_significant"
     android:textStyle="bold" />
diff --git a/oeffi/res/layout/plans_picker_entry.xml b/oeffi/res/layout/plans_picker_entry.xml
index 44161ee..277983a 100644
--- a/oeffi/res/layout/plans_picker_entry.xml
+++ b/oeffi/res/layout/plans_picker_entry.xml
@@ -6,16 +6,15 @@
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:foreground="?android:attr/selectableItemBackground">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
         <FrameLayout
             android:id="@+id/plans_picker_entry_image"
diff --git a/oeffi/res/layout/stations_station_details_entry.xml b/oeffi/res/layout/stations_station_details_entry.xml
index b2a57ad..550b06a 100644
--- a/oeffi/res/layout/stations_station_details_entry.xml
+++ b/oeffi/res/layout/stations_station_details_entry.xml
@@ -7,10 +7,10 @@
     android:clipToPadding="false"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+    android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
+    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+    android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
+    android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
     <!-- first row -->
 
diff --git a/oeffi/res/layout/stations_station_details_header.xml b/oeffi/res/layout/stations_station_details_header.xml
index 2bf08e4..989e411 100644
--- a/oeffi/res/layout/stations_station_details_header.xml
+++ b/oeffi/res/layout/stations_station_details_header.xml
@@ -6,8 +6,8 @@
     android:background="@color/bg_divider"
     android:orientation="vertical"
     android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
+    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+    android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
     android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
     <LinearLayout
diff --git a/oeffi/res/layout/stations_station_details_header_line.xml b/oeffi/res/layout/stations_station_details_header_line.xml
index 81a5f99..6059ad4 100644
--- a/oeffi/res/layout/stations_station_details_header_line.xml
+++ b/oeffi/res/layout/stations_station_details_header_line.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:baselineAligned="true"
     android:orientation="horizontal"
-    android:paddingTop="1dp">
+    android:paddingTop="@dimen/list_entry_padding_vertical_cram">
 
     <de.schildbach.oeffi.stations.LineView
         android:id="@+id/stations_station_details_header_line_line"
diff --git a/oeffi/res/layout/stations_station_entry.xml b/oeffi/res/layout/stations_station_entry.xml
index e9a8eab..0c8351e 100644
--- a/oeffi/res/layout/stations_station_entry.xml
+++ b/oeffi/res/layout/stations_station_entry.xml
@@ -12,10 +12,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
         <!-- first row -->