mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 13:03:36 +00:00
[android] Use material divider instead view with background
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
committed by
jeanbaptisteC
parent
dc20e576f7
commit
be3205a82d
@@ -287,12 +287,11 @@
|
|||||||
android:text="@string/email"
|
android:text="@string/email"
|
||||||
app:drawableStartCompat="@drawable/ic_email" />
|
app:drawableStartCompat="@drawable/ic_email" />
|
||||||
|
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="1dp"
|
||||||
android:layout_marginBottom="@dimen/margin_quarter"
|
android:layout_marginBottom="@dimen/margin_quarter"
|
||||||
android:layout_marginTop="@dimen/margin_quarter"
|
android:layout_marginTop="@dimen/margin_quarter" />
|
||||||
android:background="?dividerHorizontal" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:id="@+id/privacy_policy"
|
android:id="@+id/privacy_policy"
|
||||||
|
|||||||
@@ -218,12 +218,11 @@
|
|||||||
android:textAlignment="viewStart"
|
android:textAlignment="viewStart"
|
||||||
app:drawableStartCompat="@drawable/ic_email" />
|
app:drawableStartCompat="@drawable/ic_email" />
|
||||||
|
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_marginBottom="@dimen/margin_quarter"
|
android:layout_marginBottom="@dimen/margin_quarter"
|
||||||
android:layout_marginTop="@dimen/margin_quarter"
|
android:layout_marginTop="@dimen/margin_quarter" />
|
||||||
android:background="?dividerHorizontal" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:id="@+id/privacy_policy"
|
android:id="@+id/privacy_policy"
|
||||||
|
|||||||
@@ -17,10 +17,7 @@
|
|||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
tools:visibility="visible"/>
|
tools:visibility="visible"/>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
<!-- Outer FrameLayout must NOT be removed -->
|
<!-- Outer FrameLayout must NOT be removed -->
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
@@ -34,8 +31,5 @@
|
|||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -18,11 +18,9 @@
|
|||||||
tools:text="Select maps to download"
|
tools:text="Select maps to download"
|
||||||
tools:visibility="visible"/>
|
tools:visibility="visible"/>
|
||||||
|
|
||||||
<View
|
<include
|
||||||
android:id="@+id/divider_top"
|
android:id="@+id/divider_top"
|
||||||
android:layout_width="match_parent"
|
layout="@layout/item_divider" />
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
<ExpandableListView
|
<ExpandableListView
|
||||||
android:id="@+id/items_frame"
|
android:id="@+id/items_frame"
|
||||||
@@ -32,9 +30,7 @@
|
|||||||
android:listSelector="?clickableBackground"
|
android:listSelector="?clickableBackground"
|
||||||
android:drawSelectorOnTop="true"/>
|
android:drawSelectorOnTop="true"/>
|
||||||
|
|
||||||
<View
|
<include
|
||||||
android:id="@+id/divider_bottom"
|
android:id="@+id/divider_bottom"
|
||||||
android:layout_width="match_parent"
|
layout="@layout/item_divider" />
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -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"/>
|
|
||||||
@@ -69,13 +69,12 @@
|
|||||||
android:textAlignment="viewStart"
|
android:textAlignment="viewStart"
|
||||||
android:textAppearance="@style/MwmTextAppearance.Body1"
|
android:textAppearance="@style/MwmTextAppearance.Body1"
|
||||||
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:id="@+id/divideerrr"
|
android:id="@+id/divideerrr"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_alignBottom="@id/tv__bookmark_set"
|
android:layout_alignBottom="@id/tv__bookmark_set"
|
||||||
android:layout_marginEnd="@dimen/margin_quadruple"
|
android:layout_marginEnd="@dimen/margin_quadruple" />
|
||||||
android:background="@color/divider" />
|
|
||||||
<com.google.android.material.imageview.ShapeableImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/iv__bookmark_color"
|
android:id="@+id/iv__bookmark_color"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
android:textAppearance="?fontHeadline6"
|
android:textAppearance="?fontHeadline6"
|
||||||
tools:text="Xindian Shitoushan Trail" />
|
tools:text="Xindian Shitoushan Trail" />
|
||||||
<include
|
<include
|
||||||
layout="@layout/list_divider"
|
layout="@layout/item_divider"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="@dimen/divider_height"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_marginStart="@dimen/margin_base"
|
android:layout_marginStart="@dimen/margin_base"
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/margin_half_double_plus"/>
|
android:padding="@dimen/margin_half_double_plus"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<include layout="@layout/list_divider"/>
|
<include layout="@layout/item_divider"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:minHeight="@dimen/height_block_base"
|
android:minHeight="@dimen/height_block_base"
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/margin_half_double_plus"/>
|
android:padding="@dimen/margin_half_double_plus"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<include layout="@layout/list_divider"/>
|
<include layout="@layout/item_divider"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:minHeight="@dimen/height_block_base"
|
android:minHeight="@dimen/height_block_base"
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/margin_half_double_plus"/>
|
android:padding="@dimen/margin_half_double_plus"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<include layout="@layout/list_divider"/>
|
<include layout="@layout/item_divider"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:minHeight="@dimen/height_block_base"
|
android:minHeight="@dimen/height_block_base"
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
android:padding="@dimen/margin_half_double_plus"
|
android:padding="@dimen/margin_half_double_plus"
|
||||||
android:layout_height="match_parent"/>
|
android:layout_height="match_parent"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<include layout="@layout/list_divider"/>
|
<include layout="@layout/item_divider"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:minHeight="@dimen/height_block_base"
|
android:minHeight="@dimen/height_block_base"
|
||||||
|
|||||||
@@ -131,13 +131,12 @@
|
|||||||
android:textAppearance="@style/MwmTextAppearance.Body1"
|
android:textAppearance="@style/MwmTextAppearance.Body1"
|
||||||
tools:text="Red str."
|
tools:text="Red str."
|
||||||
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_alignStart="@id/street"
|
android:layout_alignStart="@id/street"
|
||||||
android:layout_below="@id/street"
|
android:layout_below="@id/street"
|
||||||
android:layout_marginTop="@dimen/margin_quarter_plus"
|
android:layout_marginTop="@dimen/margin_quarter_plus" />
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
<include
|
<include
|
||||||
android:id="@+id/block_building"
|
android:id="@+id/block_building"
|
||||||
@@ -196,13 +195,12 @@
|
|||||||
android:textAppearance="@style/MwmTextAppearance.Body1"
|
android:textAppearance="@style/MwmTextAppearance.Body1"
|
||||||
tools:text="italian, russian, coffee_shop, sandwich, dessert, cake, regional, sausage, sandwich, breakfast, pizza"
|
tools:text="italian, russian, coffee_shop, sandwich, dessert, cake, regional, sausage, sandwich, breakfast, pizza"
|
||||||
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_alignStart="@id/cuisine"
|
android:layout_alignStart="@id/cuisine"
|
||||||
android:layout_below="@id/cuisine"
|
android:layout_below="@id/cuisine"
|
||||||
android:layout_marginTop="@dimen/margin_quarter_plus"
|
android:layout_marginTop="@dimen/margin_quarter_plus" />
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
@@ -302,13 +300,12 @@
|
|||||||
android:textAppearance="@style/MwmTextAppearance.Body1"
|
android:textAppearance="@style/MwmTextAppearance.Body1"
|
||||||
tools:text="Red str."
|
tools:text="Red str."
|
||||||
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
app:drawableEndCompat="@drawable/ic_arrow_down" />
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_alignStart="@id/self_service"
|
android:layout_alignStart="@id/self_service"
|
||||||
android:layout_below="@id/self_service"
|
android:layout_below="@id/self_service"
|
||||||
android:layout_marginTop="@dimen/margin_quarter_plus"
|
android:layout_marginTop="@dimen/margin_quarter_plus" />
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
|||||||
@@ -39,10 +39,7 @@
|
|||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1"/>
|
android:layout_weight="1"/>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/start_button"
|
layout="@layout/start_button"
|
||||||
|
|||||||
@@ -43,11 +43,9 @@
|
|||||||
android:layout_height="@dimen/tabs_height"
|
android:layout_height="@dimen/tabs_height"
|
||||||
android:elevation="@dimen/appbar_elevation"/>
|
android:elevation="@dimen/appbar_elevation"/>
|
||||||
|
|
||||||
<View
|
<include
|
||||||
android:id="@+id/tabs_divider"
|
android:id="@+id/tabs_divider"
|
||||||
android:layout_width="match_parent"
|
layout="@layout/item_divider" />
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
<androidx.viewpager.widget.ViewPager
|
<androidx.viewpager.widget.ViewPager
|
||||||
android:id="@+id/pages"
|
android:id="@+id/pages"
|
||||||
|
|||||||
@@ -62,10 +62,7 @@
|
|||||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||||
android:textColor="?colorSecondary"/>
|
android:textColor="?colorSecondary"/>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal" />
|
|
||||||
|
|
||||||
<WebView
|
<WebView
|
||||||
android:id="@+id/wv__examples"
|
android:id="@+id/wv__examples"
|
||||||
|
|||||||
4
android/app/src/main/res/layout/item_divider.xml
Normal file
4
android/app/src/main/res/layout/item_divider.xml
Normal file
@@ -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" />
|
||||||
@@ -37,11 +37,7 @@
|
|||||||
android:textSize="@dimen/text_size_body_1"
|
android:textSize="@dimen/text_size_body_1"
|
||||||
android:visibility="visible"/>
|
android:visibility="visible"/>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:layout_marginTop="@dimen/margin_half"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|||||||
@@ -154,10 +154,7 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/allday"
|
android:id="@+id/allday"
|
||||||
@@ -191,10 +188,7 @@
|
|||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
tools:visibility="visible">
|
tools:visibility="visible">
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/time_open_close"
|
android:id="@+id/time_open_close"
|
||||||
@@ -256,11 +250,7 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<View
|
<include layout="@layout/item_divider" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/closed_host"
|
android:id="@+id/closed_host"
|
||||||
|
|||||||
@@ -38,10 +38,9 @@
|
|||||||
android:textAppearance="@style/MwmTextAppearance.Body1"
|
android:textAppearance="@style/MwmTextAppearance.Body1"
|
||||||
tools:text="15:00--16:00"/>
|
tools:text="15:00--16:00"/>
|
||||||
|
|
||||||
<View
|
<com.google.android.material.divider.MaterialDivider
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="@dimen/divider_height"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true" />
|
||||||
android:background="?dividerHorizontal"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
@@ -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"/>
|
|
||||||
@@ -19,5 +19,5 @@
|
|||||||
tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
|
tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/divider_horizontal"/>
|
layout="@layout/item_divider"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -38,5 +38,5 @@
|
|||||||
android:text="@string/category_desc_more"
|
android:text="@string/category_desc_more"
|
||||||
android:background="@android:color/transparent"/>
|
android:background="@android:color/transparent"/>
|
||||||
<include
|
<include
|
||||||
layout="@layout/divider_horizontal"/>
|
layout="@layout/item_divider"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
android:background="?ppButtonsBackground"
|
android:background="?ppButtonsBackground"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_gravity="bottom">
|
android:layout_gravity="bottom">
|
||||||
<include layout="@layout/divider_horizontal" />
|
<include layout="@layout/item_divider" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/container"
|
android:id="@+id/container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
Reference in New Issue
Block a user