From eb3993f776da330741ef9ef6522a5b20bd45f20b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 20 Sep 2020 23:13:28 +0200
Subject: New notification icon

---
 app/src/main/AndroidManifest.xml                         |   2 +-
 app/src/main/res/layout/feeditemlist_header.xml          |   2 +-
 app/src/main/res/layout/gpodnet_podcast_listitem.xml     |   2 +-
 app/src/main/res/layout/itunes_podcast_listitem.xml      |   2 +-
 app/src/main/res/layout/onlinefeedview_activity.xml      |   2 +-
 app/src/main/res/layout/searchlist_item.xml              |   2 +-
 app/src/main/res/layout/statistics_listitem.xml          |   2 +-
 .../playback/PlaybackServiceNotificationBuilder.java     |   4 ++--
 core/src/main/res/drawable-hdpi/ic_notification.png      | Bin 0 -> 1016 bytes
 core/src/main/res/drawable-mdpi/ic_notification.png      | Bin 0 -> 618 bytes
 core/src/main/res/drawable-xhdpi/ic_notification.png     | Bin 0 -> 1441 bytes
 core/src/main/res/drawable-xxhdpi/ic_notification.png    | Bin 0 -> 2390 bytes
 core/src/main/res/drawable-xxxhdpi/ic_notification.png   | Bin 0 -> 3121 bytes
 core/src/main/res/drawable/ic_antenna.xml                |   6 ------
 .../res/drawable/notification_default_large_icon.xml     |  15 ---------------
 core/src/main/res/layout/player_widget.xml               |   2 +-
 16 files changed, 10 insertions(+), 31 deletions(-)
 create mode 100644 core/src/main/res/drawable-hdpi/ic_notification.png
 create mode 100644 core/src/main/res/drawable-mdpi/ic_notification.png
 create mode 100644 core/src/main/res/drawable-xhdpi/ic_notification.png
 create mode 100644 core/src/main/res/drawable-xxhdpi/ic_notification.png
 create mode 100644 core/src/main/res/drawable-xxxhdpi/ic_notification.png
 delete mode 100644 core/src/main/res/drawable/ic_antenna.xml
 delete mode 100644 core/src/main/res/drawable/notification_default_large_icon.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b87c8d224..1f730b8a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
             android:value="true"/>
         <meta-data android:name="com.google.android.gms.car.notification.SmallIcon"
-            android:resource="@drawable/ic_antenna"/>
+            android:resource="@drawable/ic_notification"/>
         <meta-data
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc"/>
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index e74aeac0a..f8912b93e 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -22,7 +22,7 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginEnd="16dp"
                 android:importantForAccessibility="no"
-                tools:src="@drawable/ic_antenna"
+                tools:src="@tools:sample/avatars"
                 tools:background="@android:color/holo_green_dark"/>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 9821f6e17..99991e919 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -23,7 +23,7 @@
             android:importantForAccessibility="no"
             android:cropToPadding="true"
             android:scaleType="fitXY"
-            tools:src="@drawable/ic_antenna"
+            tools:src="@tools:sample/avatars"
             tools:background="@android:color/holo_green_dark"/>
 
 
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index dcf2face6..fe53e1944 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -23,7 +23,7 @@
         android:cropToPadding="true"
         android:scaleType="fitXY"
         tools:background="@android:color/holo_green_dark"
-        tools:src="@drawable/ic_antenna" />
+        tools:src="@tools:sample/avatars" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml
index 812933fb1..996db7d36 100644
--- a/app/src/main/res/layout/onlinefeedview_activity.xml
+++ b/app/src/main/res/layout/onlinefeedview_activity.xml
@@ -57,7 +57,7 @@
                             android:layout_marginStart="16dp"
                             android:layout_marginTop="16dp"
                             android:importantForAccessibility="no"
-                            tools:src="@drawable/ic_antenna"/>
+                            tools:src="@tools:sample/avatars"/>
 
                     <TextView
                             android:id="@+id/txtvTitle"
diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml
index 608bfc3bc..0072754d5 100644
--- a/app/src/main/res/layout/searchlist_item.xml
+++ b/app/src/main/res/layout/searchlist_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="@dimen/listitem_threeline_horizontalpadding"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_antenna"
+        tools:src="@tools:sample/avatars"
         tools:background="@android:color/holo_green_dark"/>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index c41ace58b..5989595e1 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -21,7 +21,7 @@
             android:adjustViewBounds="true"
             android:cropToPadding="true"
             android:scaleType="fitCenter"
-            tools:src="@drawable/ic_antenna"
+            tools:src="@tools:sample/avatars"
             tools:background="@android:color/holo_green_dark"/>
 
     <TextView
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 4bb88200a..6a892cc1c 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
@@ -85,7 +85,7 @@ public class PlaybackServiceNotificationBuilder {
 
     private Bitmap getDefaultIcon() {
         if (defaultIcon == null) {
-            defaultIcon = getBitmap(context, R.drawable.notification_default_large_icon);
+            defaultIcon = getBitmap(context, R.mipmap.ic_launcher);
         }
         return defaultIcon;
     }
@@ -136,7 +136,7 @@ public class PlaybackServiceNotificationBuilder {
 
         notification.setContentIntent(getPlayerActivityPendingIntent());
         notification.setWhen(0);
-        notification.setSmallIcon(R.drawable.ic_antenna);
+        notification.setSmallIcon(R.drawable.ic_notification);
         notification.setOngoing(false);
         notification.setOnlyAlertOnce(true);
         notification.setPriority(UserPreferences.getNotifyPriority());
diff --git a/core/src/main/res/drawable-hdpi/ic_notification.png b/core/src/main/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 000000000..e0b0f7f18
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_notification.png b/core/src/main/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 000000000..42943c7f0
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_notification.png b/core/src/main/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 000000000..2c633ba6b
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_notification.png b/core/src/main/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 000000000..16cc2aaf4
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_notification.png b/core/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 000000000..fbbb94cd0
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/core/src/main/res/drawable/ic_antenna.xml b/core/src/main/res/drawable/ic_antenna.xml
deleted file mode 100644
index 9fcfab000..000000000
--- a/core/src/main/res/drawable/ic_antenna.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="12.7"
-    android:viewportWidth="12.7" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m6.0631,0.4728v0.3274c1.1582,0.0249 1.911,0.4225 2.5991,1.1189 0.6881,0.6964 1.0924,1.7043 1.1125,2.9246h0.3211c0.0078,-1.3792 -0.5291,-2.4905 -1.1981,-3.1576C8.2288,1.019 7.3415,0.4734 6.0631,0.4728ZM6.0631,1.4283v0.3453c0.859,0.0361 1.3465,0.2123 1.9398,0.8081 0.5933,0.5957 0.843,1.3669 0.8598,2.2621L9.2029,4.8438c-0.0088,-1.2333 -0.5414,-2.0907 -0.9568,-2.5047 -0.4154,-0.4139 -0.9948,-0.9065 -2.183,-0.9108zM6.0625,2.4323 L6.0631,2.7495c0.3968,0.007 0.8308,0.1395 1.2089,0.5642 0.3781,0.4247 0.495,1.0244 0.51,1.53h0.3255c-0.0016,-0.669 -0.2787,-1.3891 -0.6153,-1.747 -0.3366,-0.358 -0.7368,-0.6621 -1.4298,-0.6645zM6.0906,3.7766c-0.4059,0.0002 -0.7349,0.3294 -0.7347,0.7353 0.0001,0.2677 0.1459,0.5142 0.3804,0.6434l-3.0102,6.2227 0.5151,0.3351 0.607,-1.2485 5.3821,1.5453 0.083,0.1609 0.5732,-0.2508 -3.4927,-6.7397c0.2624,-0.1189 0.4311,-0.3802 0.4315,-0.6683 0.0002,-0.4059 -0.3287,-0.7352 -0.7347,-0.7353zM6.065,5.8631 L6.5929,6.8882 5.2882,7.4761zM6.6976,7.0918 L7.6065,8.8561 5.137,7.8016zM5.0259,8.0199 L7.611,9.1184 4.0314,10.0854zM7.8395,9.3086 L9.081,11.7201 4.1489,10.3069z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.32680494"/>
-</vector>
diff --git a/core/src/main/res/drawable/notification_default_large_icon.xml b/core/src/main/res/drawable/notification_default_large_icon.xml
deleted file mode 100644
index 6da31b1bb..000000000
--- a/core/src/main/res/drawable/notification_default_large_icon.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportHeight="12.7"
-    android:viewportWidth="12.7"
-    android:height="64dp"
-    android:width="64dp">
-
-    <path
-        android:fillColor="#ff007DBA"
-        android:pathData="M 0,0 L 12.7,0 12.7,12.7 0,12.7 z"/>
-
-    <path
-        android:fillColor="#ffffffff"
-        android:pathData="m5.7552,2.2412l0,0.2651c0.9377,0.0202 1.5471,0.342 2.1043,0.9059 0.5571,0.5639 0.8845,1.3798 0.9007,2.3678l0.2599,0C9.0264,4.6634 8.5918,3.7637 8.0502,3.2236 7.5085,2.6834 6.7902,2.2418 5.7552,2.2412ZM5.7552,3.0148l0,0.2796c0.6954,0.0292 1.0901,0.1719 1.5704,0.6542 0.4803,0.4823 0.6825,1.1066 0.6961,1.8314l0.2754,0c-0.0071,-0.9985 -0.4383,-1.6927 -0.7746,-2.0278 -0.3363,-0.3351 -0.8054,-0.734 -1.7673,-0.7374zM5.7547,3.8277 L5.7552,4.0845c0.3213,0.006 0.6726,0.1129 0.9788,0.4568 0.3061,0.3439 0.4008,0.8294 0.4129,1.2387l0.2635,0C7.4091,5.2384 7.1848,4.6554 6.9122,4.3656 6.6397,4.0758 6.3157,3.8296 5.7547,3.8277ZM5.7774,4.916c-0.3286,0.0001 -0.595,0.2667 -0.5948,0.5953 0.0001,0.2168 0.1181,0.4163 0.308,0.5209l-2.4371,5.0379 0.417,0.2713 0.4914,-1.0108 4.3574,1.2511 0.0672,0.1302 0.4641,-0.2031L6.0229,6.0523c0.2124,-0.0963 0.349,-0.3078 0.3493,-0.5411 0.0002,-0.3286 -0.2661,-0.5952 -0.5948,-0.5953zM5.7567,6.6053 L6.1841,7.4352 5.1278,7.9111zM6.2689,7.6001 L7.0047,9.0284 5.0054,8.1747zM4.9154,8.3514 L7.0083,9.2408 4.1103,10.0237zM7.1934,9.3948 L8.1985,11.3471 4.2054,10.203Z" />
-
-</vector>
diff --git a/core/src/main/res/layout/player_widget.xml b/core/src/main/res/layout/player_widget.xml
index b0e5e0fd8..6e463e9cd 100644
--- a/core/src/main/res/layout/player_widget.xml
+++ b/core/src/main/res/layout/player_widget.xml
@@ -40,7 +40,7 @@
                 android:id="@+id/imgvCover"
                 android:layout_width="@android:dimen/app_icon_size"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_antenna"
+                android:src="@mipmap/ic_launcher_round"
                 android:layout_margin="12dp" />
 
             <LinearLayout
-- 
cgit v1.2.3