From b41bad5ea40705dc1a479c868b00f1aa76845ad1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 2 Aug 2025 21:52:31 +0200
Subject: [PATCH] [android] Migrate last themes to Material Components

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../main/res/layout/edit_bookmark_common.xml  |  24 +-
 .../src/main/res/values-night-v27/themes.xml  |  10 +
 .../app/src/main/res/values-night/themes.xml  | 214 +++++++++++++++
 .../app/src/main/res/values-v27/themes.xml    |   9 +-
 .../app/src/main/res/values/styles-text.xml   |  18 +-
 android/app/src/main/res/values/styles.xml    |   4 +-
 .../app/src/main/res/values/themes-base.xml   | 258 ------------------
 android/app/src/main/res/values/themes.xml    | 235 +++++++++-------
 8 files changed, 388 insertions(+), 384 deletions(-)
 create mode 100644 android/app/src/main/res/values-night-v27/themes.xml
 create mode 100644 android/app/src/main/res/values-night/themes.xml
 delete mode 100644 android/app/src/main/res/values/themes-base.xml

diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index 605d74cd9..ee274a17a 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -17,25 +17,27 @@
     android:orientation="vertical">
     <com.google.android.material.textfield.TextInputLayout
       android:id="@+id/edit_bookmark_name_input"
-      style="?fontBody1"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="60dp"
       android:textColorHint="?android:textColorSecondary"
       app:endIconMode="custom"
       app:endIconCheckable="false"
       app:endIconContentDescription="@string/clear"
       app:endIconDrawable="@drawable/ic_clear_rounded"
-      app:endIconTint="?android:textColorSecondary">
+      app:endIconTint="?android:textColorSecondary"
+      app:boxBackgroundMode="filled"
+      app:boxBackgroundColor="@null">
       <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/et__bookmark_name"
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:hint="@string/name"
         android:padding="@dimen/margin_half_double_plus"
         android:textAlignment="viewStart"
         android:inputType="textCapSentences"
-        android:singleLine="true" />
+        android:singleLine="true"
+        android:backgroundTint="@android:color/transparent"/>
     </com.google.android.material.textfield.TextInputLayout>
   </LinearLayout>
   <RelativeLayout
@@ -88,21 +90,23 @@
       tools:src="@drawable/ic_bookmark_none" />
   </RelativeLayout>
   <com.google.android.material.textfield.TextInputLayout
-    style="?fontBody1"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="60dp"
     android:layout_below="@id/rl__bookmark_set"
     android:layout_margin="@dimen/margin_half"
-    android:textColorHint="?android:textColorSecondary">
+    android:textColorHint="?android:textColorSecondary"
+    app:boxBackgroundMode="filled"
+    app:boxBackgroundColor="@null">
 
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/et__description"
       style="@style/MwmWidget.Editor.CustomTextInput"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="match_parent"
       android:padding="@dimen/margin_half_double_plus"
       android:hint="@string/placepage_personal_notes_hint"
       android:inputType="textMultiLine"
-      android:textAlignment="viewStart" />
+      android:textAlignment="viewStart"
+      android:backgroundTint="@android:color/transparent"/>
   </com.google.android.material.textfield.TextInputLayout>
 </RelativeLayout>
diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
new file mode 100644
index 000000000..0d4df4912
--- /dev/null
+++ b/android/app/src/main/res/values-night-v27/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
new file mode 100644
index 000000000..a19d647ff
--- /dev/null
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Night theme -->
+    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+        <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
+        <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
+        <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+        <item name="android:textColorPrimary">@color/text_light</item>
+        <item name="android:textColorPrimaryInverse">@color/text_dark</item>
+        <item name="android:textColorSecondary">@color/text_light_subtitle</item>
+        <item name="android:windowBackground">?windowBackgroundForced</item>
+        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:fontFamily">@string/robotoRegular</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="clickableBackground">?selectableItemBackground</item>
+        <item name="android:statusBarColor">?colorPrimary</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+
+        <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
+        <item name="windowBackgroundForced">@color/bg_window_night</item>
+        <item name="cardBackground">@color/bg_cards_night</item>
+        <item name="titleDialogTheme">@color/white_primary</item>
+        <item name="textDialogTheme">@color/white_secondary</item>
+        <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="colorControlNormal">?secondary</item>
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorAccentTransparent">@color/base_accent_transparent</item>
+        <item name="colorBtnHighlight">@color/white_24</item>
+        <item name="panel">@color/bg_panel_night</item>
+        <item name="colorLogo">@color/base_accent_night</item>
+        <item name="iconTint">@color/white_secondary</item>
+        <item name="iconTintDisabled">@color/white_12</item>
+        <item name="iconTintActive">@color/yellow</item>
+        <item name="iconTintLight">@color/icon_tint_light_night</item>
+
+        <item name="secondary">@color/text_light_hint</item>
+        <item name="dividerHorizontal">@color/divider_night</item>
+
+        <item name="ppBackground">@color/bg_cards_night</item>
+        <item name="ppButtonsBackground">@color/bg_window_night</item>
+
+        <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
+        <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
+        <item name="navLanesBackgroundColor">@color/base_accent_night</item>
+        <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
+        <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
+
+        <item name="buttonBackground">@drawable/button_night</item>
+        <item name="buttonTextColor">@color/button_text_night</item>
+        <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
+        <item name="buttonDialogTextColor">@color/base_accent_night</item>
+
+        <item name="accentButtonBackground">@drawable/button_accent_night</item>
+        <item name="accentButtonTextColor">@color/button_accent_text_night</item>
+        <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
+                   accentButtonTextColor selector -->
+        <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
+
+        <item name="redButtonBackground">@drawable/button_red</item>
+        <item name="redButtonTextColor">@color/button_red_text</item>
+        <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
+
+        <item name="primaryButtonBackground">@drawable/button_accent_night</item>
+
+        <item name="menuBackground">@color/bg_menu_night</item>
+
+        <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
+        <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
+        <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
+
+        <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
+        <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
+        <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
+        <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
+
+        <item name="routingButtonHint">@color/routing_button_tint</item>
+
+        <item name="android:listDivider">@drawable/list_divider_night</item>
+
+        <item name="transitPedestrianBackground">@color/white_4</item>
+        <item name="transitRulerBackground">@color/white_4</item>
+        <item name="transitStepDivider">@drawable/dot_divider_night</item>
+        <item name="accentColorSelector">@color/accent_color_selector_night</item>
+        <item name="android:textAppearance">@style/TextAppearance</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+        <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+        <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+        <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+        <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+        <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+        <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+        <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+        <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+        <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+        <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+        <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+        <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+        <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+        <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
+        <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
+        <item name="elevationProfilePropIconTint">@color/white_secondary</item>
+        <item name="altitudeBg">@drawable/bg_altitude_night</item>
+        <item name="elevationProfileAxisLabelColor">@color/white_54</item>
+        <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
+        <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
+        <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
+        <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
+        <item name="elevationProfileColor">@color/elevation_profile_dark</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
+
+        <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+        <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
+    </style>
+
+    <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
+
+    <style name="MwmTheme.Night.Splash">
+        <item name="android:windowBackground">@color/bg_primary_night</item>
+        <item name="android:textColorPrimary">@color/white_primary</item>
+        <item name="android:navigationBarColor">@color/bg_primary_night</item>
+        <item name="android:statusBarColor">@color/bg_primary_night</item>
+    </style>
+
+    <!-- Theme is overridden in v27 folder to handle cutouts -->
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+    </style>
+
+    <style name="MwmTheme.Night.CardBg">
+        <item name="android:windowBackground">@color/bg_cards_night</item>
+    </style>
+
+
+    <style name="MwmTheme.Night.WindowBg">
+        <item name="android:windowBackground">@color/bg_window_night</item>
+    </style>
+
+    <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">?buttonDialogTextColor</item>
+        <item name="colorPrimary">?buttonDialogTextColor</item>
+        <item name="android:background">?cardBackground</item>
+        <!-- Used for the message in the dialog -->
+        <item name="android:textColorPrimary">?textDialogTheme</item>
+        <item name="android:textSize">@dimen/text_size_body_1</item>
+        <!-- Used for the title in the dialog -->
+        <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
+    </style>
+
+    <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
+        <item name="android:textColor">?titleDialogTheme</item>
+    </style>
+
+    <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.MaterialComponents">
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="android:colorPrimaryDark">?statusBar</item>
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="clickableBackground">?selectableItemBackground</item>
+        <item name="colorControlNormal">@color/text_dark_hint</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:textColorHint">@color/text_light_hint</item>
+        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:fontFamily">@string/robotoRegular</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
+    </style>
+
+    <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorPrimary">?buttonDialogTextColor</item>
+        <item name="android:fontFamily">@string/robotoMedium</item>
+        <item name="android:windowBackground">@color/bg_cards_night</item>
+        <item name="android:background">@color/bg_cards_night</item>
+    </style>
+
+    <style name="MwmTheme.Downloader.Night">
+        <item name="status_done">@drawable/downloader_done_night</item>
+        <item name="status_downloadable">@drawable/downloader_download_night</item>
+        <item name="status_folder">@drawable/downloader_folder_night</item>
+        <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
+    </style>
+
+    <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
+        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+    </style>
+
+    <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
+        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
+    </style>
+
+    <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
+        <item name="iconTint">@color/black_primary</item>
+    </style>
+
+    <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
+        <item name="android:popupBackground">?windowBackgroundForced</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index 49e90150e..ff2be3c5e 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -8,11 +8,4 @@
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
     <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
   </style>
-  <style name="MwmTheme.Night.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-    <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
-    <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-  </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml
index ba8d84bae..f5f78b41a 100644
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="MwmTextAppearance" parent="TextAppearance.AppCompat">
+  <style name="MwmTextAppearance" parent="android:TextAppearance.Material">
     <item name="android:fontFamily">@string/robotoRegular</item>
     <!-- Force normal textStyle. Some devices (eg Lenovo P70), uses non-normal textStyle by default. -->
     <item name="android:textStyle">normal</item>
@@ -31,7 +31,7 @@
     <item name="android:fontFamily">@string/robotoMedium</item>
   </style>
 
-  <style name="MwmTextAppearance.Body1" parent="TextAppearance.AppCompat.Large">
+  <style name="MwmTextAppearance.Body1" parent="TextAppearance.MaterialComponents.Headline6">
     <item name="android:textSize">@dimen/text_size_body_1</item>
     <item name="android:textColor">?android:textColorPrimary</item>
   </style>
@@ -40,11 +40,11 @@
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body1.Light" parent="TextAppearance.AppCompat.Large.Inverse">
+  <style name="MwmTextAppearance.Body1.Light" parent="TextAppearance.MaterialComponents.Headline6">
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
 
-  <style name="MwmTextAppearance.Body2" parent="TextAppearance.AppCompat.Medium">
+  <style name="MwmTextAppearance.Body2" parent="android:TextAppearance.Material.Medium">
     <item name="android:textSize">@dimen/text_size_body_2</item>
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
@@ -53,7 +53,7 @@
     <item name="android:textColor">?android:textColorPrimary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body2.Light" parent="TextAppearance.AppCompat.Medium.Inverse">
+  <style name="MwmTextAppearance.Body2.Light" parent="android:TextAppearance.Material.Medium.Inverse">
     <item name="android:textSize">@dimen/text_size_body_2</item>
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
@@ -73,17 +73,17 @@
     <item name="android:textColor">?android:textColorPrimary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body3.Light" parent="TextAppearance.AppCompat.Inverse">
+  <style name="MwmTextAppearance.Body3.Light" parent="android:TextAppearance.Material.Inverse">
     <item name="android:textSize">@dimen/text_size_body_3</item>
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
 
-  <style name="MwmTextAppearance.Body4" parent="TextAppearance.AppCompat.Small">
+  <style name="MwmTextAppearance.Body4" parent="TextAppearance.MaterialComponents.Subtitle2">
     <item name="android:textSize">@dimen/text_size_body_4</item>
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body4.Light" parent="TextAppearance.AppCompat.Small.Inverse">
+  <style name="MwmTextAppearance.Body4.Light" parent="TextAppearance.MaterialComponents.Subtitle2">
     <item name="android:textSize">@dimen/text_size_body_4</item>
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
@@ -112,7 +112,7 @@
     <item name="android:textColorHint">@color/text_light_hint</item>
   </style>
 
-  <style name="MwmTextAppearance.Toolbar.Title" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
+  <style name="MwmTextAppearance.Toolbar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
     <item name="android:textSize">@dimen/text_size_toolbar</item>
     <item name="android:textColor">@color/text_light</item>
     <item name="android:textColorHint">@color/text_light_hint</item>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index b84d24cdf..ec0e062e1 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -168,7 +168,7 @@
     <item name="android:homeAsUpIndicator">@drawable/ic_down</item>
   </style>
 
-  <style name="MwmWidget.ListView" parent="Widget.AppCompat.ListView">
+  <style name="MwmWidget.ListView" parent="android:Widget.Material.ListView">
     <item name="android:fadingEdge">none</item>
     <item name="android:divider">@color/divider</item>
     <item name="android:background">@null</item>
@@ -178,7 +178,7 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="android:Widget.Material.TextView">
+  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
     <item name="android:background">@android:color/transparent</item>
   </style>
 
diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml
deleted file mode 100644
index 8e9ede75e..000000000
--- a/android/app/src/main/res/values/themes-base.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!-- Default theme -->
-  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
-    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
-    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
-    <item name="android:textColorPrimary">@color/text_dark</item>
-    <item name="android:textColorPrimaryInverse">@color/text_light</item>
-    <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
-    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
-    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:windowActionBarOverlay">true</item>
-    <item name="clickableBackground">?selectableItemBackground</item>
-    <item name="android:statusBarColor">?colorPrimary</item>
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
-    <item name="windowBackgroundForced">@color/bg_window</item>
-    <item name="cardBackground">@color/bg_cards</item>
-    <item name="titleDialogTheme">@color/black_primary</item>
-    <item name="textDialogTheme">@color/black_secondary</item>
-    <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
-    <item name="colorPrimary">@color/bg_primary</item>
-    <item name="colorControlNormal">?secondary</item>
-    <item name="colorAccent">@color/base_accent</item>
-    <item name="colorAccentTransparent">@color/base_accent_transparent</item>
-    <item name="colorBtnHighlight">@color/white_38</item>
-    <item name="panel">@color/bg_panel</item>
-    <item name="colorLogo">@color/bg_primary</item>
-    <item name="iconTint">@color/black_54</item>
-    <item name="iconTintDisabled">@color/black_12</item>
-    <item name="iconTintActive">@color/yellow</item>
-    <item name="iconTintLight">@color/icon_tint_light</item>
-
-    <item name="secondary">@color/text_dark_hint</item>
-    <item name="dividerHorizontal">@color/divider</item>
-
-    <item name="ppBackground">@color/bg_cards</item>
-    <item name="ppButtonsBackground">?panel</item>
-
-    <item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
-    <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>
-    <item name="navLanesBackgroundColor">@color/base_accent</item>
-    <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_light</item>
-    <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_light</item>
-
-    <item name="buttonBackground">@drawable/button</item>
-    <item name="buttonTextColor">@color/button_text</item>
-    <item name="buttonTextColorDisabled">@color/button_text_disabled</item>
-    <item name="buttonDialogTextColor">@color/base_accent</item>
-
-    <item name="accentButtonBackground">@drawable/button_accent</item>
-    <item name="accentButtonTextColor">@color/button_text_accent</item>
-    <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
-               accentButtonTextColor selector -->
-    <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled</item>
-
-    <item name="redButtonBackground">@drawable/button_red</item>
-    <item name="redButtonTextColor">@color/button_red_text</item>
-    <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
-
-    <item name="primaryButtonBackground">@drawable/button_accent</item>
-
-    <item name="menuBackground">@color/bg_menu</item>
-
-    <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending</item>
-    <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-    <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading</item>
-
-    <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect</item>
-    <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound</item>
-    <item name="downloaderTheme">@style/MwmTheme.Downloader</item>
-    <item name="navigationTheme">@style/MwmTheme.Navigation</item>
-
-    <item name="routingButtonHint">@color/routing_button_tint</item>
-
-    <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
-    <item name="android:listDivider">@drawable/list_divider</item>
-
-    <item name="transitPedestrianBackground">@color/black_4</item>
-    <item name="transitRulerBackground">@color/black_4</item>
-    <item name="transitStepDivider">@drawable/dot_divider</item>
-    <item name="outdoorsMenuEnabled">@drawable/ic_layers_outdoors_active</item>
-    <item name="trafficMenuEnabled">@drawable/ic_layers_traffic_active</item>
-    <item name="subwayMenuEnabled">@drawable/ic_layers_subway_active</item>
-    <item name="isoLinesMenuEnabled">@drawable/ic_layers_isoline_active</item>
-    <item name="outdoorsMenuDisabled">@drawable/ic_layers_outdoors_inactive</item>
-    <item name="trafficMenuDisabled">@drawable/ic_layers_traffic_inactive</item>
-    <item name="subwayMenuDisabled">@drawable/ic_layers_subway_inactive</item>
-    <item name="isoLinesMenuDisabled">@drawable/ic_layers_isoline_inactive</item>
-    <item name="accentColorSelector">@color/accent_color_selector</item>
-    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
-    <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
-    <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
-    <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
-    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
-    <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
-    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
-    <item name="elevationProfilePropIconTint">@color/black_secondary</item>
-    <item name="altitudeBg">@drawable/bg_altitude</item>
-    <item name="elevationProfileAxisLabelColor">@color/black_54</item>
-    <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin</item>
-    <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc</item>
-    <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle</item>
-    <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation</item>
-    <item name="elevationProfileColor">@color/elevation_profile</item>
-    <item name="android:popupMenuStyle">@style/PopupMenu</item>
-
-    <!-- Style used for bottom sheet behavior components -->
-    <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
-    <!-- Theme used for bottom sheet dialog components -->
-    <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
-  </style>
-
-  <!-- Night theme -->
-  <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-    <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
-    <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
-    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
-    <item name="android:textColorPrimary">@color/text_light</item>
-    <item name="android:textColorPrimaryInverse">@color/text_dark</item>
-    <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
-    <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
-    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:windowActionBarOverlay">true</item>
-    <item name="clickableBackground">?selectableItemBackground</item>
-    <item name="android:statusBarColor">?colorPrimary</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-
-    <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
-    <item name="windowBackgroundForced">@color/bg_window_night</item>
-    <item name="cardBackground">@color/bg_cards_night</item>
-    <item name="titleDialogTheme">@color/white_primary</item>
-    <item name="textDialogTheme">@color/white_secondary</item>
-    <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
-    <item name="colorPrimary">@color/bg_primary_night</item>
-    <item name="colorControlNormal">?secondary</item>
-    <item name="colorAccent">@color/base_accent_night</item>
-    <item name="colorAccentTransparent">@color/base_accent_transparent</item>
-    <item name="colorBtnHighlight">@color/white_24</item>
-    <item name="panel">@color/bg_panel_night</item>
-    <item name="colorLogo">@color/base_accent_night</item>
-    <item name="iconTint">@color/white_secondary</item>
-    <item name="iconTintDisabled">@color/white_12</item>
-    <item name="iconTintActive">@color/yellow</item>
-    <item name="iconTintLight">@color/icon_tint_light_night</item>
-
-    <item name="secondary">@color/text_light_hint</item>
-    <item name="dividerHorizontal">@color/divider_night</item>
-
-    <item name="ppBackground">@color/bg_cards_night</item>
-    <item name="ppButtonsBackground">@color/bg_window_night</item>
-
-    <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
-    <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
-    <item name="navLanesBackgroundColor">@color/base_accent_night</item>
-    <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
-    <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
-
-    <item name="buttonBackground">@drawable/button_night</item>
-    <item name="buttonTextColor">@color/button_text_night</item>
-    <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
-    <item name="buttonDialogTextColor">@color/base_accent_night</item>
-
-    <item name="accentButtonBackground">@drawable/button_accent_night</item>
-    <item name="accentButtonTextColor">@color/button_accent_text_night</item>
-    <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
-               accentButtonTextColor selector -->
-    <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
-
-    <item name="redButtonBackground">@drawable/button_red</item>
-    <item name="redButtonTextColor">@color/button_red_text</item>
-    <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
-
-    <item name="primaryButtonBackground">@drawable/button_accent_night</item>
-
-    <item name="menuBackground">@color/bg_menu_night</item>
-
-    <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
-    <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-    <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
-
-    <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
-    <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
-    <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
-    <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
-
-    <item name="routingButtonHint">@color/routing_button_tint</item>
-
-    <item name="android:listDivider">@drawable/list_divider_night</item>
-
-    <item name="transitPedestrianBackground">@color/white_4</item>
-    <item name="transitRulerBackground">@color/white_4</item>
-    <item name="transitStepDivider">@drawable/dot_divider_night</item>
-    <item name="accentColorSelector">@color/accent_color_selector_night</item>
-    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
-    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
-    <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
-    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
-    <item name="elevationProfilePropIconTint">@color/white_secondary</item>
-    <item name="altitudeBg">@drawable/bg_altitude_night</item>
-    <item name="elevationProfileAxisLabelColor">@color/white_54</item>
-    <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
-    <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
-    <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
-    <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
-    <item name="elevationProfileColor">@color/elevation_profile_dark</item>
-    <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
-
-    <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
-    <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
-  </style>
-</resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 38573bc30..47b741c69 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,7 +1,141 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Default theme -->
+  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
+    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
+    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
+    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+    <item name="android:textColorPrimary">@color/text_dark</item>
+    <item name="android:textColorPrimaryInverse">@color/text_light</item>
+    <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
+    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
+    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+    <item name="android:fontFamily">@string/robotoRegular</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowActionBarOverlay">true</item>
+    <item name="clickableBackground">?selectableItemBackground</item>
+    <item name="android:statusBarColor">?colorPrimary</item>
+    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="windowBackgroundForced">@color/bg_window</item>
+    <item name="cardBackground">@color/bg_cards</item>
+    <item name="titleDialogTheme">@color/black_primary</item>
+    <item name="textDialogTheme">@color/black_secondary</item>
+    <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
+    <item name="colorPrimary">@color/bg_primary</item>
+    <item name="colorControlNormal">?secondary</item>
+    <item name="colorAccent">@color/base_accent</item>
+    <item name="colorAccentTransparent">@color/base_accent_transparent</item>
+    <item name="colorBtnHighlight">@color/white_38</item>
+    <item name="panel">@color/bg_panel</item>
+    <item name="colorLogo">@color/bg_primary</item>
+    <item name="iconTint">@color/black_54</item>
+    <item name="iconTintDisabled">@color/black_12</item>
+    <item name="iconTintActive">@color/yellow</item>
+    <item name="iconTintLight">@color/icon_tint_light</item>
+
+    <item name="secondary">@color/text_dark_hint</item>
+    <item name="dividerHorizontal">@color/divider</item>
+
+    <item name="ppBackground">@color/bg_cards</item>
+    <item name="ppButtonsBackground">?panel</item>
+
+    <item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
+    <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>
+    <item name="navLanesBackgroundColor">@color/base_accent</item>
+    <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_light</item>
+    <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_light</item>
+
+    <item name="buttonBackground">@drawable/button</item>
+    <item name="buttonTextColor">@color/button_text</item>
+    <item name="buttonTextColorDisabled">@color/button_text_disabled</item>
+    <item name="buttonDialogTextColor">@color/base_accent</item>
+
+    <item name="accentButtonBackground">@drawable/button_accent</item>
+    <item name="accentButtonTextColor">@color/button_text_accent</item>
+    <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
+               accentButtonTextColor selector -->
+    <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled</item>
+
+    <item name="redButtonBackground">@drawable/button_red</item>
+    <item name="redButtonTextColor">@color/button_red_text</item>
+    <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
+
+    <item name="primaryButtonBackground">@drawable/button_accent</item>
+
+    <item name="menuBackground">@color/bg_menu</item>
+
+    <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending</item>
+    <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
+    <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading</item>
+
+    <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect</item>
+    <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound</item>
+    <item name="downloaderTheme">@style/MwmTheme.Downloader</item>
+    <item name="navigationTheme">@style/MwmTheme.Navigation</item>
+
+    <item name="routingButtonHint">@color/routing_button_tint</item>
+
+    <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+    <item name="android:listDivider">@drawable/list_divider</item>
+
+    <item name="transitPedestrianBackground">@color/black_4</item>
+    <item name="transitRulerBackground">@color/black_4</item>
+    <item name="transitStepDivider">@drawable/dot_divider</item>
+    <item name="outdoorsMenuEnabled">@drawable/ic_layers_outdoors_active</item>
+    <item name="trafficMenuEnabled">@drawable/ic_layers_traffic_active</item>
+    <item name="subwayMenuEnabled">@drawable/ic_layers_subway_active</item>
+    <item name="isoLinesMenuEnabled">@drawable/ic_layers_isoline_active</item>
+    <item name="outdoorsMenuDisabled">@drawable/ic_layers_outdoors_inactive</item>
+    <item name="trafficMenuDisabled">@drawable/ic_layers_traffic_inactive</item>
+    <item name="subwayMenuDisabled">@drawable/ic_layers_subway_inactive</item>
+    <item name="isoLinesMenuDisabled">@drawable/ic_layers_isoline_inactive</item>
+    <item name="accentColorSelector">@color/accent_color_selector</item>
+    <item name="android:textAppearance">@style/TextAppearance</item>
+    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+    <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
+    <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
+    <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
+    <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
+    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+    <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
+    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
+    <item name="elevationProfilePropIconTint">@color/black_secondary</item>
+    <item name="altitudeBg">@drawable/bg_altitude</item>
+    <item name="elevationProfileAxisLabelColor">@color/black_54</item>
+    <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin</item>
+    <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc</item>
+    <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle</item>
+    <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation</item>
+    <item name="elevationProfileColor">@color/elevation_profile</item>
+    <item name="android:popupMenuStyle">@style/PopupMenu</item>
+
+    <!-- Style used for bottom sheet behavior components -->
+    <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+    <!-- Theme used for bottom sheet dialog components -->
+    <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
+  </style>
+
   <style name="MwmTheme" parent="MwmTheme.Base"/>
-  <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
 
   <style name="MwmTheme.Splash">
     <item name="android:windowBackground">@color/bg_primary</item>
@@ -10,13 +144,6 @@
     <item name="android:statusBarColor">@color/bg_primary</item>
   </style>
 
-  <style name="MwmTheme.Night.Splash">
-    <item name="android:windowBackground">@color/bg_primary_night</item>
-    <item name="android:textColorPrimary">@color/white_primary</item>
-    <item name="android:navigationBarColor">@color/bg_primary_night</item>
-    <item name="android:statusBarColor">@color/bg_primary_night</item>
-  </style>
-
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
@@ -24,13 +151,6 @@
     <item name="android:windowTranslucentNavigation">false</item>
   </style>
 
-  <!-- Theme is overridden in v27 folder to handle cutouts -->
-  <style name="MwmTheme.Night.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-  </style>
-
   <style name="MwmTheme.DownloadResourcesLegacy">
     <item name="android:statusBarColor">@android:color/white</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -40,18 +160,10 @@
     <item name="android:windowBackground">@color/bg_cards</item>
   </style>
 
-  <style name="MwmTheme.Night.CardBg">
-    <item name="android:windowBackground">@color/bg_cards_night</item>
-  </style>
-
   <style name="MwmTheme.WindowBg">
     <item name="android:windowBackground">@color/bg_window</item>
   </style>
 
-  <style name="MwmTheme.Night.WindowBg">
-    <item name="android:windowBackground">@color/bg_window_night</item>
-  </style>
-
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
     <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
@@ -70,27 +182,7 @@
     <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
-  <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-    <item name="colorAccent">?buttonDialogTextColor</item>
-    <item name="colorPrimary">?buttonDialogTextColor</item>
-    <item name="android:background">?cardBackground</item>
-    <!-- Used for the message in the dialog -->
-    <item name="android:textColorPrimary">?textDialogTheme</item>
-    <item name="android:textSize">@dimen/text_size_body_1</item>
-    <!-- Used for the title in the dialog -->
-    <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
-  </style>
-
-  <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
-    <item name="android:textColor">?titleDialogTheme</item>
-  </style>
-
-  <style name="MwmTheme.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
-    <item name="android:textAppearance">@style/MwmTextAppearance.Title</item>
-    <item name="android:fontFamily">@string/robotoMedium</item>
-  </style>
-
-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.MaterialComponents.Light">
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="android:colorPrimaryDark">?statusBar</item>
     <item name="colorAccent">@color/base_accent</item>
@@ -110,26 +202,6 @@
     <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
   </style>
 
-  <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
-    <item name="colorPrimary">@color/bg_primary_night</item>
-    <item name="android:colorPrimaryDark">?statusBar</item>
-    <item name="colorAccent">@color/base_accent_night</item>
-    <item name="clickableBackground">?selectableItemBackground</item>
-    <item name="colorControlNormal">@color/text_dark_hint</item>
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:textColorHint">@color/text_light_hint</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:windowTranslucentStatus">true</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-  </style>
-
-  <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
-    <item name="android:windowTranslucentStatus">false</item>
-    <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
-  </style>
-
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="android:windowBackground">@color/bg_dialog_translucent</item>
@@ -145,14 +217,6 @@
     <item name="android:background">@color/bg_cards</item>
   </style>
 
-  <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-    <item name="colorAccent">@color/base_accent_night</item>
-    <item name="colorPrimary">?buttonDialogTextColor</item>
-    <item name="android:fontFamily">@string/robotoMedium</item>
-    <item name="android:windowBackground">@color/bg_cards_night</item>
-    <item name="android:background">@color/bg_cards_night</item>
-  </style>
-
   <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
   </style>
@@ -166,42 +230,19 @@
     <item name="status_folder_done">@drawable/downloader_folder_done</item>
   </style>
 
-  <style name="MwmTheme.Downloader.Night">
-    <item name="status_done">@drawable/downloader_done_night</item>
-    <item name="status_downloadable">@drawable/downloader_download_night</item>
-    <item name="status_folder">@drawable/downloader_folder_night</item>
-    <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
-  </style>
-
   <style name="MwmTheme.NavButtonsRound">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round</item>
   </style>
 
-  <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
-    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
-  </style>
-
   <style name="MwmTheme.NavButtonsRect">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect</item>
   </style>
 
-  <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
-    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
-  </style>
-
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
 
-  <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
-    <item name="iconTint">@color/black_primary</item>
-  </style>
-
-  <style name="PopupMenu" parent="ThemeOverlay.AppCompat">
-    <item name="android:popupBackground">?windowBackgroundForced</item>
-  </style>
-
-  <style name="PopupMenu.Dark" parent="ThemeOverlay.AppCompat.Dark">
+  <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
 </resources>