[android] Use material divider instead view with background

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2025-12-19 13:03:36 +00:00 · 2025-10-19 11:55:11 +02:00
parent dc20e576f7
commit be3205a82d
20 changed files with 46 additions and 91 deletions
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -287,12 +287,11 @@
        android:text="@string/email"
        app:drawableStartCompat="@drawable/ic_email" />

-      <View
+      <com.google.android.material.divider.MaterialDivider
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:layout_marginBottom="@dimen/margin_quarter"
-        android:layout_marginTop="@dimen/margin_quarter"
-        android:background="?dividerHorizontal" />
+        android:layout_marginTop="@dimen/margin_quarter" />

      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/privacy_policy"
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -218,12 +218,11 @@
        android:textAlignment="viewStart"
        app:drawableStartCompat="@drawable/ic_email" />

-    <View
+    <com.google.android.material.divider.MaterialDivider
        android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/divider_height"
        android:layout_marginBottom="@dimen/margin_quarter"
-        android:layout_marginTop="@dimen/margin_quarter"
-        android:background="?dividerHorizontal" />
+        android:layout_marginTop="@dimen/margin_quarter" />

    <com.google.android.material.textview.MaterialTextView
        android:id="@+id/privacy_policy"
--- a/android/app/src/main/res/layout/dialog_missed_map.xml
+++ b/android/app/src/main/res/layout/dialog_missed_map.xml
@@ -17,10 +17,7 @@
    android:visibility="gone"
    tools:visibility="visible"/>

-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerHorizontal"/>
+  <include layout="@layout/item_divider" />

  <!-- Outer FrameLayout must NOT be removed -->
  <FrameLayout
@@ -34,8 +31,5 @@
      android:layout_height="wrap_content"/>
  </FrameLayout>

-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerHorizontal"/>
+  <include layout="@layout/item_divider" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/dialog_missed_maps.xml
+++ b/android/app/src/main/res/layout/dialog_missed_maps.xml
@@ -18,11 +18,9 @@
    tools:text="Select maps to download"
    tools:visibility="visible"/>

-  <View
+  <include
    android:id="@+id/divider_top"
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerHorizontal"/>
+    layout="@layout/item_divider" />

  <ExpandableListView
    android:id="@+id/items_frame"
@@ -32,9 +30,7 @@
    android:listSelector="?clickableBackground"
    android:drawSelectorOnTop="true"/>

-  <View
+  <include
    android:id="@+id/divider_bottom"
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerHorizontal"/>
+    layout="@layout/item_divider" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/divider_horizontal.xml
+++ b/android/app/src/main/res/layout/divider_horizontal.xml
@@ -1,5 +0,0 @@
-<View
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="@dimen/divider_height"
-  android:background="?dividerHorizontal"/>
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -69,13 +69,12 @@
      android:textAlignment="viewStart"
      android:textAppearance="@style/MwmTextAppearance.Body1"
      app:drawableEndCompat="@drawable/ic_arrow_down" />
-    <View
+    <com.google.android.material.divider.MaterialDivider
      android:id="@+id/divideerrr"
      android:layout_width="match_parent"
-      android:layout_height="1dp"
+      android:layout_height="@dimen/divider_height"
      android:layout_alignBottom="@id/tv__bookmark_set"
-      android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="@color/divider" />
+      android:layout_marginEnd="@dimen/margin_quadruple" />
    <com.google.android.material.imageview.ShapeableImageView
      android:id="@+id/iv__bookmark_color"
      android:layout_width="wrap_content"
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -20,7 +20,7 @@
      android:textAppearance="?fontHeadline6"
      tools:text="Xindian Shitoushan Trail" />
    <include
-      layout="@layout/list_divider"
+      layout="@layout/item_divider"
      android:layout_width="match_parent"
      android:layout_height="@dimen/divider_height"
      android:layout_marginStart="@dimen/margin_base"
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -38,7 +38,7 @@
      android:layout_height="match_parent"
      android:padding="@dimen/margin_half_double_plus"/>
  </LinearLayout>
-  <include layout="@layout/list_divider"/>
+  <include layout="@layout/item_divider"/>
  <LinearLayout
    android:orientation="horizontal"
    android:minHeight="@dimen/height_block_base"
@@ -60,7 +60,7 @@
      android:layout_height="match_parent"
      android:padding="@dimen/margin_half_double_plus"/>
  </LinearLayout>
-  <include layout="@layout/list_divider"/>
+  <include layout="@layout/item_divider"/>
  <LinearLayout
    android:orientation="horizontal"
    android:minHeight="@dimen/height_block_base"
@@ -82,7 +82,7 @@
      android:layout_height="match_parent"
      android:padding="@dimen/margin_half_double_plus"/>
  </LinearLayout>
-  <include layout="@layout/list_divider"/>
+  <include layout="@layout/item_divider"/>
  <LinearLayout
    android:orientation="horizontal"
    android:minHeight="@dimen/height_block_base"
@@ -104,7 +104,7 @@
      android:padding="@dimen/margin_half_double_plus"
      android:layout_height="match_parent"/>
  </LinearLayout>
-  <include layout="@layout/list_divider"/>
+  <include layout="@layout/item_divider"/>
  <LinearLayout
    android:orientation="horizontal"
    android:minHeight="@dimen/height_block_base"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -131,13 +131,12 @@
              android:textAppearance="@style/MwmTextAppearance.Body1"
              tools:text="Red str."
              app:drawableEndCompat="@drawable/ic_arrow_down" />
-          <View
+          <com.google.android.material.divider.MaterialDivider
              android:layout_width="match_parent"
-              android:layout_height="1dp"
+              android:layout_height="@dimen/divider_height"
              android:layout_alignStart="@id/street"
              android:layout_below="@id/street"
-              android:layout_marginTop="@dimen/margin_quarter_plus"
-              android:background="?dividerHorizontal"/>
+              android:layout_marginTop="@dimen/margin_quarter_plus" />
        </RelativeLayout>
        <include
            android:id="@+id/block_building"
@@ -196,13 +195,12 @@
              android:textAppearance="@style/MwmTextAppearance.Body1"
              tools:text="italian, russian, coffee_shop, sandwich, dessert, cake, regional, sausage, sandwich, breakfast, pizza"
              app:drawableEndCompat="@drawable/ic_arrow_down" />
-          <View
+          <com.google.android.material.divider.MaterialDivider
              android:layout_width="match_parent"
-              android:layout_height="1dp"
+              android:layout_height="@dimen/divider_height"
              android:layout_alignStart="@id/cuisine"
              android:layout_below="@id/cuisine"
-              android:layout_marginTop="@dimen/margin_quarter_plus"
-              android:background="?dividerHorizontal"/>
+              android:layout_marginTop="@dimen/margin_quarter_plus" />
        </RelativeLayout>

        <include
@@ -302,13 +300,12 @@
              android:textAppearance="@style/MwmTextAppearance.Body1"
              tools:text="Red str."
              app:drawableEndCompat="@drawable/ic_arrow_down" />
-          <View
+          <com.google.android.material.divider.MaterialDivider
              android:layout_width="match_parent"
-              android:layout_height="1dp"
+              android:layout_height="@dimen/divider_height"
              android:layout_alignStart="@id/self_service"
              android:layout_below="@id/self_service"
-              android:layout_marginTop="@dimen/margin_quarter_plus"
-              android:background="?dividerHorizontal"/>
+              android:layout_marginTop="@dimen/margin_quarter_plus" />
        </RelativeLayout>

        <RelativeLayout
--- a/android/app/src/main/res/layout/fragment_routing.xml
+++ b/android/app/src/main/res/layout/fragment_routing.xml
@@ -39,10 +39,7 @@
    android:layout_height="0dp"
    android:layout_weight="1"/>

-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerHorizontal"/>
+  <include layout="@layout/item_divider" />

  <include
    layout="@layout/start_button"
--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -43,11 +43,9 @@
          android:layout_height="@dimen/tabs_height"
          android:elevation="@dimen/appbar_elevation"/>

-        <View
+        <include
          android:id="@+id/tabs_divider"
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="?dividerHorizontal"/>
+          layout="@layout/item_divider" />

        <androidx.viewpager.widget.ViewPager
          android:id="@+id/pages"
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -62,10 +62,7 @@
          android:textAppearance="@style/MwmTextAppearance.Body3"
          android:textColor="?colorSecondary"/>

-        <View
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="?dividerHorizontal" />
+        <include layout="@layout/item_divider" />

        <WebView
          android:id="@+id/wv__examples"
--- a/android/app/src/main/res/layout/item_divider.xml
+++ b/android/app/src/main/res/layout/item_divider.xml
@@ -0,0 +1,4 @@
+<com.google.android.material.divider.MaterialDivider
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="@dimen/divider_height" />
--- a/android/app/src/main/res/layout/item_opening_hours.xml
+++ b/android/app/src/main/res/layout/item_opening_hours.xml
@@ -37,11 +37,7 @@
      android:textSize="@dimen/text_size_body_1"
      android:visibility="visible"/>

-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:layout_marginTop="@dimen/margin_half"
-      android:background="?dividerHorizontal"/>
+    <include layout="@layout/item_divider" />

  </LinearLayout>

--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -154,10 +154,7 @@

    </LinearLayout>

-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?dividerHorizontal"/>
+    <include layout="@layout/item_divider" />

    <LinearLayout
      android:id="@+id/allday"
@@ -191,10 +188,7 @@
      android:visibility="gone"
      tools:visibility="visible">

-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?dividerHorizontal"/>
+      <include layout="@layout/item_divider" />

      <LinearLayout
        android:id="@+id/time_open_close"
@@ -256,11 +250,7 @@

      </LinearLayout>

-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?dividerHorizontal"/>
-
+      <include layout="@layout/item_divider" />

      <LinearLayout
        android:id="@+id/closed_host"
--- a/android/app/src/main/res/layout/item_timetable_closed_hours.xml
+++ b/android/app/src/main/res/layout/item_timetable_closed_hours.xml
@@ -38,10 +38,9 @@
    android:textAppearance="@style/MwmTextAppearance.Body1"
    tools:text="15:00--16:00"/>

-  <View
+  <com.google.android.material.divider.MaterialDivider
    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:layout_alignParentBottom="true"
-    android:background="?dividerHorizontal"/>
+    android:layout_height="@dimen/divider_height"
+    android:layout_alignParentBottom="true" />

 </RelativeLayout>
--- a/android/app/src/main/res/layout/list_divider.xml
+++ b/android/app/src/main/res/layout/list_divider.xml
@@ -1,5 +0,0 @@
-<View
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="@dimen/divider_height"
-  android:background="?android:attr/listDivider"/>
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -19,5 +19,5 @@
    tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>

  <include
-    layout="@layout/divider_horizontal"/>
+    layout="@layout/item_divider"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/place_page_description_layout.xml
+++ b/android/app/src/main/res/layout/place_page_description_layout.xml
@@ -38,5 +38,5 @@
    android:text="@string/category_desc_more"
    android:background="@android:color/transparent"/>
  <include
-    layout="@layout/divider_horizontal"/>
+    layout="@layout/item_divider"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/pp_buttons_fragment.xml
+++ b/android/app/src/main/res/layout/pp_buttons_fragment.xml
@@ -7,7 +7,7 @@
  android:background="?ppButtonsBackground"
  android:orientation="horizontal"
  android:layout_gravity="bottom">
-  <include layout="@layout/divider_horizontal" />
+  <include layout="@layout/item_divider" />
  <LinearLayout
    android:id="@+id/container"
    android:layout_width="match_parent"