From d3b5b0e14e11d96a12c1bfb1fdf8a17c7dd6fa57 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 20 Aug 2022 16:47:14 +0200 Subject: [PATCH 1/2] Change subscriptions icon from folder to grid view --- app/src/main/AndroidManifest.xml | 2 +- .../activity/SelectSubscriptionActivity.java | 2 +- .../de/danoeh/antennapod/adapter/NavListAdapter.java | 2 +- .../antennapod/fragment/SubscriptionFragment.java | 2 +- app/src/main/res/xml/shortcuts.xml | 2 +- ...lder_shortcut.xml => ic_subscriptions_shortcut.xml} | 2 +- core/src/main/res/drawable/ic_folder_black.xml | 5 ----- core/src/main/res/drawable/ic_subscriptions.xml | 10 ++++++++++ core/src/main/res/drawable/ic_subscriptions_black.xml | 10 ++++++++++ ...lder_shortcut.xml => ic_subscriptions_shortcut.xml} | 2 +- 10 files changed, 27 insertions(+), 12 deletions(-) rename core/src/main/res/drawable-anydpi-v26/{ic_folder_shortcut.xml => ic_subscriptions_shortcut.xml} (76%) delete mode 100644 core/src/main/res/drawable/ic_folder_black.xml create mode 100644 core/src/main/res/drawable/ic_subscriptions.xml create mode 100644 core/src/main/res/drawable/ic_subscriptions_black.xml rename core/src/main/res/drawable/{ic_folder_shortcut.xml => ic_subscriptions_shortcut.xml} (75%) 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 @@ 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 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 @@ \ 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 @@ - - - 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 @@ + + + + \ 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 @@ + + + + \ 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 similarity index 75% rename from core/src/main/res/drawable/ic_folder_shortcut.xml rename to 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 @@ \ No newline at end of file From 0c8c8600406e33286e7bb2b9618cafeab2b3df61 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 20 Aug 2022 21:05:10 +0200 Subject: [PATCH 2/2] Print more logs in emulator tests --- .github/workflows/runEmulatorTests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 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