From 9a759229f97b1127b7d477d03f220904c2652fcd Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Mon, 30 Jun 2025 18:39:45 +0200
Subject: [PATCH] [android] Migrate editor screens to Material components

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../editor/AdvancedTimetableFragment.java     |  9 +-
 .../organicmaps/editor/CuisineAdapter.java    |  9 +-
 .../organicmaps/editor/EditorFragment.java    | 31 +++----
 .../editor/FeatureCategoryAdapter.java        |  7 +-
 .../editor/HoursMinutesPickerFragment.java    | 15 ++--
 .../organicmaps/editor/LanguagesAdapter.java  |  7 +-
 .../organicmaps/editor/PhoneListAdapter.java  |  6 +-
 .../editor/SelfServiceAdapter.java            |  9 +-
 .../editor/SimpleTimetableAdapter.java        | 23 ++---
 .../app/organicmaps/editor/StreetAdapter.java | 11 +--
 .../editor/TimetableContainerFragment.java    |  4 +-
 .../src/main/res/layout/fragment_editor.xml   | 84 +++++++++----------
 .../main/res/layout/fragment_editor_host.xml  |  2 +-
 .../src/main/res/layout/fragment_phone.xml    |  2 +-
 .../src/main/res/layout/fragment_report.xml   | 14 ++--
 .../main/res/layout/fragment_timetable.xml    |  2 +-
 .../layout/fragment_timetable_advanced.xml    | 10 +--
 .../src/main/res/layout/item_add_street.xml   |  4 +-
 .../app/src/main/res/layout/item_cuisine.xml  |  4 +-
 .../src/main/res/layout/item_editor_input.xml |  2 +-
 .../main/res/layout/item_feature_category.xml |  4 +-
 .../layout/item_feature_category_footer.xml   |  4 +-
 .../app/src/main/res/layout/item_language.xml |  2 +-
 .../main/res/layout/item_localized_name.xml   |  2 +-
 .../main/res/layout/item_opening_hours.xml    |  8 +-
 .../app/src/main/res/layout/item_phone.xml    |  4 +-
 .../src/main/res/layout/item_selection.xml    |  4 +-
 .../app/src/main/res/layout/item_street.xml   |  6 +-
 .../src/main/res/layout/item_timetable.xml    | 46 +++++-----
 .../main/res/layout/item_timetable_add.xml    |  2 +-
 .../layout/item_timetable_closed_hours.xml    |  6 +-
 .../src/main/res/layout/localized_name.xml    |  6 +-
 .../src/main/res/layout/tab_timepicker.xml    |  2 +-
 33 files changed, 180 insertions(+), 171 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
index 8adec6c59..580f5ca94 100644
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -7,8 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -20,7 +18,10 @@ import app.organicmaps.util.Constants;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.UiUtils;
+
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textview.MaterialTextView;
 
 public class AdvancedTimetableFragment extends BaseMwmFragment
                                        implements View.OnClickListener, TimetableProvider
@@ -28,8 +29,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
   private boolean mIsExampleShown;
   private TextInputEditText mInput;
   private WebView mExample;
-  private TextView mExamplesTitle;
-  private static ImageView mSaveButton;
+  private MaterialTextView mExamplesTitle;
+  private static ShapeableImageView mSaveButton;
   @Nullable
   private String mInitTimetables;
   @Nullable
diff --git a/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java b/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java
index 6fc1d9048..6d4fd5209 100644
--- a/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java
@@ -3,13 +3,14 @@ package app.organicmaps.editor;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 
 import java.util.ArrayList;
@@ -100,8 +101,8 @@ public class CuisineAdapter extends RecyclerView.Adapter<CuisineAdapter.ViewHold
 
   protected class ViewHolder extends RecyclerView.ViewHolder implements CompoundButton.OnCheckedChangeListener
   {
-    final TextView cuisine;
-    final CheckBox selected;
+    final MaterialTextView cuisine;
+    final MaterialCheckBox selected;
 
     public ViewHolder(View itemView)
     {
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index 43f039f5f..fc2a858f7 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -8,8 +8,6 @@ import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
@@ -22,8 +20,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
@@ -46,7 +47,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 {
   final static String LAST_INDEX_OF_NAMES_ARRAY = "LastIndexOfNamesArray";
 
-  private TextView mCategory;
+  private MaterialTextView mCategory;
   private View mCardName;
   private View mCardAddress;
   private View mCardDetails;
@@ -89,20 +90,20 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   };
 
   private MultilanguageAdapter mNamesAdapter;
-  private TextView mNamesCaption;
-  private TextView mAddLanguage;
-  private TextView mMoreLanguages;
+  private MaterialTextView mNamesCaption;
+  private MaterialTextView mAddLanguage;
+  private MaterialTextView mMoreLanguages;
 
-  private TextView mStreet;
+  private MaterialTextView mStreet;
   private TextInputEditText mHouseNumber;
   private TextInputEditText mBuildingLevels;
 
   // Define Metadata entries, that have more tricky logic, separately.
-  private TextView mPhone;
-  private TextView mEditPhoneLink;
-  private TextView mCuisine;
+  private MaterialTextView mPhone;
+  private MaterialTextView mEditPhoneLink;
+  private MaterialTextView mCuisine;
   private SwitchCompat mWifi;
-  private TextView mSelfService;
+  private MaterialTextView mSelfService;
   private SwitchCompat mOutdoorSeating;
 
   // Default Metadata entries.
@@ -132,12 +133,12 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   private TextInputLayout mInputBuildingLevels;
 
   private View mEmptyOpeningHours;
-  private TextView mOpeningHours;
+  private MaterialTextView mOpeningHours;
   private View mEditOpeningHours;
   private TextInputEditText mDescription;
   private final Map<Metadata.MetadataType, View> mDetailsBlocks = new HashMap<>();
   private final Map<Metadata.MetadataType, View> mSocialMediaBlocks = new HashMap<>();
-  private TextView mReset;
+  private MaterialTextView mReset;
 
   private EditorHostFragment mParent;
 
@@ -489,7 +490,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mOpeningHours.setOnClickListener(this);
     final View cardMore = view.findViewById(R.id.cv__more);
     mDescription = findInput(cardMore);
-    TextView osmInfo = view.findViewById(R.id.osm_info);
+    MaterialTextView osmInfo = view.findViewById(R.id.osm_info);
     osmInfo.setMovementMethod(LinkMovementMethod.getInstance());
     mReset = view.findViewById(R.id.reset);
     mReset.setOnClickListener(this);
@@ -529,7 +530,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private static TextInputEditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, String hint)
   {
-    ((ImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
+    ((ShapeableImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
     final TextInputLayout input = blockWithInput.findViewById(R.id.custom_input);
     input.setHint(hint);
     return input.findViewById(R.id.input);
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
index ceaf162e0..f55256d50 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -4,12 +4,13 @@ import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-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.editor.data.FeatureCategory;
 import app.organicmaps.util.UiUtils;
@@ -78,7 +79,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
   protected class FeatureViewHolder extends RecyclerView.ViewHolder
   {
     @NonNull
-    private final TextView mName;
+    private final MaterialTextView mName;
     @NonNull
     private final View mSelected;
 
@@ -106,7 +107,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
     FooterViewHolder(@NonNull View itemView)
     {
       super(itemView);
-      TextView categoryUnsuitableText = itemView.findViewById(R.id.editor_category_unsuitable_text);
+      MaterialTextView categoryUnsuitableText = itemView.findViewById(R.id.editor_category_unsuitable_text);
       categoryUnsuitableText.setMovementMethod(LinkMovementMethod.getInstance());
     }
   }
diff --git a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
index 370892115..7209edda3 100644
--- a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -8,8 +8,6 @@ import android.os.Bundle;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
 import android.widget.TimePicker;
 
 import androidx.annotation.IntRange;
@@ -19,8 +17,11 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.FragmentManager;
 
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.editor.data.HoursMinutes;
@@ -48,7 +49,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
   private TabLayout mTabs;
 
   private int mId;
-  private Button mOkButton;
+  private MaterialButton mOkButton;
 
   public interface OnPickListener
   {
@@ -90,7 +91,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
         .create();
 
     dialog.setOnShowListener(dialogInterface -> {
-      mOkButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+      mOkButton = (MaterialButton) dialog.getButton(AlertDialog.BUTTON_POSITIVE);
       mOkButton.setOnClickListener(v -> {
         if (mSelectedTab == TAB_FROM)
         {
@@ -134,19 +135,19 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
     if (id != 0)
     {
       mPickerHoursLabel = mPicker.findViewById(id);
-      if (!(mPickerHoursLabel instanceof TextView))
+      if (!(mPickerHoursLabel instanceof MaterialTextView))
         mPickerHoursLabel = null;
     }
 
     mTabs = root.findViewById(R.id.tabs);
-    TextView tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
+    MaterialTextView tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
     tabView.setText(getResources().getString(R.string.editor_time_from));
     final ColorStateList textColor = AppCompatResources.getColorStateList(requireContext(),
         ThemeUtils.isNightTheme(requireContext()) ? R.color.accent_color_selector_night
                                                   : R.color.accent_color_selector);
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
-    tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
+    tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
     tabView.setText(getResources().getString(R.string.editor_time_to));
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
diff --git a/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java
index d254354d7..97623fa7d 100644
--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java
@@ -3,11 +3,12 @@ package app.organicmaps.editor;
 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.R;
 import app.organicmaps.editor.data.Language;
 
@@ -42,12 +43,12 @@ public class LanguagesAdapter extends RecyclerView.Adapter<LanguagesAdapter.Hold
 
   protected class Holder extends RecyclerView.ViewHolder
   {
-    TextView name;
+    MaterialTextView name;
 
     public Holder(View itemView)
     {
       super(itemView);
-      name = (TextView) itemView;
+      name = (MaterialTextView) itemView;
       itemView.setOnClickListener(v -> mFragment.onLanguageSelected(mLanguages[getBindingAdapterPosition()]));
     }
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
index 36b0c2d3f..a49084391 100644
--- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
@@ -4,11 +4,11 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.android.material.textfield.TextInputEditText;
 import app.organicmaps.R;
@@ -94,7 +94,7 @@ public class PhoneListAdapter extends RecyclerView.Adapter<PhoneListAdapter.View
   {
     private int mPosition = -1;
     private final TextInputEditText mInput;
-    private final ImageView deleteButton;
+    private final ShapeableImageView deleteButton;
 
     public ViewHolder(@NonNull View itemView)
     {
@@ -116,7 +116,7 @@ public class PhoneListAdapter extends RecyclerView.Adapter<PhoneListAdapter.View
       deleteButton.setOnClickListener(this);
       // TODO: setting icons from code because icons defined in layout XML are white.
       deleteButton.setImageResource(R.drawable.ic_delete);
-      ((ImageView) itemView.findViewById(R.id.phone_icon)).setImageResource(R.drawable.ic_phone);
+      ((ShapeableImageView) itemView.findViewById(R.id.phone_icon)).setImageResource(R.drawable.ic_phone);
     }
 
     public void setPosition(int position)
diff --git a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java
index 68d1788a2..e9810e3d6 100644
--- a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java
@@ -4,12 +4,13 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.radiobutton.MaterialRadioButton;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 
@@ -51,8 +52,8 @@ public class SelfServiceAdapter extends RecyclerView.Adapter<SelfServiceAdapter.
 
   protected class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
   {
-    final TextView selfServiceDef;
-    final CompoundButton selected;
+    final MaterialTextView selfServiceDef;
+    final MaterialRadioButton selected;
 
     public ViewHolder(View itemView)
     {
diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
index a6801ff42..f019b941b 100644
--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -4,11 +4,8 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.IntRange;
@@ -17,6 +14,10 @@ import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.editor.data.HoursMinutes;
 import app.organicmaps.editor.data.TimeFormatUtils;
@@ -185,15 +186,15 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
     // Limit closed spans to avoid dynamic inflation of views in recycler's children. Yeah, its a hack.
     static final int MAX_CLOSED_SPANS = 10;
 
-    SparseArray<CheckBox> days = new SparseArray<>(7);
+    SparseArray<MaterialCheckBox> days = new SparseArray<>(7);
     View allday;
     SwitchCompat swAllday;
     View schedule;
     View openClose;
     View open;
     View close;
-    TextView tvOpen;
-    TextView tvClose;
+    MaterialTextView tvOpen;
+    MaterialTextView tvClose;
     View[] closedHours = new View[MAX_CLOSED_SPANS];
     View addClosed;
     View deleteTimetable;
@@ -316,7 +317,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
         else
         {
           UiUtils.show(closedHours[i]);
-          ((TextView) closedHours[i].findViewById(R.id.tv__closed)).setText(timespan.toString());
+          ((MaterialTextView) closedHours[i].findViewById(R.id.tv__closed)).setText(timespan.toString());
         }
 
         i++;
@@ -333,18 +334,18 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
     private void addDay(@IntRange(from = 1, to = 7) final int dayIndex, @IdRes int id)
     {
       final View day = itemView.findViewById(id);
-      final CheckBox checkBox = day.findViewById(R.id.chb__day);
+      final MaterialCheckBox checkBox = day.findViewById(R.id.chb__day);
       // Save index of the day to get it back when checkbox will be toggled.
       checkBox.setTag(dayIndex);
       days.put(dayIndex, checkBox);
       day.setOnClickListener(v -> checkBox.toggle());
 
-      ((TextView) day.findViewById(R.id.tv__day)).setText(TimeFormatUtils.formatShortWeekday(dayIndex));
+      ((MaterialTextView) day.findViewById(R.id.tv__day)).setText(TimeFormatUtils.formatShortWeekday(dayIndex));
     }
 
     private void switchWorkingDay(@IntRange(from = 1, to = 7) int dayIndex)
     {
-      final CheckBox checkBox = days.get(dayIndex);
+      final MaterialCheckBox checkBox = days.get(dayIndex);
       if (checkBox.isChecked())
         addWorkingDay(dayIndex, getBindingAdapterPosition());
       else
@@ -361,7 +362,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
 
   private class AddTimetableViewHolder extends BaseTimetableViewHolder
   {
-    private final Button mAdd;
+    private final MaterialButton mAdd;
 
     AddTimetableViewHolder(View itemView)
     {
diff --git a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
index 4af2fbb1f..2ccc6bbf6 100644
--- a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
@@ -4,12 +4,13 @@ import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.radiobutton.MaterialRadioButton;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.dialog.EditTextDialogFragment;
@@ -86,9 +87,9 @@ public class StreetAdapter extends RecyclerView.Adapter<StreetAdapter.BaseViewHo
 
   protected class StreetViewHolder extends BaseViewHolder implements View.OnClickListener
   {
-    final TextView streetDef;
-    final TextView streetLoc;
-    final CompoundButton selected;
+    final MaterialTextView streetDef;
+    final MaterialTextView streetLoc;
+    final MaterialRadioButton selected;
 
     public StreetViewHolder(View itemView)
     {
diff --git a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
index b9ef930c8..9b01da328 100644
--- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
@@ -7,7 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -19,6 +18,7 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textview.MaterialTextView;
 
 public class TimetableContainerFragment extends BaseMwmFragment implements TimetableChangedListener
 {
@@ -71,7 +71,7 @@ public class TimetableContainerFragment extends BaseMwmFragment implements Timet
 
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mSwitchMode;
+  private MaterialTextView mSwitchMode;
 
   @SuppressWarnings("NullableProblems")
   @NonNull
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index 576487dda..c6bd79f0a 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -13,7 +13,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/margin_half"
     android:orientation="vertical">
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/osm_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
         android:layout_marginBottom="@dimen/margin_base"
         android:text="@string/editor_about_osm"
         android:textAppearance="@style/MwmTextAppearance.Body4"/>
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__category"
       style="@style/MwmWidget.Editor.CardView">
       <RelativeLayout
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="0dp"
         android:padding="@dimen/margin_half_plus">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/icon"
           style="@style/MwmWidget.Editor.MetadataIcon"
           android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
           tools:src="@drawable/ic_operator"
           app:tint="?iconTint" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/title"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
           android:text="@string/editor_edit_place_category_title"
           android:textAppearance="@style/MwmTextAppearance.Body4"
           tools:text="Trololo"/>
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/name"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -61,13 +61,13 @@
           android:textAppearance="@style/MwmTextAppearance.Body1"
           tools:text="Ololo"/>
       </RelativeLayout>
-    </androidx.cardview.widget.CardView>
-    <androidx.cardview.widget.CardView
+    </com.google.android.material.card.MaterialCardView>
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__name"
       style="@style/MwmWidget.Editor.CardView">
       <include layout="@layout/localized_name"/>
-    </androidx.cardview.widget.CardView>
-    <androidx.cardview.widget.CardView
+    </com.google.android.material.card.MaterialCardView>
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__address"
       style="@style/MwmWidget.Editor.CardView">
       <LinearLayout
@@ -76,7 +76,7 @@
         android:orientation="vertical"
         android:paddingEnd="@dimen/margin_base"
         android:paddingStart="@dimen/margin_base">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginTop="@dimen/margin_base"
@@ -89,18 +89,18 @@
           style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
           android:paddingBottom="@dimen/margin_half"
           android:paddingTop="@dimen/margin_half">
-          <ImageView
+          <com.google.android.material.imageview.ShapeableImageView
             style="@style/MwmWidget.Editor.MetadataIcon"
             app:srcCompat="@drawable/ic_street_address"
             tools:ignore="ContentDescription" />
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:id="@+id/street_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/editor_margin_left"
             android:text="@string/street"
             android:textAppearance="@style/MwmTextAppearance.Body4"/>
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:id="@+id/street"
             style="@style/MwmWidget.Editor.FieldLayout"
             android:layout_below="@id/street_title"
@@ -124,8 +124,8 @@
           android:id="@+id/block_zipcode"
           layout="@layout/item_editor_input"/>
       </LinearLayout>
-    </androidx.cardview.widget.CardView>
-    <androidx.cardview.widget.CardView
+    </com.google.android.material.card.MaterialCardView>
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__details"
       style="@style/MwmWidget.Editor.CardView">
       <LinearLayout
@@ -134,7 +134,7 @@
         android:orientation="vertical"
         android:paddingEnd="@dimen/margin_base"
         android:paddingStart="@dimen/margin_base">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginTop="@dimen/margin_base"
@@ -153,18 +153,18 @@
             style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
             android:paddingBottom="@dimen/margin_half"
             android:paddingTop="@dimen/margin_half">
-          <ImageView
+          <com.google.android.material.imageview.ShapeableImageView
               style="@style/MwmWidget.Editor.MetadataIcon"
               app:srcCompat="@drawable/ic_cuisine"
               tools:ignore="ContentDescription" />
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               android:id="@+id/title_cuisine"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_marginStart="@dimen/editor_margin_left"
               android:text="@string/cuisine"
               android:textAppearance="@style/MwmTextAppearance.Body4"/>
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               android:id="@+id/cuisine"
               style="@style/MwmWidget.Editor.FieldLayout"
               android:layout_below="@id/title_cuisine"
@@ -197,11 +197,11 @@
         <RelativeLayout
             android:id="@+id/block_phone"
             style="@style/MwmWidget.Editor.MetadataBlock.Clickable">
-          <ImageView
+          <com.google.android.material.imageview.ShapeableImageView
               style="@style/MwmWidget.Editor.MetadataIcon"
               app:srcCompat="@drawable/ic_phone"
               tools:ignore="ContentDescription"/>
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               android:id="@+id/phone"
               style="@style/MwmWidget.Editor.FieldLayout.EditText"
               android:layout_width="match_parent"
@@ -209,7 +209,7 @@
               android:layout_centerVertical="true"
               android:layout_marginStart="@dimen/editor_margin_left"
               android:layout_toStartOf="@+id/edit_phone"/>
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               android:id="@+id/edit_phone"
               android:layout_marginStart="@dimen/margin_half_plus"
               android:background="?clickableBackground"
@@ -235,11 +235,11 @@
         <RelativeLayout
             android:id="@+id/block_wifi"
             style="@style/MwmWidget.Editor.MetadataBlock.Clickable">
-          <ImageView
+          <com.google.android.material.imageview.ShapeableImageView
               style="@style/MwmWidget.Editor.MetadataIcon"
               app:srcCompat="@drawable/ic_wifi"
               tools:ignore="ContentDescription" />
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               style="@style/MwmWidget.Editor.FieldLayout.EditText"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -260,18 +260,18 @@
             style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
             android:paddingBottom="@dimen/margin_half"
             android:paddingTop="@dimen/margin_half">
-          <ImageView
+          <com.google.android.material.imageview.ShapeableImageView
               style="@style/MwmWidget.Editor.MetadataIcon"
               app:srcCompat="@drawable/ic_self_service"
               tools:ignore="ContentDescription" />
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               android:id="@+id/self_service_title"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_marginStart="@dimen/editor_margin_left"
               android:text="@string/self_service"
               android:textAppearance="@style/MwmTextAppearance.Body4"/>
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               android:id="@+id/self_service"
               style="@style/MwmWidget.Editor.FieldLayout"
               android:layout_below="@id/self_service_title"
@@ -292,11 +292,11 @@
         <RelativeLayout
             android:id="@+id/block_outdoor_seating"
             style="@style/MwmWidget.Editor.MetadataBlock.Clickable">
-          <ImageView
+          <com.google.android.material.imageview.ShapeableImageView
               style="@style/MwmWidget.Editor.MetadataIcon"
               app:srcCompat="@drawable/ic_outdoor_seating"
               tools:ignore="ContentDescription" />
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
               style="@style/MwmWidget.Editor.FieldLayout.EditText"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -312,9 +312,9 @@
               android:layout_centerVertical="true"/>
         </RelativeLayout>
       </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__social_media"
       style="@style/MwmWidget.Editor.CardView">
       <LinearLayout
@@ -323,7 +323,7 @@
         android:orientation="vertical"
         android:paddingEnd="@dimen/margin_base"
         android:paddingStart="@dimen/margin_base">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginTop="@dimen/margin_base"
@@ -355,9 +355,9 @@
             android:id="@+id/block_bluesky"
             layout="@layout/item_editor_input"/>
       </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__building"
       style="@style/MwmWidget.Editor.CardView">
       <LinearLayout
@@ -366,7 +366,7 @@
         android:orientation="vertical"
         android:paddingEnd="@dimen/margin_base"
         android:paddingStart="@dimen/margin_base">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginTop="@dimen/margin_base"
@@ -381,9 +381,9 @@
           layout="@layout/item_editor_input"/>
 
       </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__more"
       style="@style/MwmWidget.Editor.CardView">
       <LinearLayout
@@ -391,7 +391,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="@dimen/margin_base">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:fontFamily="@string/robotoMedium"
@@ -411,13 +411,13 @@
             android:hint="@string/editor_note_hint"/>
         </com.google.android.material.textfield.TextInputLayout>
       </LinearLayout>
-    </androidx.cardview.widget.CardView>
-    <androidx.cardview.widget.CardView
+    </com.google.android.material.card.MaterialCardView>
+    <com.google.android.material.card.MaterialCardView
       android:id="@+id/cv__more"
       style="@style/MwmWidget.Editor.CardView"
       android:layout_marginTop="@dimen/margin_double"
       android:layout_marginBottom="@dimen/margin_base">
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/reset"
         android:layout_width="match_parent"
         android:layout_height="36dp"
@@ -426,6 +426,6 @@
         android:textAppearance="@style/MwmTextAppearance.Button"
         android:textColor="@color/base_red"
         tools:text="Reset my changes"/>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/android/app/src/main/res/layout/fragment_editor_host.xml b/android/app/src/main/res/layout/fragment_editor_host.xml
index b6af3c1fe..f815e061a 100644
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -29,7 +29,7 @@
         android:layout_marginEnd="?actionBarSize"
         tools:visibility="gone" />
 
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         app:tint="@color/image_view"
         android:id="@+id/save"
         android:layout_width="?actionBarSize"
diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index e15969b8d..59d5c9c89 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -21,7 +21,7 @@
 
     </FrameLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__append_phone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/fragment_report.xml b/android/app/src/main/res/layout/fragment_report.xml
index 5db49cca3..ca1b87202 100644
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -14,7 +14,7 @@
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme"
     tools:ignore="UnusedAttribute">
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/save"
       style="@style/MwmWidget.Downloader.ToolbarButton"
       android:text="@string/editor_report_problem_send_button"/>
@@ -38,24 +38,24 @@
         android:orientation="vertical"
         tools:visibility="gone">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/problem_not_exist"
           style="@style/MwmWidget.Editor.Problem"
           android:text="@string/editor_report_problem_no_place_title"
           android:tag="@string/problem_does_not_exist"/>
 
         <!-- TODO: Uncomment when the multiple choices are supported -->
-        <!--<TextView-->
+        <!--<com.google.android.material.textview.MaterialTextView-->
           <!--android:id="@+id/problem_closed_repair"-->
           <!--style="@style/MwmWidget.Editor.Problem"-->
           <!--android:text="@string/editor_report_problem_under_construction_title"/>-->
 
-        <!--<TextView-->
+        <!--<com.google.android.material.textview.MaterialTextView-->
           <!--android:id="@+id/problem_duplicated_place"-->
           <!--style="@style/MwmWidget.Editor.Problem"-->
           <!--android:text="@string/editor_report_problem_duplicate_place_title"/>-->
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/problem_other"
           style="@style/MwmWidget.Editor.Problem"
           android:text="@string/editor_report_problem_other_title"/>
@@ -77,7 +77,7 @@
           android:padding="@dimen/margin_base"
           android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginStart="@dimen/margin_base"
@@ -85,7 +85,7 @@
           android:layout_marginTop="@dimen/margin_quarter_plus"
           android:text="@string/editor_report_problem_desription_1"/>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           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/fragment_timetable.xml b/android/app/src/main/res/layout/fragment_timetable.xml
index 253d5b4a1..5a60096e7 100644
--- a/android/app/src/main/res/layout/fragment_timetable.xml
+++ b/android/app/src/main/res/layout/fragment_timetable.xml
@@ -21,7 +21,7 @@
     android:layout_alignParentBottom="true"
     android:background="?cardBackground"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
index 736b56984..aaeb8312b 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -13,7 +13,7 @@
     android:orientation="vertical"
     android:padding="@dimen/margin_half">
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       card_view:cardBackgroundColor="?cardBackground"
@@ -33,9 +33,9 @@
         tools:hint="hint"
         tools:text="trololo \ntrololo \ntrololo"/>
 
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
@@ -50,7 +50,7 @@
         android:orientation="vertical"
         android:animateLayoutChanges="true">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__examples_title"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
 
       </LinearLayout>
 
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
   </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/item_add_street.xml b/android/app/src/main/res/layout/item_add_street.xml
index cf3a91355..bc4bbdea0 100644
--- a/android/app/src/main/res/layout/item_add_street.xml
+++ b/android/app/src/main/res/layout/item_add_street.xml
@@ -9,7 +9,7 @@
   android:orientation="horizontal"
   android:padding="@dimen/margin_base">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:layout_width="24dp"
     android:layout_height="24dp"
     android:layout_marginEnd="@dimen/margin_double"
@@ -17,7 +17,7 @@
     app:srcCompat="@drawable/ic_plus"
     app:tint="?colorAccent" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/street"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_cuisine.xml b/android/app/src/main/res/layout/item_cuisine.xml
index e2412c340..8e3c38430 100644
--- a/android/app/src/main/res/layout/item_cuisine.xml
+++ b/android/app/src/main/res/layout/item_cuisine.xml
@@ -8,13 +8,13 @@
   android:orientation="horizontal"
   android:padding="@dimen/margin_base">
 
-  <CheckBox
+  <com.google.android.material.checkbox.MaterialCheckBox
     android:id="@+id/selected"
     android:layout_width="48dp"
     android:layout_height="48dp"
     android:layout_marginEnd="@dimen/margin_double"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/cuisine"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_editor_input.xml b/android/app/src/main/res/layout/item_editor_input.xml
index 1457b89ba..9d1bdec00 100644
--- a/android/app/src/main/res/layout/item_editor_input.xml
+++ b/android/app/src/main/res/layout/item_editor_input.xml
@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Editor.MetadataBlock">
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/icon"
     style="@style/MwmWidget.Editor.MetadataIcon"
     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/android/app/src/main/res/layout/item_feature_category.xml b/android/app/src/main/res/layout/item_feature_category.xml
index 39a6dde43..607e4d9f5 100644
--- a/android/app/src/main/res/layout/item_feature_category.xml
+++ b/android/app/src/main/res/layout/item_feature_category.xml
@@ -9,7 +9,7 @@
   android:orientation="horizontal"
   android:padding="@dimen/margin_base">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/name"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
     android:singleLine="true"
     android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/selected"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
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 7d78defa3..bd4a5d8e2 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
@@ -7,7 +7,7 @@
   android:orientation="vertical"
   android:background="?windowBackgroundForced"
   android:padding="@dimen/margin_base">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
@@ -15,7 +15,7 @@
     android:text="@string/editor_category_unsuitable_title"
     android:textAppearance="@style/TextAppearance.MdcTypographyStyles.Headline6"
     android:textStyle="bold" />
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_language.xml b/android/app/src/main/res/layout/item_language.xml
index 56bfb54e4..7e073834d 100644
--- a/android/app/src/main/res/layout/item_language.xml
+++ b/android/app/src/main/res/layout/item_language.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"
   android:id="@+id/name"
   android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/item_localized_name.xml b/android/app/src/main/res/layout/item_localized_name.xml
index a3d7fe2c3..efcaf3956 100644
--- a/android/app/src/main/res/layout/item_localized_name.xml
+++ b/android/app/src/main/res/layout/item_localized_name.xml
@@ -23,7 +23,7 @@
       android:padding="@dimen/margin_base"
       android:singleLine="true" />
   </com.google.android.material.textfield.TextInputLayout>
-  <ImageButton
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/delete"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_opening_hours.xml b/android/app/src/main/res/layout/item_opening_hours.xml
index e14c38169..62708cc2f 100644
--- a/android/app/src/main/res/layout/item_opening_hours.xml
+++ b/android/app/src/main/res/layout/item_opening_hours.xml
@@ -11,7 +11,7 @@
   android:paddingStart="@dimen/margin_half_plus"
   tools:ignore="RtlSymmetry">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="@dimen/margin_base_plus"
@@ -28,7 +28,7 @@
     android:orientation="vertical"
     tools:visibility="gone">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:enabled="false"
@@ -45,7 +45,7 @@
 
   </LinearLayout>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/opening_hours"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
     android:textAppearance="@style/MwmTextAppearance.PlacePage"
     tools:text="Mo-Fr 16:00-18.00\nSu 16:00-18.00"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/edit_opening_hours"
     style="@style/MwmWidget.Editor.FieldLayout"
     android:layout_below="@id/opening_hours"
diff --git a/android/app/src/main/res/layout/item_phone.xml b/android/app/src/main/res/layout/item_phone.xml
index 56252be3a..7b30e90cf 100644
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -8,7 +8,7 @@
     android:paddingStart="@dimen/margin_half_plus"
     android:paddingEnd="@dimen/margin_half">
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/phone_icon"
         style="@style/MwmWidget.Editor.MetadataIcon"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -37,7 +37,7 @@
             android:inputType="phone"/>
     </com.google.android.material.textfield.TextInputLayout>
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/delete_icon"
       style="@style/MwmWidget.Editor.MetadataIcon"
       android:layout_marginStart="@dimen/margin_half"
diff --git a/android/app/src/main/res/layout/item_selection.xml b/android/app/src/main/res/layout/item_selection.xml
index e2f515f44..470a6f3cd 100644
--- a/android/app/src/main/res/layout/item_selection.xml
+++ b/android/app/src/main/res/layout/item_selection.xml
@@ -11,7 +11,7 @@
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_half_plus">
 
-  <RadioButton
+  <com.google.android.material.radiobutton.MaterialRadioButton
     android:id="@+id/self_service_selected"
     android:layout_width="48dp"
     android:layout_height="48dp"
@@ -31,7 +31,7 @@
     app:layout_constraintStart_toEndOf="@+id/self_service_selected"
     app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/self_service_default"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_street.xml b/android/app/src/main/res/layout/item_street.xml
index f5bc1b95f..95ff1473d 100644
--- a/android/app/src/main/res/layout/item_street.xml
+++ b/android/app/src/main/res/layout/item_street.xml
@@ -11,7 +11,7 @@
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_half_plus">
 
-  <RadioButton
+  <com.google.android.material.radiobutton.MaterialRadioButton
     android:id="@+id/selected"
     android:layout_width="48dp"
     android:layout_height="48dp"
@@ -31,7 +31,7 @@
     app:layout_constraintStart_toEndOf="@+id/selected"
     app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/street_default"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
       android:textAppearance="@style/MwmTextAppearance.Body1"
       tools:text="Street name"/>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/street_localized"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_timetable.xml b/android/app/src/main/res/layout/item_timetable.xml
index 8b92fb88a..bcd866dbc 100644
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Editor.CardView"
@@ -23,12 +23,12 @@
         android:id="@+id/day1"
         style="@style/MwmWidget.Editor.DayLayout">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="Su"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@+id/chb__day"
           style="@style/MwmWidget.Editor.DayCheckBox"/>
 
@@ -44,12 +44,12 @@
         style="@style/MwmWidget.Editor.DayLayout"
         android:layout_weight="1">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="Mo"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"/>
@@ -61,12 +61,12 @@
         style="@style/MwmWidget.Editor.DayLayout"
         android:layout_weight="1">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="Tu"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"/>
@@ -78,12 +78,12 @@
         style="@style/MwmWidget.Editor.DayLayout"
         android:layout_weight="1">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="We"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"/>
@@ -95,12 +95,12 @@
         style="@style/MwmWidget.Editor.DayLayout"
         android:layout_weight="1">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="Th"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"/>
@@ -112,12 +112,12 @@
         style="@style/MwmWidget.Editor.DayLayout"
         android:layout_weight="1">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="Fr"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"/>
@@ -133,12 +133,12 @@
         android:id="@+id/day7"
         style="@style/MwmWidget.Editor.DayLayout">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@id/tv__day"
           style="@style/MwmWidget.Editor.DayText"
           tools:text="Sa"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"/>
@@ -162,7 +162,7 @@
       android:orientation="horizontal"
       android:padding="@dimen/margin_half_plus">
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -206,14 +206,14 @@
           android:orientation="vertical"
           android:padding="@dimen/margin_half_plus">
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_eighth"
             android:text="@string/editor_time_open"
             android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:id="@+id/tv__time_open"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -231,14 +231,14 @@
           android:orientation="vertical"
           android:padding="@dimen/margin_half_plus">
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_eighth"
             android:text="@string/editor_time_close"
             android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:id="@+id/tv__time_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -261,7 +261,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"/>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__add_closed"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -274,7 +274,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__remove_timetable"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -287,4 +287,4 @@
 
   </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/android/app/src/main/res/layout/item_timetable_add.xml b/android/app/src/main/res/layout/item_timetable_add.xml
index 745307efe..3b9872f32 100644
--- a/android/app/src/main/res/layout/item_timetable_add.xml
+++ b/android/app/src/main/res/layout/item_timetable_add.xml
@@ -6,7 +6,7 @@
   android:paddingBottom="@dimen/margin_base_plus"
   android:paddingTop="@dimen/margin_base_plus">
 
-  <Button
+  <com.google.android.material.button.MaterialButton
     android:id="@+id/btn__add_time"
     style="@style/MwmWidget.Button.Primary"
     android:layout_gravity="center"
diff --git a/android/app/src/main/res/layout/item_timetable_closed_hours.xml b/android/app/src/main/res/layout/item_timetable_closed_hours.xml
index efac9de43..8bc4ecacf 100644
--- a/android/app/src/main/res/layout/item_timetable_closed_hours.xml
+++ b/android/app/src/main/res/layout/item_timetable_closed_hours.xml
@@ -7,7 +7,7 @@
   android:layout_height="@dimen/editor_height_closed"
   android:paddingTop="@dimen/margin_base">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__remove_closed"
     android:layout_width="@dimen/height_block_base"
     android:layout_height="@dimen/height_block_base"
@@ -18,7 +18,7 @@
     app:srcCompat="@drawable/ic_close"
     app:tint="?iconTint"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__closed_title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
     android:text="@string/editor_hours_closed"
     android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__closed"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/localized_name.xml b/android/app/src/main/res/layout/localized_name.xml
index 14c9e8dfc..0252ed440 100644
--- a/android/app/src/main/res/layout/localized_name.xml
+++ b/android/app/src/main/res/layout/localized_name.xml
@@ -11,7 +11,7 @@
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/show_additional_names"
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_block_base"
@@ -25,7 +25,7 @@
 
   <include layout="@layout/recycler_default" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/more_names"
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_block_base"
@@ -34,7 +34,7 @@
     android:text="@string/placepage_more_button"
     android:textAppearance="@style/MwmTextAppearance.Button" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/add_langs"
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_block_base"
diff --git a/android/app/src/main/res/layout/tab_timepicker.xml b/android/app/src/main/res/layout/tab_timepicker.xml
index 99a4def58..b46ac223e 100644
--- a/android/app/src/main/res/layout/tab_timepicker.xml
+++ b/android/app/src/main/res/layout/tab_timepicker.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"
   style="@style/MwmWidget.Tab"