diff options
Diffstat (limited to 'core/src')
17 files changed, 69 insertions, 216 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/dialog/ConfirmationDialog.java b/core/src/main/java/de/danoeh/antennapod/core/dialog/ConfirmationDialog.java index 47b5dcd09..b964c7508 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/dialog/ConfirmationDialog.java +++ b/core/src/main/java/de/danoeh/antennapod/core/dialog/ConfirmationDialog.java @@ -3,6 +3,7 @@ package de.danoeh.antennapod.core.dialog; import android.content.Context; import android.content.DialogInterface; import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import android.util.Log; import de.danoeh.antennapod.core.R; @@ -43,7 +44,7 @@ public abstract class ConfirmationDialog { public abstract void onConfirmButtonPressed(DialogInterface dialog); public final AlertDialog createNewDialog() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context); builder.setTitle(titleId); builder.setMessage(message); builder.setPositiveButton(positiveText != 0 ? positiveText : R.string.confirm_label, diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java index 674082a13..e79be8019 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java @@ -4,7 +4,7 @@ import android.content.Context; import android.util.Log; import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import androidx.work.Constraints; import androidx.work.Data; import androidx.work.ExistingPeriodicWorkPolicy; @@ -131,7 +131,7 @@ public class AutoUpdateManager { } private static void confirmMobileAllFeedsRefresh(final Context context) { - AlertDialog.Builder builder = new AlertDialog.Builder(context) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context) .setTitle(R.string.feed_refresh_title) .setMessage(R.string.confirm_mobile_feed_refresh_dialog_message) .setPositiveButton(R.string.confirm_mobile_streaming_button_once, diff --git a/core/src/main/res/color/filter_dialog_button_text.xml b/core/src/main/res/color/filter_dialog_button_text.xml deleted file mode 100644 index fea8b3e74..000000000 --- a/core/src/main/res/color/filter_dialog_button_text.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="?attr/colorOnSecondary" android:state_checked="true" /> - <item android:color="?android:textColorPrimary" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/color/filter_dialog_clear_dark.xml b/core/src/main/res/color/filter_dialog_clear_dark.xml deleted file mode 100644 index 88e022d0f..000000000 --- a/core/src/main/res/color/filter_dialog_clear_dark.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@color/dialog_filter_inactive_dark" android:state_checked="true" /> - <item android:color="@color/dialog_filter_clear_inactive_dark" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/color/filter_dialog_clear_light.xml b/core/src/main/res/color/filter_dialog_clear_light.xml deleted file mode 100644 index 9d513f72a..000000000 --- a/core/src/main/res/color/filter_dialog_clear_light.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@color/dialog_filter_inactive_light" android:state_checked="true" /> - <item android:color="@color/dialog_filter_clear_inactive_light" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable-v21/drawer_item_background.xml b/core/src/main/res/drawable-v21/drawer_item_background.xml new file mode 100644 index 000000000..1992158cc --- /dev/null +++ b/core/src/main/res/drawable-v21/drawer_item_background.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?attr/currently_playing_background"> + <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/drawer_activated_color"/> + <corners android:radius="32dp"/> + </shape> + </item> + <item android:drawable="@android:color/transparent" /> + </selector> + </item> +</ripple> diff --git a/core/src/main/res/drawable-v21/ic_filter_close.xml b/core/src/main/res/drawable-v21/ic_filter_close.xml deleted file mode 100644 index 9e0a26905..000000000 --- a/core/src/main/res/drawable-v21/ic_filter_close.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:bottom="5dp" - android:left="5dp" - android:right="5dp" - android:top="5dp"> - - <shape android:shape="oval"> - <stroke - android:width="4dp" - android:color="?attr/filter_dialog_clear" /> - </shape> - </item> - - <!-- x --> - <item - android:bottom="12dp" - android:left="12dp" - android:right="12dp" - android:top="12dp"> - <rotate - android:fromDegrees="135" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="135"> - <shape android:shape="line"> - <stroke - android:width="4dp" - android:color="?attr/filter_dialog_clear" /> - </shape> - </rotate> - </item> - - <item - android:bottom="12dp" - android:left="12dp" - android:right="12dp" - android:top="12dp"> - <rotate - android:fromDegrees="45" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="45"> - <shape android:shape="line"> - <stroke - android:width="4dp" - android:color="?attr/filter_dialog_clear" /> - </shape> - - </rotate> - </item> - -</layer-list>
\ No newline at end of file diff --git a/core/src/main/res/drawable/drawer_item_background.xml b/core/src/main/res/drawable/drawer_item_background.xml new file mode 100644 index 000000000..a0ec893a8 --- /dev/null +++ b/core/src/main/res/drawable/drawer_item_background.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <shape android:shape="rectangle"> + <solid android:color="?attr/currently_playing_background"/> + <corners android:radius="32dp"/> + </shape> + </item> + <item android:state_selected="true"> + <shape android:shape="rectangle"> + <solid android:color="?attr/drawer_activated_color" /> + <corners android:radius="32dp" /> + </shape> + </item> + <item android:drawable="@android:color/transparent" /> +</selector> diff --git a/core/src/main/res/drawable/filter_dialog_background_dark.xml b/core/src/main/res/drawable/filter_dialog_background_dark.xml deleted file mode 100644 index 9ea827147..000000000 --- a/core/src/main/res/drawable/filter_dialog_background_dark.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/accent_dark" android:state_checked="true"/> - <item android:drawable="@color/dialog_filter_inactive_dark" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/filter_dialog_background_light.xml b/core/src/main/res/drawable/filter_dialog_background_light.xml deleted file mode 100644 index 09af585a6..000000000 --- a/core/src/main/res/drawable/filter_dialog_background_light.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/accent_light" android:state_checked="true"/> - <item android:drawable="@color/dialog_filter_inactive_light" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_filter_close.xml b/core/src/main/res/drawable/ic_filter_close.xml deleted file mode 100644 index 4d7eedb30..000000000 --- a/core/src/main/res/drawable/ic_filter_close.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Fall-back for old Android devices that do not support attrs as colors --> - <item - android:bottom="5dp" - android:left="5dp" - android:right="5dp" - android:top="5dp"> - - <shape android:shape="oval"> - <stroke - android:width="4dp" - android:color="#555" /> - </shape> - </item> - - <!-- x --> - <item - android:bottom="12dp" - android:left="12dp" - android:right="12dp" - android:top="12dp"> - <rotate - android:fromDegrees="135" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="135"> - <shape android:shape="line"> - <stroke - android:width="4dp" - android:color="#555" /> - </shape> - </rotate> - </item> - - <item - android:bottom="12dp" - android:left="12dp" - android:right="12dp" - android:top="12dp"> - <rotate - android:fromDegrees="45" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="45"> - <shape android:shape="line"> - <stroke - android:width="4dp" - android:color="#555" /> - </shape> - - </rotate> - </item> - -</layer-list>
\ No newline at end of file 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 349ca3213..000000000 --- a/core/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light"> - <item name="android:windowContentTransitions">true</item> - <!-- To make icons visible --> - <item name="android:statusBarColor">@color/grey600</item> - <item name="android:navigationBarColor">@color/grey600</item> - </style> - - <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> - <item name="android:windowContentTransitions">true</item> - <item name="android:statusBarColor">@color/background_darktheme</item> - <item name="android:navigationBarColor">@color/background_darktheme</item> - </style> - - <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> - <item name="android:statusBarColor">@color/black</item> - <item name="android:navigationBarColor">@color/black</item> - </style> -</resources>
\ No newline at end of file diff --git a/core/src/main/res/values-v23/styles.xml b/core/src/main/res/values-v23/styles.xml deleted file mode 100644 index 33c64ad4a..000000000 --- a/core/src/main/res/values-v23/styles.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light"> - <item name="android:windowContentTransitions">true</item> - <item name="android:statusBarColor">@color/background_light</item> - <item name="android:windowLightStatusBar">true</item> - <item name="android:navigationBarColor">@color/grey600</item> - </style> - - <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> - <item name="android:windowContentTransitions">true</item> - <item name="android:statusBarColor">@color/background_darktheme</item> - <item name="android:windowLightStatusBar">false</item> - <item name="android:navigationBarColor">@color/background_darktheme</item> - </style> - - <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> - <item name="android:statusBarColor">@color/black</item> - <item name="android:navigationBarColor">@color/black</item> - </style> -</resources>
\ No newline at end of file diff --git a/core/src/main/res/values-v27/styles.xml b/core/src/main/res/values-v27/styles.xml deleted file mode 100644 index a28090155..000000000 --- a/core/src/main/res/values-v27/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light"> - <item name="android:windowContentTransitions">true</item> - <item name="android:statusBarColor">@color/background_light</item> - <item name="android:windowLightStatusBar">true</item> - <item name="android:navigationBarColor">@color/background_light</item> - <item name="android:navigationBarDividerColor">@color/navigation_bar_divider_light</item> - <item name="android:windowLightNavigationBar">true</item> - </style> -</resources>
\ No newline at end of file diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 6f88b6d51..d2207bbfb 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -10,8 +10,6 @@ <attr name="scrollbar_thumb" format="reference"/> <attr name="background_color" format="color"/> <attr name="background_elevated" format="color"/> - <attr name="filter_dialog_clear" format="color"/> - <attr name="filter_dialog_button_background" format="reference"/> <attr name="seek_background" format="color" /> <attr name="icon_red" format="color" /> <attr name="icon_yellow" format="color" /> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 859b64367..d948fc2bb 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -25,19 +25,14 @@ <color name="non_square_icon_background">#22777777</color> <color name="seek_background_light">#90000000</color> <color name="seek_background_dark">#905B5B5B</color> - <color name="navigation_bar_divider_light">#1F000000</color> <color name="accent_light">#0078C2</color> + <color name="accent_light_alpha">#250078C2</color> <color name="accent_dark">#3D8BFF</color> + <color name="accent_dark_alpha">#253D8BFF</color> <color name="icon_background_gradient_start">#0ba2ff</color> <color name="icon_background_gradient_end">#0878ff</color> <color name="master_switch_background_light">#DDDDDD</color> <color name="master_switch_background_dark">#191919</color> - - <!-- filter dialog --> - <color name="dialog_filter_clear_inactive_light">#666666</color> - <color name="dialog_filter_clear_inactive_dark">#bbbbbb</color> - <color name="dialog_filter_inactive_light">#eeeeee</color> - <color name="dialog_filter_inactive_dark">#555555</color> </resources> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 72c4eef18..34cd04b1b 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -5,54 +5,64 @@ <!-- Room for API dependent attributes --> </style> - <style name="Theme.Base.AntennaPod.Light" parent="Theme.MaterialComponents.Light"> + <style name="Theme.Base.AntennaPod.Light" parent="Theme.Material3.Light"> <item name="colorPrimary">@color/accent_light</item> <item name="colorAccent">@color/accent_light</item> <item name="colorSecondary">@color/accent_light</item> <item name="colorOnSecondary">@color/white</item> <item name="progressBarTheme">@style/ProgressBarLight</item> <item name="colorPrimaryDark">@color/accent_light</item> + <item name="colorPrimaryContainer">@color/accent_light</item> + <item name="colorOnPrimaryContainer">@color/white</item> <item name="android:windowBackground">@color/background_light</item> + <item name="colorSurface">@color/background_light</item> <item name="background_color">@color/background_light</item> <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Light</item> <item name="background_elevated">@color/background_elevated_light</item> <item name="master_switch_background">@color/master_switch_background_light</item> <item name="currently_playing_background">@color/highlight_light</item> <item name="action_icon_color">@color/black</item> - <item name="drawer_activated_color">@color/highlight_light</item> + <item name="drawer_activated_color">@color/accent_light_alpha</item> <item name="android:textAllCaps">false</item> <item name="android:textColorHint">@color/grey600</item> <item name="seek_background">@color/seek_background_light</item> <item name="navigation_up">@drawable/navigation_up</item> <item name="dragview_background">@drawable/ic_drag_lighttheme</item> <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item> - <item name="filter_dialog_clear">@color/filter_dialog_clear_light</item> - <item name="filter_dialog_button_background">@drawable/filter_dialog_background_light</item> <item name="icon_red">#CF1800</item> <item name="icon_yellow">#F59F00</item> <item name="icon_green">#008537</item> <item name="icon_purple">#5F1984</item> <item name="icon_gray">#25365A</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:navigationBarColor" tools:targetApi="lollipop">@android:color/transparent</item> + <item name="android:windowLightStatusBar" tools:targetApi="m">true</item> + <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item> + <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item> </style> <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> <!-- Room for API dependent attributes --> </style> - <style name="Theme.Base.AntennaPod.Dark" parent="Theme.MaterialComponents"> + <style name="Theme.Base.AntennaPod.Dark" parent="Theme.Material3.Dark"> <item name="colorAccent">@color/accent_dark</item> <item name="colorSecondary">@color/accent_dark</item> <item name="colorOnSecondary">@color/black</item> <item name="colorPrimary">@color/accent_dark</item> <item name="colorPrimaryDark">@color/background_darktheme</item> + <item name="colorPrimaryContainer">@color/accent_dark</item> + <item name="colorOnPrimaryContainer">@color/black</item> <item name="android:windowBackground">@color/background_darktheme</item> + <item name="colorSurface">@color/background_darktheme</item> <item name="background_color">@color/background_darktheme</item> <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Dark</item> <item name="background_elevated">@color/background_elevated_darktheme</item> <item name="colorControlNormal">@color/white</item> <item name="progressBarTheme">@style/ProgressBarDark</item> - <item name="drawer_activated_color">@color/highlight_dark</item> + <item name="drawer_activated_color">@color/accent_dark_alpha</item> <item name="master_switch_background">@color/master_switch_background_dark</item> <item name="currently_playing_background">@color/highlight_dark</item> <item name="action_icon_color">@color/white</item> @@ -62,14 +72,18 @@ <item name="navigation_up">@drawable/navigation_up_dark</item> <item name="dragview_background">@drawable/ic_drag_darktheme</item> <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item> - <item name="filter_dialog_clear">@color/filter_dialog_clear_dark</item> - <item name="filter_dialog_button_background">@drawable/filter_dialog_background_dark</item> <item name="icon_red">#CF1800</item> <item name="icon_yellow">#F59F00</item> <item name="icon_green">#008537</item> <item name="icon_purple">#AA55D8</item> <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:navigationBarColor" tools:targetApi="lollipop">@android:color/transparent</item> + <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> + <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item> + <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item> </style> <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> @@ -85,6 +99,7 @@ <item name="android:color">@color/white</item> <item name="android:colorBackground">@color/black</item> <item name="android:windowBackground">@color/black</item> + <item name="colorSurface">@color/black</item> <item name="background_color">@color/black</item> <item name="android:actionBarStyle">@color/black</item> <item name="background_elevated">@color/black</item> @@ -147,7 +162,7 @@ <item name="android:windowExitAnimation">@android:anim/fade_out</item> </style> - <style name="Theme.AntennaPod.Splash" parent="Theme.MaterialComponents.NoActionBar"> + <style name="Theme.AntennaPod.Splash" parent="Theme.Material3.Dark.NoActionBar"> <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> @@ -210,15 +225,15 @@ <item name="fastScrollVerticalTrackDrawable">@drawable/scrollbar_track</item> </style> - <style name="Widget.AntennaPod.ActionBar.Light" parent="Widget.MaterialComponents.Light.ActionBar.Solid"> + <style name="Widget.AntennaPod.ActionBar.Light" parent="Widget.Material3.Light.ActionBar.Solid"> <item name="background">@color/background_light</item> </style> - <style name="Widget.AntennaPod.ActionBar.Dark" parent="Widget.MaterialComponents.Light.ActionBar.Solid"> + <style name="Widget.AntennaPod.ActionBar.Dark" parent="Widget.Material3.Light.ActionBar.Solid"> <item name="background">@color/background_darktheme</item> </style> - <style name="Widget.AntennaPod.ActionBar.Black" parent="Widget.MaterialComponents.Light.ActionBar.Solid"> + <style name="Widget.AntennaPod.ActionBar.Black" parent="Widget.Material3.Light.ActionBar.Solid"> <item name="background">@color/black</item> </style> @@ -231,9 +246,4 @@ <item name="android:clickable">true</item> </style> - <style name="NoButtonRadio" parent="Widget.MaterialComponents.CompoundButton.RadioButton"> - <item name="buttonCompat">@null</item> <!-- For Android 4.4 --> - <item name="android:button">@null</item> - </style> - </resources> |