mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-06 04:24:29 +00:00
[android] Migrate bookmarks layouts to Material Components
Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
committed by
Konstantin Pastbin
parent
b31819fcfb
commit
8db9289b56
@@ -8,7 +8,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearanceLarge"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?clickableBackground">
|
||||
|
||||
<ImageView
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/iv__color"
|
||||
android:layout_width="@dimen/track_circle_size"
|
||||
android:layout_height="@dimen/track_circle_size"
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
android:layout_below="@+id/ll__bookmark_name"
|
||||
android:layout_marginStart="@dimen/margin_half"
|
||||
android:layout_marginEnd="@dimen/margin_half">
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/tv__bookmark_set_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -52,7 +52,7 @@
|
||||
android:layout_marginEnd="@dimen/margin_quadruple"
|
||||
android:text="@string/list"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3" />
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/tv__bookmark_set"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -73,7 +73,7 @@
|
||||
android:layout_alignBottom="@id/tv__bookmark_set"
|
||||
android:layout_marginEnd="@dimen/margin_quadruple"
|
||||
android:background="@color/divider" />
|
||||
<ImageView
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/iv__bookmark_color"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/MwmWidget.ToolbarTheme">
|
||||
|
||||
<ImageView
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
app:tint="@color/image_view"
|
||||
android:id="@+id/save"
|
||||
app:srcCompat="@drawable/ic_done"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
android:background="@drawable/bg_clickable_card"
|
||||
android:paddingStart="@dimen/margin_base">
|
||||
|
||||
<ImageView
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/iv__bookmark_color"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -22,14 +22,14 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toEndOf="@id/iv__bookmark_color"
|
||||
android:layout_toStartOf="@id/more">
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/tv__bookmark_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body1"/>
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/tv__bookmark_distance"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
android:paddingStart="@dimen/margin_quarter"
|
||||
android:paddingEnd="@dimen/dp_0"
|
||||
android:paddingVertical="@dimen/margin_half_plus">
|
||||
<ImageView
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/image"
|
||||
android:layout_width="@dimen/nav_icon_size"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
app:tint="?colorAccent"
|
||||
tools:srcCompat="@drawable/ic_import" />
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -6,17 +6,19 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bg_clickable_card">
|
||||
<CheckBox
|
||||
<com.google.android.material.checkbox.MaterialCheckBox
|
||||
android:id="@+id/checkbox"
|
||||
android:layout_width="@dimen/margin_double_plus"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignBottom="@id/bottom_line_container"
|
||||
android:layout_margin="@dimen/margin_half"
|
||||
android:padding="@dimen/margin_half"
|
||||
android:background="@null"
|
||||
android:button="@drawable/button_visibility_centre_inset"
|
||||
android:button="@drawable/visibility_selector"
|
||||
android:buttonTint="?accentColorSelector" />
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -36,7 +38,7 @@
|
||||
android:paddingBottom="@dimen/margin_half_plus"
|
||||
android:layout_toStartOf="@id/more"
|
||||
android:orientation="horizontal">
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/size"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -46,7 +48,7 @@
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:text="42000000" />
|
||||
</LinearLayout>
|
||||
<ImageView
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/more"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
android:paddingStart="@dimen/margin_half_plus"
|
||||
android:paddingEnd="@dimen/margin_half_plus">
|
||||
|
||||
<RadioButton
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/rb__selected"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:clickable="false"
|
||||
android:focusable="false"/>
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/tv__set_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
android:paddingStart="@dimen/margin_double"
|
||||
android:paddingEnd="@dimen/margin_double"
|
||||
android:layout_height="@dimen/height_block_base">
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/text"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
@@ -7,18 +7,17 @@
|
||||
android:background="?clickableBackground"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<CheckBox
|
||||
<com.google.android.material.checkbox.MaterialCheckBox
|
||||
android:id="@+id/checkbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/margin_half"
|
||||
android:layout_marginStart="@dimen/margin_half_plus"
|
||||
android:layout_marginEnd="@dimen/margin_base_plus" />
|
||||
android:layout_marginStart="@dimen/margin_half_double_plus"
|
||||
android:layout_marginEnd="@dimen/margin_half_double_plus" />
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -28,7 +27,7 @@
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?fontBody1"
|
||||
tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/size"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
android:paddingTop="@dimen/margin_half_plus"
|
||||
android:paddingEnd="@dimen/margin_base"
|
||||
android:paddingBottom="@dimen/margin_half_plus">
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/text_message"
|
||||
style="?fontHeadline6"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -20,7 +20,7 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="@string/categories" />
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/button"
|
||||
style="?fontSubtitle2"
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
android:background="?cardBackground"
|
||||
android:padding="@dimen/margin_base">
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -19,7 +19,7 @@
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@id/title">
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -27,7 +27,7 @@
|
||||
android:maxLines="3"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3" />
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/more_btn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextView
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/text"
|
||||
style="?fontHeadline6"
|
||||
|
||||
Reference in New Issue
Block a user