Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6029 from ByteHamster/subscription-icon 

Change subscriptions icon from folder to grid view
This commit is contained in:
ByteHamster 2022-08-20 21:23:39 +02:00 committed by GitHub
parent 8e994165e6 0c8c860040
commit 6e199de7ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/runEmulatorTests.sh vendored
View File

@ -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

2
app/src/main/AndroidManifest.xml
View File

@ -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>

2
app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java
View File

@ -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)

2
app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
View File

@ -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:

2
app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
View File

@ -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);

2
app/src/main/res/xml/shortcuts.xml
View File

@ -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

2
core/src/main/res/drawable-anydpi-v26/ic_folder_shortcut.xml → core/src/main/res/drawable-anydpi-v26/ic_subscriptions_shortcut.xml
View File

@ -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>

5
core/src/main/res/drawable/ic_folder_black.xml
View File

@ -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>

10
core/src/main/res/drawable/ic_subscriptions.xml Normal file
View File

@ -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>

10
core/src/main/res/drawable/ic_subscriptions_black.xml Normal file
View File

@ -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>

2
core/src/main/res/drawable/ic_folder_shortcut.xml → core/src/main/res/drawable/ic_subscriptions_shortcut.xml
View File

@ -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>