From b7d275eda800da83f90aefa3dff14d9f96409d86 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Mon, 1 Sep 2025 18:21:34 +0200
Subject: [PATCH] [android] Migrate last TextView to Material Components

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/ChartController.java |  7 +++--
 .../java/app/organicmaps/MwmActivity.java     |  5 ++--
 .../app/organicmaps/maplayer/LayerHolder.java |  6 ++--
 .../routing/RoutingPlanController.java        |  6 ++--
 .../organicmaps/search/CategoriesAdapter.java | 10 ++++---
 .../app/organicmaps/search/SearchAdapter.java | 28 ++++++++++---------
 .../search/SearchHistoryAdapter.java          |  8 ++++--
 .../organicmaps/widget/PlaceholderView.java   |  6 ++--
 .../ElevationProfileViewRenderer.java         | 16 ++++++-----
 .../widget/placepage/FloatingMarkerView.java  |  6 ++--
 .../PlacePageOpeningHoursFragment.java        |  3 +-
 .../res/layout/current_location_marker.xml    |  2 +-
 .../src/main/res/layout/elevation_profile.xml |  4 +--
 .../res/layout/elevation_profile_internal.xml | 28 +++++++++----------
 .../main/res/layout/floating_marker_view.xml  |  4 +--
 .../res/layout/fragment_toggle_map_layer.xml  |  2 +-
 .../app/src/main/res/layout/item_layer.xml    |  2 +-
 .../main/res/layout/item_search_category.xml  |  2 +-
 .../res/layout/item_search_clear_history.xml  |  2 +-
 .../res/layout/item_search_my_position.xml    |  2 +-
 .../main/res/layout/item_search_recent.xml    |  2 +-
 .../main/res/layout/item_search_result.xml    | 10 +++----
 .../main/res/layout/item_search_suggest.xml   |  2 +-
 .../main/res/layout/placeholder_subtitle.xml  |  2 +-
 .../src/main/res/layout/placeholder_title.xml |  2 +-
 .../placeholder_with_progressbar_layout.xml   |  2 +-
 .../src/main/res/layout/position_chooser.xml  |  4 +--
 27 files changed, 93 insertions(+), 80 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java
index aa0af954b..6ec611157 100644
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.view.View;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import app.organicmaps.sdk.Framework;
@@ -28,6 +27,8 @@ import com.github.mikephil.charting.data.LineDataSet;
 import com.github.mikephil.charting.formatter.ValueFormatter;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
+import com.google.android.material.textview.MaterialTextView;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -55,10 +56,10 @@ public class ChartController implements OnChartValueSelectedListener
   private MarkerView mCurrentLocationMarkerView;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mMaxAltitude;
+  private MaterialTextView mMaxAltitude;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mMinAltitude;
+  private MaterialTextView mMinAltitude;
   @NonNull
   private final Context mContext;
   private long mTrackId = Utils.INVALID_ID;
diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index 27c07690f..d10c7cc20 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -33,7 +33,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.TextView;
 import android.widget.Toast;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
@@ -133,6 +132,8 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textview.MaterialTextView;
+
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -719,7 +720,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!TextUtils.isEmpty(appName))
     {
       setTitle(appName);
-      ((TextView) mPointChooser.findViewById(R.id.title)).setText(appName);
+      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java
index a348ff8ef..ab75e58f4 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java
@@ -2,10 +2,12 @@ package app.organicmaps.maplayer;
 
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.adapter.OnItemClickListener;
 
@@ -14,7 +16,7 @@ class LayerHolder extends RecyclerView.ViewHolder
   @NonNull
   final ImageView mButton;
   @NonNull
-  final TextView mTitle;
+  final MaterialTextView mTitle;
   @NonNull
   final View mNewMarker;
   @Nullable
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index 926bb34ae..2ce0bbc90 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -6,13 +6,15 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.RadioGroup;
-import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
@@ -319,7 +321,7 @@ public class RoutingPlanController extends ToolbarController
     UiUtils.show(mDrivingOptionsBtnContainer);
     boolean hasAnyOptions = RoutingOptions.hasAnyOptions() && !isRulerType();
     UiUtils.showIf(hasAnyOptions, mDrivingOptionsImage);
-    TextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title);
+    MaterialTextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title);
     title.setText(hasAnyOptions ? R.string.change_driving_options_btn : R.string.define_to_avoid_btn);
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
index 658d6d53d..53d80fc89 100644
--- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
@@ -8,13 +8,15 @@ import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.sdk.search.DisplayedCategories;
 import app.organicmaps.sdk.util.Language;
@@ -112,7 +114,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
     if (viewType == ViewType.CATEGORY)
     {
       view = mInflater.inflate(R.layout.item_search_category, parent, false);
-      viewHolder = new ViewHolder(view, (TextView) view);
+      viewHolder = new ViewHolder(view, (MaterialTextView) view);
     }
     else
     {
@@ -138,7 +140,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
   {
     @NonNull
-    private final TextView mTitle;
+    private final MaterialTextView mTitle;
     @NonNull
     private final View mView;
 
@@ -166,7 +168,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
       return mEnglishResources.getString(categoryId);
     }
 
-    ViewHolder(@NonNull View v, @NonNull TextView tv)
+    ViewHolder(@NonNull View v, @NonNull MaterialTextView tv)
     {
       super(v);
       mView = v;
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index a55de0e82..e8022d270 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -5,12 +5,14 @@ import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Graphics;
@@ -42,11 +44,11 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     BaseResultViewHolder(@NonNull View view)
     {
       super(view);
-      if (view instanceof TextView)
+      if (view instanceof MaterialTextView)
       {
         int tintAttr = getTintAttr();
         if (tintAttr != 0)
-          Graphics.tint((TextView) view, tintAttr);
+          Graphics.tint((MaterialTextView) view, tintAttr);
       }
       view.setOnClickListener(v -> processClick(mResult, mOrder));
     }
@@ -56,7 +58,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     {
       mResult = result;
       mOrder = order;
-      final TextView titleView = getTitleView();
+      final MaterialTextView titleView = getTitleView();
 
       if (titleView != null)
         titleView.setText(mResult.getFormattedTitle(titleView.getContext()));
@@ -68,7 +70,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
       return androidx.appcompat.R.attr.colorAccent;
     }
 
-    abstract TextView getTitleView();
+    abstract MaterialTextView getTitleView();
 
     abstract void processClick(SearchResult result, int order);
   }
@@ -81,9 +83,9 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     }
 
     @Override
-    TextView getTitleView()
+    MaterialTextView getTitleView()
     {
-      return (TextView) itemView;
+      return (MaterialTextView) itemView;
     }
 
     @Override
@@ -98,15 +100,15 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @NonNull
     final View mFrame;
     @NonNull
-    final TextView mName;
+    final MaterialTextView mName;
     @NonNull
-    final TextView mOpen;
+    final MaterialTextView mOpen;
     @NonNull
-    final TextView mDescription;
+    final MaterialTextView mDescription;
     @NonNull
-    final TextView mRegion;
+    final MaterialTextView mRegion;
     @NonNull
-    final TextView mDistance;
+    final MaterialTextView mDistance;
 
     @Override
     int getTintAttr()
@@ -126,7 +128,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     }
 
     @Override
-    TextView getTitleView()
+    MaterialTextView getTitleView()
     {
       return mName;
     }
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
index 506b2757a..4f5bacd75 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
@@ -3,9 +3,11 @@ package app.organicmaps.search;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingController;
@@ -25,12 +27,12 @@ class SearchHistoryAdapter extends RecyclerView.Adapter<SearchHistoryAdapter.Vie
 
   public static class ViewHolder extends RecyclerView.ViewHolder
   {
-    private final TextView mText;
+    private final MaterialTextView mText;
 
     public ViewHolder(View itemView)
     {
       super(itemView);
-      mText = (TextView) itemView;
+      mText = (MaterialTextView) itemView;
       Graphics.tint(mText);
     }
   }
diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
index 658272843..5f929ac2d 100644
--- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
@@ -7,13 +7,13 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
 import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
 
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
@@ -26,11 +26,11 @@ public class PlaceholderView extends LinearLayout
 
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mTitle;
+  private MaterialTextView mTitle;
 
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mSubtitle;
+  private MaterialTextView mSubtitle;
 
   private int mImgMaxHeight;
   private int mImgMinHeight;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
index fb25738b7..b22cab5db 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -3,10 +3,12 @@ package app.organicmaps.widget.placepage;
 import android.content.Context;
 import android.view.View;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.ChartController;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
@@ -29,22 +31,22 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
   private NestedScrollView mScrollView;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mTitle;
+  private MaterialTextView mTitle;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mAscent;
+  private MaterialTextView mAscent;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mDescent;
+  private MaterialTextView mDescent;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mMaxAltitude;
+  private MaterialTextView mMaxAltitude;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mMinAltitude;
+  private MaterialTextView mMinAltitude;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mTime;
+  private MaterialTextView mTime;
   @SuppressWarnings("NullableProblems")
   @NonNull
   private ChartController mChartController;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
index d31e70030..3222840c5 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
@@ -8,7 +8,6 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.R;
@@ -19,6 +18,7 @@ import com.github.mikephil.charting.components.IMarker;
 import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.utils.MPPointF;
+import com.google.android.material.textview.MaterialTextView;
 
 @SuppressLint("ViewConstructor")
 public class FloatingMarkerView extends RelativeLayout implements IMarker
@@ -34,10 +34,10 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
   private View mInfoFloatingContainer;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mAltitudeView;
+  private MaterialTextView mAltitudeView;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mDistanceValueView;
+  private MaterialTextView mDistanceValueView;
   @SuppressWarnings("NullableProblems")
   @NonNull
   private View mFloatingTriangle;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
index 7165a1e10..8aa3e1cdc 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -66,7 +65,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
     mFullWeekOpeningHours.setAdapter(mOpeningHoursAdapter);
   }
 
-  private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, TextView checkDateView)
+  private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, MaterialTextView checkDateView)
   {
     final String checkDate = mapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE_OPEN_HOURS);
     if (!checkDate.isEmpty())
diff --git a/android/app/src/main/res/layout/current_location_marker.xml b/android/app/src/main/res/layout/current_location_marker.xml
index b2e8b4c35..b1c3aa100 100644
--- a/android/app/src/main/res/layout/current_location_marker.xml
+++ b/android/app/src/main/res/layout/current_location_marker.xml
@@ -7,7 +7,7 @@
   android:orientation="vertical"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   tools:background="@color/black_primary">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/label"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/elevation_profile.xml b/android/app/src/main/res/layout/elevation_profile.xml
index a8f7b67cf..8c1024775 100644
--- a/android/app/src/main/res/layout/elevation_profile.xml
+++ b/android/app/src/main/res/layout/elevation_profile.xml
@@ -16,7 +16,7 @@
     android:visibility="gone"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/highest_altitude"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
     android:paddingEnd="@dimen/margin_quarter_plus"
     android:paddingBottom="@dimen/margin_eighth"
     android:textSize="@dimen/text_size_body_5" />
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/lowest_altitude"
     android:layout_width="wrap_content"
     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 28bf829b7..aa435f911 100644
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/title"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
           android:layout_marginEnd="@dimen/margin_quarter"
           app:srcCompat="@drawable/ic_ascent"
           app:tint="?elevationProfilePropIconTint" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/ascent"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
           android:textAppearance="@style/MwmTextAppearance.Body3"
           tools:text="10000 m" />
       </LinearLayout>
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/ascent_container"
@@ -91,7 +91,7 @@
           android:layout_marginEnd="@dimen/margin_quarter"
           app:srcCompat="@drawable/ic_descent"
           app:tint="?elevationProfilePropIconTint" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/descent"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
           android:textAppearance="@style/MwmTextAppearance.Body3"
           tools:text="10000 m" />
       </LinearLayout>
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/descent_container"
@@ -129,7 +129,7 @@
           android:layout_marginEnd="@dimen/margin_quarter"
           app:srcCompat="@drawable/ic_maxalt"
           app:tint="?elevationProfilePropIconTint" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/max_altitude"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
           android:textAppearance="@style/MwmTextAppearance.Body3"
           tools:text="10000 m" />
       </LinearLayout>
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/max_height_container"
@@ -167,7 +167,7 @@
           android:layout_marginEnd="@dimen/margin_half"
           app:srcCompat="@drawable/ic_minalt"
           app:tint="?elevationProfilePropIconTint" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/min_altitude"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
           android:textAppearance="@style/MwmTextAppearance.Body3"
           tools:text="10000 m" />
       </LinearLayout>
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/min_elevation_container"
@@ -208,7 +208,7 @@
       android:layout_height="wrap_content"
       android:layout_gravity="bottom"
       android:orientation="horizontal">
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/elevation_profile_difficulty"
@@ -220,13 +220,13 @@
         android:layout_marginStart="@dimen/margin_half_plus_eight"
         android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin"
         android:orientation="horizontal">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/difficulty_level_1"
           android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
           android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
           android:background="@drawable/dot_elevation_difficulty"
           android:enabled="false" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/difficulty_level_2"
           android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
           android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
@@ -234,7 +234,7 @@
           android:layout_marginEnd="@dimen/margin_quarter"
           android:background="@drawable/dot_elevation_difficulty"
           android:enabled="false" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/difficulty_level_3"
           android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
           android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
@@ -250,7 +250,7 @@
       android:layout_toEndOf="@id/difficulty_container"
       android:gravity="end"
       android:orientation="horizontal">
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/elevation_profile_time"
diff --git a/android/app/src/main/res/layout/floating_marker_view.xml b/android/app/src/main/res/layout/floating_marker_view.xml
index 9ca756788..3fff4a2c5 100644
--- a/android/app/src/main/res/layout/floating_marker_view.xml
+++ b/android/app/src/main/res/layout/floating_marker_view.xml
@@ -49,7 +49,7 @@
         android:layout_height="@dimen/margin_half_plus"
         app:srcCompat="@drawable/ic_distance_travelled"
         app:tint="?ppFloatingMarkerIconColor" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/distance_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
           android:layout_width="@dimen/margin_half_plus_eight"
           android:layout_height="@dimen/margin_half_plus_eight"
           app:srcCompat="?elevationProfileSelectedPointTriangle" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/altitude"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
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 a8aafc4c5..730489cab 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
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/layers_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_layer.xml b/android/app/src/main/res/layout/item_layer.xml
index 5ba8481f5..459844931 100644
--- a/android/app/src/main/res/layout/item_layer.xml
+++ b/android/app/src/main/res/layout/item_layer.xml
@@ -33,7 +33,7 @@
       tools:visibility="visible" />
   </FrameLayout>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/name"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_search_category.xml b/android/app/src/main/res/layout/item_search_category.xml
index 9fdbd99d9..d7e43fe81 100644
--- a/android/app/src/main/res/layout/item_search_category.xml
+++ b/android/app/src/main/res/layout/item_search_category.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           style="@style/MwmWidget.TextView.Search"
           android:drawablePadding="@dimen/margin_base"
diff --git a/android/app/src/main/res/layout/item_search_clear_history.xml b/android/app/src/main/res/layout/item_search_clear_history.xml
index 509832ab2..ae3796515 100644
--- a/android/app/src/main/res/layout/item_search_clear_history.xml
+++ b/android/app/src/main/res/layout/item_search_clear_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:app="http://schemas.android.com/apk/res-auto"
           style="@style/MwmWidget.TextView.Search"
           android:text="@string/clear_search"
diff --git a/android/app/src/main/res/layout/item_search_my_position.xml b/android/app/src/main/res/layout/item_search_my_position.xml
index aac541164..903b872c1 100644
--- a/android/app/src/main/res/layout/item_search_my_position.xml
+++ b/android/app/src/main/res/layout/item_search_my_position.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:app="http://schemas.android.com/apk/res-auto"
           style="@style/MwmWidget.TextView.Search"
           android:text="@string/p2p_your_location"
diff --git a/android/app/src/main/res/layout/item_search_recent.xml b/android/app/src/main/res/layout/item_search_recent.xml
index 3323e241e..27ea7187d 100644
--- a/android/app/src/main/res/layout/item_search_recent.xml
+++ b/android/app/src/main/res/layout/item_search_recent.xml
@@ -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"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
diff --git a/android/app/src/main/res/layout/item_search_result.xml b/android/app/src/main/res/layout/item_search_result.xml
index 61868bcf3..425093a7c 100644
--- a/android/app/src/main/res/layout/item_search_result.xml
+++ b/android/app/src/main/res/layout/item_search_result.xml
@@ -9,7 +9,7 @@
   android:padding="@dimen/margin_base"
   tools:background="#20FF0000">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
       android:id="@+id/title"
       android:textAlignment="viewStart"
       android:layout_width="match_parent"
@@ -20,7 +20,7 @@
       android:maxLines="2"
       tools:text="Long long title that wraps to multiple lines"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
       android:id="@+id/description"
       android:textAlignment="viewStart"
       android:layout_width="wrap_content"
@@ -35,7 +35,7 @@
       android:ellipsize="end"
       tools:text="Hotel \u2022 \u2605\u2605\u2605\u2605\u2605"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
       android:id="@+id/open"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
       android:text="@string/closed"
       android:textAppearance="@style/MwmTextAppearance.Body3" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
       android:id="@+id/region"
       android:textAlignment="viewStart"
       android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
       android:ellipsize="end"
       tools:text="Russia, Moscow &amp; Central, Moscow"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/distance"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_search_suggest.xml b/android/app/src/main/res/layout/item_search_suggest.xml
index b8c64011f..4022aebbe 100644
--- a/android/app/src/main/res/layout/item_search_suggest.xml
+++ b/android/app/src/main/res/layout/item_search_suggest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:app="http://schemas.android.com/apk/res-auto"
           xmlns:tools="http://schemas.android.com/tools"
           style="@style/MwmWidget.TextView.Search"
diff --git a/android/app/src/main/res/layout/placeholder_subtitle.xml b/android/app/src/main/res/layout/placeholder_subtitle.xml
index d659e44ea..3da3f745f 100644
--- a/android/app/src/main/res/layout/placeholder_subtitle.xml
+++ b/android/app/src/main/res/layout/placeholder_subtitle.xml
@@ -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"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/subtitle"
diff --git a/android/app/src/main/res/layout/placeholder_title.xml b/android/app/src/main/res/layout/placeholder_title.xml
index e8a997c45..f73fe744e 100644
--- a/android/app/src/main/res/layout/placeholder_title.xml
+++ b/android/app/src/main/res/layout/placeholder_title.xml
@@ -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"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/title"
diff --git a/android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml b/android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml
index 9b58347dc..221c05d60 100644
--- a/android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml
+++ b/android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml
@@ -11,7 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@null" />
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/margin_half"
diff --git a/android/app/src/main/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml
index d8959e6ff..8a848d6f9 100644
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -20,7 +20,7 @@
       android:orientation="horizontal"
       android:padding="@dimen/margin_half">
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
 
   </com.google.android.material.appbar.MaterialToolbar>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?panel"