Merge pull request #6029 from ByteHamster/subscription-icon

Change subscriptions icon from folder to grid view

11 files changed, 28 insertions, 14 deletions

diff --git a/.github/workflows/runEmulatorTests.sh b/.github/workflows/runEmulatorTests.sh
index 106b69444..c297932a7 100644
--- a/.github/workflows/runEmulatorTests.sh
+++ b/.github/workflows/runEmulatorTests.sh
@@ -4,8 +4,7 @@ set -o pipefail
 
 runTests() {
     ./gradlew connectedPlayDebugAndroidTest connectedDebugAndroidTest \
-        -Pandroid.testInstrumentationRunnerArguments.notAnnotation=de.test.antennapod.IgnoreOnCi \
-        | grep -v "V/InstrumentationResultParser: INSTRUMENTATION_STATUS"
+        -Pandroid.testInstrumentationRunnerArguments.notAnnotation=de.test.antennapod.IgnoreOnCi
 }
 
 # Retry tests to make them less flaky
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50ed82646..87375c9fc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -327,7 +327,7 @@
 
         <activity android:name=".activity.SelectSubscriptionActivity"
             android:label="@string/shortcut_subscription_label"
-            android:icon="@drawable/ic_folder_shortcut"
+            android:icon="@drawable/ic_subscriptions_shortcut"
             android:theme="@style/Theme.AntennaPod.Dark.Translucent"
             android:exported="true">
             <intent-filter>
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java
index 52293091e..26fff9f01 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java
@@ -99,7 +99,7 @@ public class SelectSubscriptionActivity extends AppCompatActivity {
         if (bitmap != null) {
             icon = IconCompat.createWithAdaptiveBitmap(bitmap);
         } else {
-            icon = IconCompat.createWithResource(this, R.drawable.ic_folder_shortcut);
+            icon = IconCompat.createWithResource(this, R.drawable.ic_subscriptions_shortcut);
         }
 
         ShortcutInfoCompat shortcut = new ShortcutInfoCompat.Builder(this, id)
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index c0fc07ff6..a6252522a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -123,7 +123,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
             case PlaybackHistoryFragment.TAG:
                 return R.drawable.ic_history;
             case SubscriptionFragment.TAG:
-                return R.drawable.ic_folder;
+                return R.drawable.ic_subscriptions;
             case AddFeedFragment.TAG:
                 return R.drawable.ic_add;
             default:
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 578a2fa84..6256faddb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -248,7 +248,7 @@ public class SubscriptionFragment extends Fragment
 
     private void setupEmptyView() {
         emptyView = new EmptyViewHandler(getContext());
-        emptyView.setIcon(R.drawable.ic_folder);
+        emptyView.setIcon(R.drawable.ic_subscriptions);
         emptyView.setTitle(R.string.no_subscriptions_head_label);
         emptyView.setMessage(R.string.no_subscriptions_label);
         emptyView.attachToRecyclerView(subscriptionRecycler);
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index c802e2bba..7ca3b3787 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -32,7 +32,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_folder_shortcut"
+        android:icon="@drawable/ic_subscriptions_shortcut"
         android:shortcutId="subscriptions"
         android:shortcutShortLabel="@string/subscriptions_label">
         <intent
diff --git a/core/src/main/res/drawable-anydpi-v26/ic_folder_shortcut.xml b/core/src/main/res/drawable-anydpi-v26/ic_subscriptions_shortcut.xml
index 0ee30ab73..10f437917 100644
--- a/core/src/main/res/drawable-anydpi-v26/ic_folder_shortcut.xml
+++ b/core/src/main/res/drawable-anydpi-v26/ic_subscriptions_shortcut.xml
@@ -3,7 +3,7 @@
     <background android:drawable="@color/grey100" />
     <foreground>
         <inset
-            android:drawable="@drawable/ic_folder_black"
+            android:drawable="@drawable/ic_subscriptions_black"
             android:inset="33.3%" />
     </foreground>
 </adaptive-icon>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_folder_black.xml b/core/src/main/res/drawable/ic_folder_black.xml
deleted file mode 100644
index 8096fa582..000000000
--- a/core/src/main/res/drawable/ic_folder_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="#000000" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
-</vector>
diff --git a/core/src/main/res/drawable/ic_subscriptions.xml b/core/src/main/res/drawable/ic_subscriptions.xml
new file mode 100644
index 000000000..325f38450
--- /dev/null
+++ b/core/src/main/res/drawable/ic_subscriptions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/action_icon_color"
+        android:pathData="M3,3v8h8V3H3zM9,9H5V5h4V9zM3,13v8h8v-8H3zM9,19H5v-4h4V19zM13,3v8h8V3H13zM19,9h-4V5h4V9zM13,13v8h8v-8H13zM19,19h-4v-4h4V19z"/>
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_subscriptions_black.xml b/core/src/main/res/drawable/ic_subscriptions_black.xml
new file mode 100644
index 000000000..b8200c5ba
--- /dev/null
+++ b/core/src/main/res/drawable/ic_subscriptions_black.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,3v8h8V3H3zM9,9H5V5h4V9zM3,13v8h8v-8H3zM9,19H5v-4h4V19zM13,3v8h8V3H13zM19,9h-4V5h4V9zM13,13v8h8v-8H13zM19,19h-4v-4h4V19z"/>
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_folder_shortcut.xml b/core/src/main/res/drawable/ic_subscriptions_shortcut.xml
index 2906c2795..b932aebaf 100644
--- a/core/src/main/res/drawable/ic_folder_shortcut.xml
+++ b/core/src/main/res/drawable/ic_subscriptions_shortcut.xml
@@ -2,6 +2,6 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/ic_shortcut_background" />
     <item
-        android:drawable="@drawable/ic_folder_black"
+        android:drawable="@drawable/ic_subscriptions_black"
         android:gravity="center" />
 </layer-list>
\ No newline at end of file