pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] get rid editor.timepicker style because of it works incorrectly

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-09-09 15:22:00 +03:00 • committed by Aleksandr Zatsepin
parent 6197d70aaa
commit e81da1cb7c
5 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/AndroidManifest.xml
View file

@ -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

7
android/res/values/styles-editor.xml
View file

@ -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>

5
android/res/values/styles-text.xml
View file

@ -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>

14
android/res/values/themes.xml
View file

@ -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>

13
android/src/com/mapswithme/maps/editor/EditorActivity.java
View file

@ -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);
}
}