From e81da1cb7cfc4d73e9ffc2ccf3c0801312708407 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Mon, 9 Sep 2019 15:22:00 +0300
Subject: [PATCH] [android] get rid editor.timepicker style because of it works
 incorrectly

---
 android/AndroidManifest.xml                        |  1 -
 android/res/values/styles-editor.xml               |  7 -------
 android/res/values/styles-text.xml                 |  5 -----
 android/res/values/themes.xml                      | 14 --------------
 .../com/mapswithme/maps/editor/EditorActivity.java | 13 -------------
 5 files changed, 40 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 9b4d7ba4be..7fcd5e2f4d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -329,7 +329,6 @@
         android:name="com.mapswithme.maps.editor.EditorActivity"
         android:configChanges="orientation|screenLayout|screenSize"
         android:label="@string/edit_place"
-        android:theme="@style/MwmTheme.EditorActivity"
         android:parentActivityName="com.mapswithme.maps.MwmActivity">
       <!-- The meta-data element is needed for versions lower than 4.1 -->
       <meta-data
diff --git a/android/res/values/styles-editor.xml b/android/res/values/styles-editor.xml
index 24ed287d22..4bc72522a4 100644
--- a/android/res/values/styles-editor.xml
+++ b/android/res/values/styles-editor.xml
@@ -2,13 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <style name="MwmWidget.Editor"/>
 
-  <style name="MwmWidget.Editor.TimePicker">
-    <item name="android:headerBackground">@null</item>
-    <item name="android:headerTimeTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Editor.TimePicker</item>
-    <item name="android:headerAmPmTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Editor.Buttons</item>
-    <item name="android:timePickerMode" tools:targetApi="lollipop">clock</item>
-  </style>
-
   <style name="MwmWidget.Editor.CardView">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index 97d2a43708..18cc9c7dde 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -180,11 +180,6 @@
   <style name="MwmTextAppearance.Editor">
   </style>
 
-  <style name="MwmTextAppearance.Editor.TimePicker">
-    <item name="android:textSize">@dimen/text_size_time_picker</item>
-    <item name="android:textColor">@color/timepicker_title</item>
-  </style>
-
   <style name="MwmTextAppearance.Editor.Buttons">
     <item name="android:textSize">@dimen/text_size_body_3</item>
   </style>
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 1ad508986c..c39c91794d 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -5,13 +5,11 @@
 
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@android:color/black</item>
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
     <item name="android:windowBackground">@null</item>
   </style>
 
   <style name="MwmTheme.Night.MainActivity">
     <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@android:color/black</item>
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
     <item name="android:windowBackground">@null</item>
   </style>
 
@@ -69,14 +67,6 @@
     <item name="android:textColor">@color/white_primary</item>
   </style>
 
-  <style name="MwmTheme.EditorActivity">
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
-  </style>
-
-  <style name="MwmTheme.Night.EditorActivity">
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
-  </style>
-
   <style name="MwmTheme.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
     <item name="android:textAppearance">@style/MwmTextAppearance.Title</item>
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
@@ -129,7 +119,6 @@
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.AppCompat.Light.Dialog.Alert">
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
     <item name="colorAccent">@color/base_accent</item>
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
     <item name="android:windowBackground">@color/bg_cards</item>
@@ -137,7 +126,6 @@
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.AppCompat.Dialog.Alert">
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
     <item name="colorAccent">@color/base_accent_night</item>
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
     <item name="android:windowBackground">@color/bg_cards_night</item>
@@ -196,14 +184,12 @@
   <style name="MwmTheme.FullScreenGalleryActivity">
     <item name="colorPrimary">@android:color/transparent</item>
     <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@android:color/black</item>
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
     <item name="android:windowBackground">@null</item>
   </style>
 
   <style name="MwmTheme.Night.FullScreenGalleryActivity">
     <item name="colorPrimary">@android:color/transparent</item>
     <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@android:color/black</item>
-    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
     <item name="android:windowBackground">@null</item>
   </style>
 
diff --git a/android/src/com/mapswithme/maps/editor/EditorActivity.java b/android/src/com/mapswithme/maps/editor/EditorActivity.java
index 4795345375..e4fbf76168 100644
--- a/android/src/com/mapswithme/maps/editor/EditorActivity.java
+++ b/android/src/com/mapswithme/maps/editor/EditorActivity.java
@@ -25,17 +25,4 @@ public class EditorActivity extends BaseMwmFragmentActivity
     final Intent intent = new Intent(activity, EditorActivity.class);
     activity.startActivity(intent);
   }
-
-  @Override
-  @StyleRes
-  public int getThemeResourceId(@NonNull String theme)
-  {
-    if (ThemeUtils.isDefaultTheme(theme))
-      return R.style.MwmTheme_EditorActivity;
-
-    if (ThemeUtils.isNightTheme(theme))
-      return R.style.MwmTheme_Night_EditorActivity;
-
-    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
-  }
 }