From 72d5c65c4f696b74dd7d217eb45bef5ad1bd619d Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Wed, 25 Sep 2019 15:24:23 +0200 Subject: Removed transparent notification button outline --- .../playback/PlaybackServiceNotificationBuilder.java | 12 ++++++------ .../main/res/drawable-hdpi/ic_media_cast_disconnect.png | Bin 2355 -> 0 bytes .../main/res/drawable-mdpi/ic_media_cast_disconnect.png | Bin 1467 -> 0 bytes .../main/res/drawable-xhdpi/ic_media_cast_disconnect.png | Bin 4496 -> 0 bytes .../res/drawable-xxhdpi/ic_media_cast_disconnect.png | Bin 7096 -> 0 bytes core/src/main/res/drawable/ic_notification_cast_off.xml | 5 +++++ .../main/res/drawable/ic_notification_fast_forward.xml | 5 +++++ .../main/res/drawable/ic_notification_fast_rewind.xml | 5 +++++ core/src/main/res/drawable/ic_notification_key.xml | 9 +++++---- core/src/main/res/drawable/ic_notification_pause.xml | 5 +++++ core/src/main/res/drawable/ic_notification_play.xml | 5 +++++ core/src/main/res/drawable/ic_notification_skip.xml | 5 +++++ 12 files changed, 41 insertions(+), 10 deletions(-) delete mode 100644 core/src/main/res/drawable-hdpi/ic_media_cast_disconnect.png delete mode 100644 core/src/main/res/drawable-mdpi/ic_media_cast_disconnect.png delete mode 100644 core/src/main/res/drawable-xhdpi/ic_media_cast_disconnect.png delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_media_cast_disconnect.png create mode 100644 core/src/main/res/drawable/ic_notification_cast_off.xml create mode 100644 core/src/main/res/drawable/ic_notification_fast_forward.xml create mode 100644 core/src/main/res/drawable/ic_notification_fast_rewind.xml create mode 100644 core/src/main/res/drawable/ic_notification_pause.xml create mode 100644 core/src/main/res/drawable/ic_notification_play.xml create mode 100644 core/src/main/res/drawable/ic_notification_skip.xml diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java index 0e7339ac4..1a13fe5a7 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java @@ -115,7 +115,7 @@ public class PlaybackServiceNotificationBuilder extends NotificationCompat.Build stopCastingIntent.putExtra(PlaybackService.EXTRA_CAST_DISCONNECT, true); PendingIntent stopCastingPendingIntent = PendingIntent.getService(context, numActions, stopCastingIntent, PendingIntent.FLAG_UPDATE_CURRENT); - addAction(R.drawable.ic_media_cast_disconnect, + addAction(R.drawable.ic_notification_cast_off, context.getString(R.string.cast_disconnect_label), stopCastingPendingIntent); numActions++; @@ -124,7 +124,7 @@ public class PlaybackServiceNotificationBuilder extends NotificationCompat.Build // always let them rewind PendingIntent rewindButtonPendingIntent = getPendingIntentForMediaAction( KeyEvent.KEYCODE_MEDIA_REWIND, numActions); - addAction(android.R.drawable.ic_media_rew, context.getString(R.string.rewind_label), rewindButtonPendingIntent); + addAction(R.drawable.ic_notification_fast_rewind, context.getString(R.string.rewind_label), rewindButtonPendingIntent); if (UserPreferences.showRewindOnCompactNotification()) { compactActionList.add(numActions); } @@ -133,14 +133,14 @@ public class PlaybackServiceNotificationBuilder extends NotificationCompat.Build if (playerStatus == PlayerStatus.PLAYING) { PendingIntent pauseButtonPendingIntent = getPendingIntentForMediaAction( KeyEvent.KEYCODE_MEDIA_PAUSE, numActions); - addAction(android.R.drawable.ic_media_pause, //pause action + addAction(R.drawable.ic_notification_pause, //pause action context.getString(R.string.pause_label), pauseButtonPendingIntent); compactActionList.add(numActions++); } else { PendingIntent playButtonPendingIntent = getPendingIntentForMediaAction( KeyEvent.KEYCODE_MEDIA_PLAY, numActions); - addAction(android.R.drawable.ic_media_play, //play action + addAction(R.drawable.ic_notification_play, //play action context.getString(R.string.play_label), playButtonPendingIntent); compactActionList.add(numActions++); @@ -149,7 +149,7 @@ public class PlaybackServiceNotificationBuilder extends NotificationCompat.Build // ff follows play, then we have skip (if it's present) PendingIntent ffButtonPendingIntent = getPendingIntentForMediaAction( KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, numActions); - addAction(android.R.drawable.ic_media_ff, context.getString(R.string.fast_forward_label), ffButtonPendingIntent); + addAction(R.drawable.ic_notification_fast_forward, context.getString(R.string.fast_forward_label), ffButtonPendingIntent); if (UserPreferences.showFastForwardOnCompactNotification()) { compactActionList.add(numActions); } @@ -158,7 +158,7 @@ public class PlaybackServiceNotificationBuilder extends NotificationCompat.Build if (UserPreferences.isFollowQueue()) { PendingIntent skipButtonPendingIntent = getPendingIntentForMediaAction( KeyEvent.KEYCODE_MEDIA_NEXT, numActions); - addAction(android.R.drawable.ic_media_next, + addAction(R.drawable.ic_notification_skip, context.getString(R.string.skip_episode_label), skipButtonPendingIntent); if (UserPreferences.showSkipOnCompactNotification()) { diff --git a/core/src/main/res/drawable-hdpi/ic_media_cast_disconnect.png b/core/src/main/res/drawable-hdpi/ic_media_cast_disconnect.png deleted file mode 100644 index 700c116e5..000000000 Binary files a/core/src/main/res/drawable-hdpi/ic_media_cast_disconnect.png and /dev/null differ diff --git a/core/src/main/res/drawable-mdpi/ic_media_cast_disconnect.png b/core/src/main/res/drawable-mdpi/ic_media_cast_disconnect.png deleted file mode 100644 index 767f420df..000000000 Binary files a/core/src/main/res/drawable-mdpi/ic_media_cast_disconnect.png and /dev/null differ diff --git a/core/src/main/res/drawable-xhdpi/ic_media_cast_disconnect.png b/core/src/main/res/drawable-xhdpi/ic_media_cast_disconnect.png deleted file mode 100644 index 740867129..000000000 Binary files a/core/src/main/res/drawable-xhdpi/ic_media_cast_disconnect.png and /dev/null differ diff --git a/core/src/main/res/drawable-xxhdpi/ic_media_cast_disconnect.png b/core/src/main/res/drawable-xxhdpi/ic_media_cast_disconnect.png deleted file mode 100644 index 2d2ec9035..000000000 Binary files a/core/src/main/res/drawable-xxhdpi/ic_media_cast_disconnect.png and /dev/null differ diff --git a/core/src/main/res/drawable/ic_notification_cast_off.xml b/core/src/main/res/drawable/ic_notification_cast_off.xml new file mode 100644 index 000000000..63a21fbe2 --- /dev/null +++ b/core/src/main/res/drawable/ic_notification_cast_off.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_notification_fast_forward.xml b/core/src/main/res/drawable/ic_notification_fast_forward.xml new file mode 100644 index 000000000..bf564977c --- /dev/null +++ b/core/src/main/res/drawable/ic_notification_fast_forward.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_notification_fast_rewind.xml b/core/src/main/res/drawable/ic_notification_fast_rewind.xml new file mode 100644 index 000000000..847159cc5 --- /dev/null +++ b/core/src/main/res/drawable/ic_notification_fast_rewind.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_notification_key.xml b/core/src/main/res/drawable/ic_notification_key.xml index b1e2f9b8c..c8a817eeb 100644 --- a/core/src/main/res/drawable/ic_notification_key.xml +++ b/core/src/main/res/drawable/ic_notification_key.xml @@ -1,5 +1,6 @@ - - + + diff --git a/core/src/main/res/drawable/ic_notification_pause.xml b/core/src/main/res/drawable/ic_notification_pause.xml new file mode 100644 index 000000000..d46efb2f5 --- /dev/null +++ b/core/src/main/res/drawable/ic_notification_pause.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_notification_play.xml b/core/src/main/res/drawable/ic_notification_play.xml new file mode 100644 index 000000000..d571460c6 --- /dev/null +++ b/core/src/main/res/drawable/ic_notification_play.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_notification_skip.xml b/core/src/main/res/drawable/ic_notification_skip.xml new file mode 100644 index 000000000..0c65448cc --- /dev/null +++ b/core/src/main/res/drawable/ic_notification_skip.xml @@ -0,0 +1,5 @@ + + + -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0