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

[android] Fixed application styles after migration on materail components

Browse source
This commit is contained in:
alexzatsepin 2020-08-07 18:28:59 +03:00 • committed by Arsentiy Milchakov
parent 8d7f668716
commit 7b1b51b560
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/build.gradle
View file

@ -90,7 +90,7 @@ dependencies {
implementation 'com.trafi:anchor-bottom-sheet-behavior:0.13-alpha'
implementation 'com.google.firebase:firebase-messaging:17.0.0'
implementation 'com.github.yoksnod:MPAndroidChart:3.2.0-alpha'
implementation 'com.google.android.material:material:1.1.0'
implementation 'com.google.android.material:material:1.2.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.preference:preference:1.1.0'

10
android/res/values/themes-base.xml
View file

@ -1,7 +1,10 @@
<?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">
<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>
@ -195,7 +198,10 @@
</style>
<!-- Night theme -->
<style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.NoActionBar">
<style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.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>