[android] Rework some styles text

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-12-30 19:24:24 +01:00
committed by jeanbaptisteC
parent 47f959ec07
commit 899df496ba
19 changed files with 33 additions and 74 deletions

View File

@@ -47,7 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_headline" android:text="@string/about_headline"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/MwmTextAppearance.Headline" android:textAppearance="@style/MwmTextAppearance.Headline6"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
app:layout_constraintTop_toTopOf="@id/version" /> app:layout_constraintTop_toTopOf="@id/version" />
</LinearLayout> </LinearLayout>

View File

@@ -42,7 +42,7 @@
android:layout_marginBottom="@dimen/margin_base" android:layout_marginBottom="@dimen/margin_base"
android:text="@string/about_headline" android:text="@string/about_headline"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/MwmTextAppearance.Headline" android:textAppearance="@style/MwmTextAppearance.Headline6"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView

View File

@@ -38,7 +38,7 @@
app:tint="?colorSecondary"/> app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/head_message" android:id="@+id/head_message"
style="@style/TextAppearance.Headline6" style="@style/MwmTextAppearance.Headline6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base" android:layout_marginTop="@dimen/margin_base"
@@ -48,7 +48,7 @@
android:text="@string/download_map_title" /> android:text="@string/download_map_title" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/download_message" android:id="@+id/download_message"
style="@style/TextAppearance.Body2" style="@style/MwmTextAppearance.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base"

View File

@@ -28,7 +28,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/aa_connected_title" android:text="@string/aa_connected_title"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Headline4" android:textAppearance="@style/MwmTextAppearance.Headline4"
android:textStyle="bold" /> android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/car_used_on_the_car_screen" android:text="@string/car_used_on_the_car_screen"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Body1" /> android:textAppearance="@style/MwmTextAppearance.Body1" />
</LinearLayout> </LinearLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

View File

@@ -20,7 +20,7 @@
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:text="@string/aa_request_permission_activity_text" android:text="@string/aa_request_permission_activity_text"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Headline4" android:textAppearance="@style/MwmTextAppearance.Headline4"
android:textStyle="bold" /> android:textStyle="bold" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

View File

@@ -22,7 +22,7 @@
android:layout_marginStart="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base"
android:maxLines="3" android:maxLines="3"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="@style/TextAppearance.Headline6" android:textAppearance="@style/MwmTextAppearance.Headline6"
tools:text="Title" /> tools:text="Title" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView

View File

@@ -12,7 +12,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base"
android:text="@string/download_country_ask" android:text="@string/download_country_ask"
android:textAppearance="@style/TextAppearance.Body2" android:textAppearance="@style/MwmTextAppearance.Body2"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
<com.google.android.material.progressindicator.LinearProgressIndicator <com.google.android.material.progressindicator.LinearProgressIndicator

View File

@@ -37,7 +37,7 @@
app:buttonTint="@null"/> app:buttonTint="@null"/>
<RadioButton <RadioButton
style="@style/TextAppearance.Subtitle1" style="@style/MwmTextAppearance.Subtitle1"
android:id="@+id/sort_by_name" android:id="@+id/sort_by_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
app:buttonTint="@null"/> app:buttonTint="@null"/>
<RadioButton <RadioButton
style="@style/TextAppearance.Subtitle1" style="@style/MwmTextAppearance.Subtitle1"
android:id="@+id/sort_by_type" android:id="@+id/sort_by_type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
app:buttonTint="@null"/> app:buttonTint="@null"/>
<RadioButton <RadioButton
style="@style/TextAppearance.Subtitle1" style="@style/MwmTextAppearance.Subtitle1"
android:id="@+id/sort_by_distance" android:id="@+id/sort_by_distance"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
app:buttonTint="@null"/> app:buttonTint="@null"/>
<RadioButton <RadioButton
style="@style/TextAppearance.Subtitle1" style="@style/MwmTextAppearance.Subtitle1"
android:id="@+id/sort_by_time" android:id="@+id/sort_by_time"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -17,7 +17,7 @@
android:layout_marginEnd="@dimen/margin_base" android:layout_marginEnd="@dimen/margin_base"
android:paddingTop="@dimen/margin_half" android:paddingTop="@dimen/margin_half"
android:paddingBottom="@dimen/margin_base" android:paddingBottom="@dimen/margin_base"
android:textAppearance="@style/TextAppearance.Headline6" android:textAppearance="@style/MwmTextAppearance.Headline6"
tools:text="Xindian Shitoushan Trail" /> tools:text="Xindian Shitoushan Trail" />
<include <include
layout="@layout/item_divider" layout="@layout/item_divider"

View File

@@ -16,7 +16,7 @@
android:layout_marginStart="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_base" android:layout_marginTop="@dimen/margin_base"
android:text="@string/layers_title" android:text="@string/layers_title"
android:textAppearance="@style/TextAppearance.Headline6" android:textAppearance="@style/MwmTextAppearance.Headline6"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

View File

@@ -30,7 +30,7 @@
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.Body1" android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Bookmark name looooooooooooooooooongasdasdasd" /> tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
<LinearLayout <LinearLayout
android:id="@+id/bottom_line_container" android:id="@+id/bottom_line_container"

View File

@@ -25,7 +25,7 @@
android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin" android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.Body1" android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Bookmark name looooooooooooooooooongasdasdasd" /> tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/size" android:id="@+id/size"
@@ -37,7 +37,7 @@
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
style="@style/TextAppearance.Body2" style="@style/MwmTextAppearance.Body2"
tools:text="42000000" /> tools:text="42000000" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -12,7 +12,7 @@
android:paddingBottom="@dimen/margin_half_plus"> android:paddingBottom="@dimen/margin_half_plus">
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/text_message" android:id="@+id/text_message"
style="@style/TextAppearance.Headline6" style="@style/MwmTextAppearance.Headline6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"

View File

@@ -2,7 +2,7 @@
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text" android:id="@+id/text"
style="@style/TextAppearance.Headline6" style="@style/MwmTextAppearance.Headline6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?windowBackgroundForced" android:background="?windowBackgroundForced"

View File

@@ -14,7 +14,7 @@
android:gravity="center" android:gravity="center"
android:maxWidth="500dp" android:maxWidth="500dp"
android:text="@string/editor_category_unsuitable_title" android:text="@string/editor_category_unsuitable_title"
android:textAppearance="@style/TextAppearance.Headline6" android:textAppearance="@style/MwmTextAppearance.Headline6"
android:textStyle="bold" /> android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/editor_category_unsuitable_text" android:id="@+id/editor_category_unsuitable_text"

View File

@@ -29,7 +29,7 @@
android:layout_marginTop="@dimen/margin_base" android:layout_marginTop="@dimen/margin_base"
android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin" android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.Body1" android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="@string/tracks_title" /> tools:text="@string/tracks_title" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__bookmark_distance" android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
android:layout_marginBottom="@dimen/margin_half_plus" android:layout_marginBottom="@dimen/margin_half_plus"
android:singleLine="true" android:singleLine="true"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textAppearance="@style/TextAppearance.Body2" android:textAppearance="@style/MwmTextAppearance.Body2"
tools:text="@string/by_distance" /> tools:text="@string/by_distance" />
</LinearLayout> </LinearLayout>
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView

View File

@@ -82,7 +82,7 @@
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/place_page_last_checked" android:id="@+id/place_page_last_checked"
style="@style/TextAppearance.Caption" style="@style/MwmTextAppearance.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/margin_half" android:paddingBottom="@dimen/margin_half"

View File

@@ -65,7 +65,7 @@
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/oh_check_date" android:id="@+id/oh_check_date"
style="@style/TextAppearance.Caption" style="@style/MwmTextAppearance.Caption"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"

View File

@@ -15,12 +15,6 @@
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="MwmTextAppearance.Headline">
<item name="android:textSize">@dimen/text_size_headline</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:fontFamily">@string/robotoMedium</item>
</style>
<style name="MwmTextAppearance.Body1" parent="TextAppearance.MaterialComponents.Headline6"> <style name="MwmTextAppearance.Body1" parent="TextAppearance.MaterialComponents.Headline6">
<item name="android:textSize">@dimen/text_size_body_1</item> <item name="android:textSize">@dimen/text_size_body_1</item>
<item name="android:textColor">?android:textColorPrimary</item> <item name="android:textColor">?android:textColorPrimary</item>
@@ -176,94 +170,59 @@
<item name="android:textColor">@color/white_secondary</item> <item name="android:textColor">@color/white_secondary</item>
</style> </style>
<style name="TextAppearance.Headline1" <style name="MwmTextAppearance.Headline1"
parent="TextAppearance.Material3.DisplayLarge"> parent="TextAppearance.Material3.DisplayLarge">
<item name="fontFamily">@string/robotoLight</item> <item name="fontFamily">@string/robotoLight</item>
<item name="android:fontFamily">@string/robotoLight</item> <item name="android:fontFamily">@string/robotoLight</item>
<item name="android:textSize">96sp</item> <item name="android:textSize">96sp</item>
</style> </style>
<style name="TextAppearance.Headline2" <style name="MwmTextAppearance.Headline2"
parent="TextAppearance.Material3.DisplayLarge"> parent="TextAppearance.Material3.DisplayLarge">
<item name="fontFamily">@string/robotoRegular</item> <item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item> <item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">60sp</item> <item name="android:textSize">60sp</item>
</style> </style>
<style name="TextAppearance.Headline3" <style name="MwmTextAppearance.Headline3"
parent="TextAppearance.Material3.DisplayMedium"> parent="TextAppearance.Material3.DisplayMedium">
<item name="fontFamily">@string/robotoRegular</item> <item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item> <item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">48sp</item> <item name="android:textSize">48sp</item>
</style> </style>
<style name="TextAppearance.Headline4" <style name="MwmTextAppearance.Headline4"
parent="TextAppearance.Material3.HeadlineLarge"> parent="TextAppearance.Material3.HeadlineLarge">
<item name="fontFamily">@string/robotoRegular</item> <item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item> <item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">34sp</item> <item name="android:textSize">34sp</item>
</style> </style>
<style name="TextAppearance.Headline5" <style name="MwmTextAppearance.Headline5"
parent="TextAppearance.Material3.HeadlineMedium"> parent="TextAppearance.Material3.HeadlineMedium">
<item name="fontFamily">@string/robotoRegular</item> <item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item> <item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">24sp</item> <item name="android:textSize">24sp</item>
</style> </style>
<style name="TextAppearance.Headline6" <style name="MwmTextAppearance.Headline6"
parent="TextAppearance.Material3.HeadlineSmall"> parent="TextAppearance.Material3.HeadlineSmall">
<item name="fontFamily">@string/robotoMedium</item> <item name="fontFamily">@string/robotoMedium</item>
<item name="android:fontFamily">@string/robotoMedium</item> <item name="android:fontFamily">@string/robotoMedium</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="TextAppearance.Subtitle1" <style name="MwmTextAppearance.Subtitle1"
parent="TextAppearance.Material3.TitleMedium"> parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">@string/robotoRegular</item> <item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item> <item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="TextAppearance.Subtitle2" <style name="MwmTextAppearance.Subtitle2"
parent="TextAppearance.Material3.TitleSmall"> parent="TextAppearance.Material3.TitleSmall">
<item name="fontFamily">@string/robotoMedium</item> <item name="fontFamily">@string/robotoMedium</item>
<item name="android:fontFamily">@string/robotoMedium</item> <item name="android:fontFamily">@string/robotoMedium</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
</style> </style>
<style name="TextAppearance.Body1"
parent="TextAppearance.Material3.BodyLarge">
<item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.Body2"
parent="TextAppearance.Material3.BodyMedium">
<item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.Button"
parent="TextAppearance.MaterialComponents.Button">
<item name="fontFamily">@string/robotoMedium</item>
<item name="android:fontFamily">@string/robotoMedium</item>
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.Caption"
parent="TextAppearance.Material3.LabelMedium">
<item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">12sp</item>
</style>
<style name="TextAppearance.Overline"
parent="TextAppearance.MaterialComponents.Overline">
<item name="fontFamily">@string/robotoRegular</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:textSize">10sp</item>
</style>
</resources> </resources>