Merge pull request #3965 from ByteHamster/sync-icon-vector

Updated sync icons

13 files changed, 16 insertions, 6 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index e4d9ff361..70fa4c91f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -329,7 +329,7 @@ public class GpodnetSyncService extends SafeJobIntentService {
                 .setContentTitle(title)
                 .setContentText(description)
                 .setContentIntent(activityIntent)
-                .setSmallIcon(R.drawable.stat_notify_sync_error)
+                .setSmallIcon(R.drawable.ic_notification_sync_error)
                 .setAutoCancel(true)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .build();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
index b6f7e0b8f..59d0266df 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
@@ -34,7 +34,7 @@ public class DownloadServiceNotification {
         notificationCompatBuilder = new NotificationCompat.Builder(context, NotificationUtils.CHANNEL_ID_DOWNLOADING)
                 .setOngoing(true)
                 .setContentIntent(ClientConfig.downloadServiceCallbacks.getNotificationContentIntent(context))
-                .setSmallIcon(R.drawable.stat_notify_sync);
+                .setSmallIcon(R.drawable.ic_notification_sync);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             notificationCompatBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
         }
@@ -144,14 +144,14 @@ public class DownloadServiceNotification {
                 // We are generating an auto-download report
                 channelId = NotificationUtils.CHANNEL_ID_AUTO_DOWNLOAD;
                 titleId = R.string.auto_download_report_title;
-                iconId = R.drawable.auto_download_complete;
+                iconId = R.drawable.ic_notification_auto_download_complete;
                 intent = ClientConfig.downloadServiceCallbacks.getAutoDownloadReportNotificationContentIntent(context);
                 id = AUTO_REPORT_ID;
                 content = createAutoDownloadNotificationContent(reportQueue);
             } else {
                 channelId = NotificationUtils.CHANNEL_ID_ERROR;
                 titleId = R.string.download_report_title;
-                iconId = R.drawable.stat_notify_sync_error;
+                iconId = R.drawable.ic_notification_sync_error;
                 intent = ClientConfig.downloadServiceCallbacks.getReportNotificationContentIntent(context);
                 id = REPORT_ID;
                 content = String.format(context.getString(R.string.download_report_content), successfulDownloads, failedDownloads);
diff --git a/core/src/main/res/drawable-hdpi/stat_notify_sync.png b/core/src/main/res/drawable-hdpi/stat_notify_sync.png
deleted file mode 100644
index f70373d50..000000000
--- a/core/src/main/res/drawable-hdpi/stat_notify_sync.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png
deleted file mode 100644
index 222e9e8b1..000000000
--- a/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/stat_notify_sync.png b/core/src/main/res/drawable-mdpi/stat_notify_sync.png
deleted file mode 100644
index 02066f847..000000000
--- a/core/src/main/res/drawable-mdpi/stat_notify_sync.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png
deleted file mode 100644
index d797f59c3..000000000
--- a/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/stat_notify_sync.png b/core/src/main/res/drawable-xhdpi/stat_notify_sync.png
deleted file mode 100644
index d7348168d..000000000
--- a/core/src/main/res/drawable-xhdpi/stat_notify_sync.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png
deleted file mode 100644
index 78c5df4d9..000000000
--- a/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png b/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png
deleted file mode 100644
index dabb1ea27..000000000
--- a/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png
deleted file mode 100644
index 6810a8249..000000000
--- a/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png
+++ /dev/null
diff --git a/core/src/main/res/drawable/auto_download_complete.xml b/core/src/main/res/drawable/ic_notification_auto_download_complete.xml
index 500d1e156..0caf27836 100644
--- a/core/src/main/res/drawable/auto_download_complete.xml
+++ b/core/src/main/res/drawable/ic_notification_auto_download_complete.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/core/src/main/res/drawable/ic_notification_sync.xml b/core/src/main/res/drawable/ic_notification_sync.xml
new file mode 100644
index 000000000..c42a78d7d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_notification_sync.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_notification_sync_error.xml b/core/src/main/res/drawable/ic_notification_sync_error.xml
new file mode 100644
index 000000000..b5be1b747
--- /dev/null
+++ b/core/src/main/res/drawable/ic_notification_sync_error.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M3,12c0,2.21 0.91,4.2 2.36,5.64L3,20h6v-6l-2.24,2.24C5.68,15.15 5,13.66 5,12c0,-2.61 1.67,-4.83 4,-5.65L9,4.26C5.55,5.15 3,8.27 3,12zM11,17h2v-2h-2v2zM21,4h-6v6l2.24,-2.24C18.32,8.85 19,10.34 19,12c0,2.61 -1.67,4.83 -4,5.65v2.09c3.45,-0.89 6,-4.01 6,-7.74 0,-2.21 -0.91,-4.2 -2.36,-5.64L21,4zM11,13h2L13,7h-2v6z"/>
+</vector>