summaryrefslogtreecommitdiff
path: root/core/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/main/res')
-rw-r--r--core/src/main/res/drawable-v21/drawer_item_background.xml20
-rw-r--r--core/src/main/res/drawable/drawer_item_background.xml24
-rw-r--r--core/src/main/res/values-v21/styles.xml8
-rw-r--r--core/src/main/res/values/styles.xml30
4 files changed, 31 insertions, 51 deletions
diff --git a/core/src/main/res/drawable-v21/drawer_item_background.xml b/core/src/main/res/drawable-v21/drawer_item_background.xml
deleted file mode 100644
index 40727bf50..000000000
--- a/core/src/main/res/drawable-v21/drawer_item_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?attr/colorSurfaceVariant">
- <item android:id="@android:id/mask">
- <shape android:shape="rectangle">
- <solid android:color="@color/black"/>
- <corners android:radius="32dp"/>
- </shape>
- </item>
- <item>
- <selector>
- <item android:state_selected="true">
- <shape android:shape="rectangle">
- <solid android:color="?attr/colorSurfaceVariant"/>
- <corners android:radius="32dp"/>
- </shape>
- </item>
- <item android:drawable="@android:color/transparent" />
- </selector>
- </item>
-</ripple>
diff --git a/core/src/main/res/drawable/drawer_item_background.xml b/core/src/main/res/drawable/drawer_item_background.xml
index 1eb0d4e11..40727bf50 100644
--- a/core/src/main/res/drawable/drawer_item_background.xml
+++ b/core/src/main/res/drawable/drawer_item_background.xml
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?attr/colorSurfaceVariant">
+ <item android:id="@android:id/mask">
<shape android:shape="rectangle">
- <solid android:color="?attr/colorSurfaceVariant"/>
+ <solid android:color="@color/black"/>
<corners android:radius="32dp"/>
</shape>
</item>
- <item android:state_selected="true">
- <shape android:shape="rectangle">
- <solid android:color="?attr/colorSurfaceVariant" />
- <corners android:radius="32dp" />
- </shape>
+ <item>
+ <selector>
+ <item android:state_selected="true">
+ <shape android:shape="rectangle">
+ <solid android:color="?attr/colorSurfaceVariant"/>
+ <corners android:radius="32dp"/>
+ </shape>
+ </item>
+ <item android:drawable="@android:color/transparent" />
+ </selector>
</item>
- <item android:drawable="@android:color/transparent" />
-</selector>
+</ripple>
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
deleted file mode 100644
index eb3a3d03e..000000000
--- a/core/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="Theme.AntennaPod.Dynamic.Light" parent="Theme.Base.AntennaPod.Dynamic.Light">
- <!-- To make icons visible -->
- <item name="android:statusBarColor">@color/grey600</item>
- <item name="android:navigationBarColor">@color/grey600</item>
- </style>
-</resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 463aa70c8..b9bb1689a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -3,6 +3,10 @@
<style name="Theme.AntennaPod.Dynamic.Light" parent="Theme.Base.AntennaPod.Dynamic.Light">
<!-- Room for API dependent attributes -->
+
+ <!-- To make icons visible on API 21-23. Overwritten in API-specific folder -->
+ <item name="android:statusBarColor">@color/grey600</item>
+ <item name="android:navigationBarColor">@color/grey600</item>
</style>
<style name="Theme.Base.AntennaPod.Dynamic.Light" parent="Theme.Material3.DynamicColors.Light">
@@ -22,7 +26,7 @@
<item name="icon_gray">#25365A</item>
<item name="android:splitMotionEvents">false</item>
<item name="android:fitsSystemWindows">false</item>
- <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
<style name="Theme.AntennaPod.Light" parent="Theme.AntennaPod.Dynamic.Light">
@@ -59,10 +63,10 @@
<item name="icon_gray">#CDD9E4</item>
<item name="android:splitMotionEvents">false</item>
<item name="android:fitsSystemWindows">false</item>
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
- <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
- <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/background_darktheme</item>
+ <item name="android:windowContentTransitions">true</item>
+ <item name="android:navigationBarColor">@color/background_darktheme</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.AntennaPod.Dynamic.Dark">
@@ -85,7 +89,7 @@
<item name="colorSurface">@color/black</item>
<item name="background_color">@color/black</item>
<item name="background_elevated">@color/black</item>
- <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/black</item>
+ <item name="android:navigationBarColor">@color/black</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.AntennaPod.Dark">
@@ -95,7 +99,7 @@
<item name="colorSurface">@color/black</item>
<item name="background_color">@color/black</item>
<item name="background_elevated">@color/black</item>
- <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/black</item>
+ <item name="android:navigationBarColor">@color/black</item>
</style>
<style name="Theme.AntennaPod.Dynamic.Light.NoTitle" parent="Theme.AntennaPod.Dynamic.Light">
@@ -135,7 +139,7 @@
</style>
<style name="Theme.AntennaPod.Dynamic.Light.Translucent" parent="Theme.AntennaPod.Dynamic.Light.NoTitle">
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="M">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -146,7 +150,7 @@
</style>
<style name="Theme.AntennaPod.Light.Translucent" parent="Theme.AntennaPod.Light.NoTitle">
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="M">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -157,7 +161,7 @@
</style>
<style name="Theme.AntennaPod.Dynamic.Dark.Translucent" parent="Theme.AntennaPod.Dynamic.Dark.NoTitle">
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="M">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -168,7 +172,7 @@
</style>
<style name="Theme.AntennaPod.Dark.Translucent" parent="Theme.AntennaPod.Dark.NoTitle">
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="M">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -179,7 +183,7 @@
</style>
<style name="Theme.AntennaPod.Dynamic.TrueBlack.Translucent" parent="Theme.AntennaPod.Dynamic.TrueBlack.NoTitle">
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="M">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -190,7 +194,7 @@
</style>
<style name="Theme.AntennaPod.TrueBlack.Translucent" parent="Theme.AntennaPod.TrueBlack.NoTitle">
- <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="M">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -209,7 +213,7 @@
<item name="android:windowBackground">@drawable/bg_splash</item>
<item name="colorPrimary">@color/icon_background_gradient_start</item>
<item name="colorPrimaryDark">@color/icon_background_gradient_start</item>
- <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/icon_background_gradient_end</item>
+ <item name="android:navigationBarColor">@color/icon_background_gradient_end</item>
</style>
<style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 04:25:29 +0000