diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-01-03 18:52:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 18:52:11 +0100 |
| commit | 68754684b71685b10bc46aba336b2d90819e19d5 (patch) | |
| tree | 190f60adfde1b41eba46ec7b87562278875e79f7 /core | |
| parent | 79d2b068acbc6804727c423de838d32d5d03e817 (diff) | |
| parent | 30c7ca5437cf65dc74ebfdd60a44d89da2bfaf79 (diff) | |
| download | AntennaPod-68754684b71685b10bc46aba336b2d90819e19d5.zip | |
Merge pull request #2457 from ByteHamster/sharedElement
Shared element transition
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/res/values-v21/styles.xml | 6 | ||||
| -rw-r--r-- | core/src/main/res/values/styles.xml | 24 |
2 files changed, 26 insertions, 4 deletions
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml index 42bd358c7..503337c95 100644 --- a/core/src/main/res/values-v21/styles.xml +++ b/core/src/main/res/values-v21/styles.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light"> + <item name="android:windowContentTransitions">true</item> + </style> + <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> + <item name="android:windowContentTransitions">true</item> + </style> <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button"> <item name="textAllCaps">true</item> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 4f228f8f1..a88d8c3a8 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="Theme.AntennaPod.Light" parent="Theme.AppCompat.Light"> + <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light"> + <!-- Room for API dependent attributes --> + </style> + + <style name="Theme.Base.AntennaPod.Light" parent="Theme.AppCompat.Light"> <item name="colorPrimary">@color/primary_light</item> <item name="colorAccent">@color/holo_blue_light</item> <item name="progressBarTheme">@style/ProgressBarLight</item> @@ -60,7 +64,11 @@ <item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item> </style> - <style name="Theme.AntennaPod.Dark" parent="Theme.AppCompat"> + <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> + <!-- Room for API dependent attributes --> + </style> + + <style name="Theme.Base.AntennaPod.Dark" parent="Theme.AppCompat"> <item name="colorAccent">@color/holo_blue_dark</item> <item name="colorControlNormal">@color/white</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> @@ -119,7 +127,11 @@ <item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item> </style> - <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AppCompat.Light.NoActionBar"> + <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle"> + <!-- Room for API dependent attributes --> + </style> + + <style name="Theme.Base.AntennaPod.Light.NoTitle" parent="Theme.AppCompat.Light.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowActionModeOverlay">true</item> <item name="progressBarTheme">@style/ProgressBarLight</item> @@ -179,7 +191,11 @@ <item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item> </style> - <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.AppCompat.NoActionBar"> + <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle"> + <!-- Room for API dependent attributes --> + </style> + + <style name="Theme.Base.AntennaPod.Dark.NoTitle" parent="Theme.AppCompat.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowActionModeOverlay">true</item> <item name="progressBarTheme">@style/ProgressBarDark</item> |