Skip to content

Commit

Permalink
fixed settings theme in small devices.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kosh committed Nov 5, 2016
1 parent cc6b4d7 commit 8912e98
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
9 changes: 9 additions & 0 deletions app/src/main/res/values-v21/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,13 @@
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:windowContentTransitions">true</item>
</style>

<style name="SettingsTheme" parent="SettingsTheme.Base">
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorEdgeEffect">?colorPrimary</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:windowContentTransitions">true</item>
</style>
</resources>
4 changes: 3 additions & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<style name="AppTheme" parent="AppTheme.Base"/>

<style name="SettingsTheme" parent="SettingsTheme.Base"/>

<style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/primary_dark</item>
<item name="colorPrimary">@color/primary</item>
Expand All @@ -15,7 +17,7 @@
<item name="alertDialogTheme">@style/AlertDialogStyle</item>
</style>

<style name="SettingsTheme" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
<style name="SettingsTheme.Base" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@color/primary_dark</item>
Expand Down

0 comments on commit 8912e98

Please sign in to comment.