From 899df496baac720a2068dfbbc92fde266547dd8e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 30 Dec 2025 19:24:24 +0100
Subject: [PATCH] [android] Rework some styles text

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../app/src/main/res/layout-land/about.xml    |  2 +-
 android/app/src/main/res/layout/about.xml     |  2 +-
 .../layout/activity_download_resources.xml    |  4 +-
 .../res/layout/activity_map_placeholder.xml   |  4 +-
 .../layout/activity_request_permissions.xml   |  2 +-
 .../app/src/main/res/layout/bottom_sheet.xml  |  2 +-
 .../main/res/layout/button_with_progress.xml  |  2 +-
 .../main/res/layout/dialog_sorting_types.xml  |  8 +--
 .../res/layout/elevation_profile_internal.xml |  2 +-
 .../res/layout/fragment_toggle_map_layer.xml  |  2 +-
 .../res/layout/item_bookmark_category.xml     |  2 +-
 .../res/layout/item_bookmark_collection.xml   |  4 +-
 .../item_bookmark_group_list_header.xml       |  2 +-
 .../main/res/layout/item_category_title.xml   |  2 +-
 .../layout/item_feature_category_footer.xml   |  2 +-
 .../app/src/main/res/layout/item_track.xml    |  4 +-
 .../main/res/layout/place_page_details.xml    |  2 +-
 .../place_page_opening_hours_fragment.xml     |  2 +-
 .../app/src/main/res/values/styles-text.xml   | 57 +++----------------
 19 files changed, 33 insertions(+), 74 deletions(-)

diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml
index 1a8cd020e..9903aeb4d 100644
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:text="@string/about_headline"
             android:textAlignment="center"
-            android:textAppearance="@style/MwmTextAppearance.Headline"
+            android:textAppearance="@style/MwmTextAppearance.Headline6"
             android:textColor="?android:textColorPrimary"
             app:layout_constraintTop_toTopOf="@id/version" />
         </LinearLayout>
diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml
index accd25f82..3c9c8ee35 100644
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -42,7 +42,7 @@
         android:layout_marginBottom="@dimen/margin_base"
         android:text="@string/about_headline"
         android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.Headline"
+        android:textAppearance="@style/MwmTextAppearance.Headline6"
         android:textColor="?android:textColorPrimary" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/android/app/src/main/res/layout/activity_download_resources.xml b/android/app/src/main/res/layout/activity_download_resources.xml
index 60cd73229..35cd546ec 100644
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -38,7 +38,7 @@
         app:tint="?colorSecondary"/>
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/head_message"
-        style="@style/TextAppearance.Headline6"
+        style="@style/MwmTextAppearance.Headline6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
@@ -48,7 +48,7 @@
         android:text="@string/download_map_title" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/download_message"
-        style="@style/TextAppearance.Body2"
+        style="@style/MwmTextAppearance.Body2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"
diff --git a/android/app/src/main/res/layout/activity_map_placeholder.xml b/android/app/src/main/res/layout/activity_map_placeholder.xml
index c3293751b..27ac675ea 100644
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -28,7 +28,7 @@
         android:layout_marginBottom="8dp"
         android:text="@string/aa_connected_title"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Headline4"
+        android:textAppearance="@style/MwmTextAppearance.Headline4"
         android:textStyle="bold" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:text="@string/car_used_on_the_car_screen"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Body1" />
+        android:textAppearance="@style/MwmTextAppearance.Body1" />
   </LinearLayout>
 
   <com.google.android.material.button.MaterialButton
diff --git a/android/app/src/main/res/layout/activity_request_permissions.xml b/android/app/src/main/res/layout/activity_request_permissions.xml
index 79588a403..82a25a947 100644
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -20,7 +20,7 @@
       android:layout_marginStart="32dp"
       android:text="@string/aa_request_permission_activity_text"
       android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.Headline4"
+      android:textAppearance="@style/MwmTextAppearance.Headline4"
       android:textStyle="bold" />
 
   <com.google.android.material.button.MaterialButton
diff --git a/android/app/src/main/res/layout/bottom_sheet.xml b/android/app/src/main/res/layout/bottom_sheet.xml
index 5d10e2543..8bce3e36a 100644
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -22,7 +22,7 @@
     android:layout_marginStart="@dimen/margin_base"
     android:maxLines="3"
     android:ellipsize="end"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/MwmTextAppearance.Headline6"
     tools:text="Title" />
 
   <androidx.recyclerview.widget.RecyclerView
diff --git a/android/app/src/main/res/layout/button_with_progress.xml b/android/app/src/main/res/layout/button_with_progress.xml
index 4df8f2b39..343e1e35e 100644
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -12,7 +12,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base"
     android:text="@string/download_country_ask"
-    android:textAppearance="@style/TextAppearance.Body2"
+    android:textAppearance="@style/MwmTextAppearance.Body2"
     android:visibility="gone"
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator
diff --git a/android/app/src/main/res/layout/dialog_sorting_types.xml b/android/app/src/main/res/layout/dialog_sorting_types.xml
index 6166fe136..b5b6b84fe 100644
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -37,7 +37,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_type"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_distance"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_time"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/elevation_profile_internal.xml b/android/app/src/main/res/layout/elevation_profile_internal.xml
index 7db0593dc..9bf24039d 100644
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -17,7 +17,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:paddingTop="@dimen/margin_half"
       android:paddingBottom="@dimen/margin_base"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="@style/MwmTextAppearance.Headline6"
       tools:text="Xindian Shitoushan Trail" />
     <include
       layout="@layout/item_divider"
diff --git a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
index 40837c734..13a83e1ac 100644
--- a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
+++ b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
@@ -16,7 +16,7 @@
       android:layout_marginStart="@dimen/margin_base"
       android:layout_marginTop="@dimen/margin_base"
       android:text="@string/layers_title"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="@style/MwmTextAppearance.Headline6"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
     <com.google.android.material.button.MaterialButton
diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml
index b845165ec..a722a4b4d 100644
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -30,7 +30,7 @@
     android:ellipsize="middle"
     android:singleLine="true"
     android:textAlignment="viewStart"
-    android:textAppearance="@style/TextAppearance.Body1"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
     tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
   <LinearLayout
     android:id="@+id/bottom_line_container"
diff --git a/android/app/src/main/res/layout/item_bookmark_collection.xml b/android/app/src/main/res/layout/item_bookmark_collection.xml
index 47584c2bf..db8aad3a3 100644
--- a/android/app/src/main/res/layout/item_bookmark_collection.xml
+++ b/android/app/src/main/res/layout/item_bookmark_collection.xml
@@ -25,7 +25,7 @@
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:ellipsize="middle"
       android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/size"
@@ -37,7 +37,7 @@
       android:ellipsize="end"
       android:singleLine="true"
       android:textColor="?android:textColorSecondary"
-      style="@style/TextAppearance.Body2"
+      style="@style/MwmTextAppearance.Body2"
       tools:text="42000000" />
   </LinearLayout>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
index 9ac6ba609..78494b65a 100644
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
@@ -12,7 +12,7 @@
   android:paddingBottom="@dimen/margin_half_plus">
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/text_message"
-    style="@style/TextAppearance.Headline6"
+    style="@style/MwmTextAppearance.Headline6"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_alignParentStart="true"
diff --git a/android/app/src/main/res/layout/item_category_title.xml b/android/app/src/main/res/layout/item_category_title.xml
index 0f98b8e5f..148aaf3e9 100644
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.textview.MaterialTextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/text"
-  style="@style/TextAppearance.Headline6"
+  style="@style/MwmTextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="?windowBackgroundForced"
diff --git a/android/app/src/main/res/layout/item_feature_category_footer.xml b/android/app/src/main/res/layout/item_feature_category_footer.xml
index 65b272659..cb7c3de0d 100644
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -14,7 +14,7 @@
     android:gravity="center"
     android:maxWidth="500dp"
     android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/MwmTextAppearance.Headline6"
     android:textStyle="bold" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"
diff --git a/android/app/src/main/res/layout/item_track.xml b/android/app/src/main/res/layout/item_track.xml
index b8a92cfe3..d2f83cadd 100644
--- a/android/app/src/main/res/layout/item_track.xml
+++ b/android/app/src/main/res/layout/item_track.xml
@@ -29,7 +29,7 @@
       android:layout_marginTop="@dimen/margin_base"
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       tools:text="@string/tracks_title" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
       android:layout_marginBottom="@dimen/margin_half_plus"
       android:singleLine="true"
       android:textColor="?android:textColorSecondary"
-      android:textAppearance="@style/TextAppearance.Body2"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
       tools:text="@string/by_distance" />
   </LinearLayout>
   <com.google.android.material.imageview.ShapeableImageView
diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml
index 2803e70a2..42698da71 100644
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -82,7 +82,7 @@
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/place_page_last_checked"
-    style="@style/TextAppearance.Caption"
+    style="@style/MwmTextAppearance.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/margin_half"
diff --git a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
index 7905eb6fa..3936e3c72 100644
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -65,7 +65,7 @@
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/oh_check_date"
-    style="@style/TextAppearance.Caption"
+    style="@style/MwmTextAppearance.Caption"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:layout_alignParentEnd="true"
diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml
index 6e3e81765..1be168e88 100644
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -15,12 +15,6 @@
     <item name="android:textStyle">bold</item>
   </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">
     <item name="android:textSize">@dimen/text_size_body_1</item>
     <item name="android:textColor">?android:textColorPrimary</item>
@@ -176,94 +170,59 @@
     <item name="android:textColor">@color/white_secondary</item>
   </style>
 
-  <style name="TextAppearance.Headline1"
+  <style name="MwmTextAppearance.Headline1"
     parent="TextAppearance.Material3.DisplayLarge">
     <item name="fontFamily">@string/robotoLight</item>
     <item name="android:fontFamily">@string/robotoLight</item>
     <item name="android:textSize">96sp</item>
   </style>
 
-  <style name="TextAppearance.Headline2"
+  <style name="MwmTextAppearance.Headline2"
     parent="TextAppearance.Material3.DisplayLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">60sp</item>
   </style>
 
-  <style name="TextAppearance.Headline3"
+  <style name="MwmTextAppearance.Headline3"
     parent="TextAppearance.Material3.DisplayMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">48sp</item>
   </style>
 
-  <style name="TextAppearance.Headline4"
+  <style name="MwmTextAppearance.Headline4"
     parent="TextAppearance.Material3.HeadlineLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">34sp</item>
   </style>
 
-  <style name="TextAppearance.Headline5"
+  <style name="MwmTextAppearance.Headline5"
     parent="TextAppearance.Material3.HeadlineMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">24sp</item>
   </style>
 
-  <style name="TextAppearance.Headline6"
+  <style name="MwmTextAppearance.Headline6"
     parent="TextAppearance.Material3.HeadlineSmall">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">20sp</item>
   </style>
 
-  <style name="TextAppearance.Subtitle1"
+  <style name="MwmTextAppearance.Subtitle1"
     parent="TextAppearance.Material3.TitleMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">16sp</item>
   </style>
 
-  <style name="TextAppearance.Subtitle2"
+  <style name="MwmTextAppearance.Subtitle2"
     parent="TextAppearance.Material3.TitleSmall">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">14sp</item>
   </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>