From 806b1f48ecf93f93e548980a87c0e6495591f596 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 19 Sep 2020 21:20:15 +0200 Subject: Make ProviderInstaller synchronous again See #4077 for details: It is fast and the old method sometimes does not install the provider early enough Reverts #3946 and #4285 --- .../java/de/danoeh/antennapod/core/ClientConfig.java | 3 ++- .../core/service/ProviderInstallerInterceptor.java | 18 ------------------ .../core/service/download/AntennapodHttpClient.java | 2 -- .../java/de/danoeh/antennapod/core/ClientConfig.java | 16 ++-------------- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java (limited to 'core') diff --git a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java index 3c1eda242..824a4fae3 100644 --- a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java +++ b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java @@ -45,6 +45,7 @@ public class ClientConfig { UserPreferences.init(context); UsageStatistics.init(context); PlaybackPreferences.init(context); + installSslProvider(context); NetworkUtils.init(context); AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp")); SleepTimerPreferences.init(context); @@ -53,7 +54,7 @@ public class ClientConfig { initialized = true; } - public static void installSslProvider(Context context) { + private static void installSslProvider(Context context) { // ProviderInstaller is a closed-source Google library } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java b/core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java deleted file mode 100644 index 4fa1fc3d7..000000000 --- a/core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.danoeh.antennapod.core.service; - -import androidx.annotation.NonNull; -import okhttp3.Interceptor; -import okhttp3.Response; - -import java.io.IOException; - -public class ProviderInstallerInterceptor implements Interceptor { - public static Runnable installer = () -> { }; - - @Override - @NonNull - public Response intercept(Chain chain) throws IOException { - installer.run(); - return chain.proceed(chain.request()); - } -} diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java index d0484f2a2..e0c23bdac 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java @@ -32,7 +32,6 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.service.ProviderInstallerInterceptor; import de.danoeh.antennapod.core.service.UserAgentInterceptor; import de.danoeh.antennapod.core.storage.DBWriter; import okhttp3.Cache; @@ -117,7 +116,6 @@ public class AntennapodHttpClient { } return response; }); - builder.interceptors().add(new ProviderInstallerInterceptor()); builder.interceptors().add(new BasicAuthorizationInterceptor()); builder.networkInterceptors().add(new UserAgentInterceptor()); diff --git a/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java index 09d9f4623..7d38aedc2 100644 --- a/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java +++ b/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java @@ -12,7 +12,6 @@ import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.preferences.UsageStatistics; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.service.ProviderInstallerInterceptor; import de.danoeh.antennapod.core.service.download.AntennapodHttpClient; import de.danoeh.antennapod.core.storage.PodDBAdapter; import de.danoeh.antennapod.core.util.NetworkUtils; @@ -55,6 +54,7 @@ public class ClientConfig { UserPreferences.init(context); UsageStatistics.init(context); PlaybackPreferences.init(context); + installSslProvider(context); NetworkUtils.init(context); // Don't initialize Cast-related logic unless it is enabled, to avoid the unnecessary // Google Play Service usage. @@ -65,18 +65,6 @@ public class ClientConfig { } else { Log.v(TAG, "Cast is disabled. All Cast-related initialization will be skipped."); } - ProviderInstaller.installIfNeededAsync(context, new ProviderInstaller.ProviderInstallListener() { - @Override - public void onProviderInstalled() { - Log.e(TAG, "onProviderInstalled"); - } - - @Override - public void onProviderInstallFailed(int i, Intent intent) { - Log.e(TAG, "onProviderInstallFailed"); - } - }); - ProviderInstallerInterceptor.installer = () -> installSslProvider(context); AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp")); SleepTimerPreferences.init(context); RxJavaErrorHandlerSetup.setupRxJavaErrorHandler(); @@ -84,7 +72,7 @@ public class ClientConfig { initialized = true; } - public static void installSslProvider(Context context) { + private static void installSslProvider(Context context) { try { ProviderInstaller.installIfNeeded(context); } catch (GooglePlayServicesRepairableException e) { -- cgit v1.2.3 From d38c7a442aa9e1b6d69146f2647dba24f56dacf4 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 30 Aug 2020 09:17:24 +0200 Subject: Added 'special thanks' screen --- core/src/main/res/values/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 93a21ef13..b08d97e61 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -530,10 +530,11 @@ About AntennaPod version + Contributors + Everyone can help to make AntennaPod better - with code, translations or by helping users in our forum Developers - Everyone can help to make AntennaPod better Translators - Translations are created by users of AntennaPod using Transifex + Special thanks Privacy policy Licenses AntennaPod uses other great software -- cgit v1.2.3 From 43d36c7560eb018a2e450466d75c1dbbf136a961 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 11:52:09 +0200 Subject: Fixed crash when item has no feed Apparently, there are ways to end up with items that have no feed. This hotfix prevents the app from crashing but it does not solve the reason for items without feeds. --- core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java | 1 + 1 file changed, 1 insertion(+) (limited to 'core') diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java index c30f46315..7330a6c80 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java @@ -154,6 +154,7 @@ public final class DBReader { Feed feed = feedIndex.get(item.getFeedId()); if (feed == null) { Log.w(TAG, "No match found for item with ID " + item.getId() + ". Feed ID was " + item.getFeedId()); + feed = new Feed("", "", "Error: Item without feed"); } item.setFeed(feed); } -- cgit v1.2.3 From cab277bb856a893bfa4e41c69efafd4e3ee912da Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 22:45:23 +0200 Subject: New app icon --- .../debug/res/mipmap-anydpi-v26/ic_launcher.xml | 5 ----- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 ----- core/src/debug/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 8724 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 20491 bytes .../debug/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 8724 bytes core/src/debug/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 4821 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 9963 bytes .../debug/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 4821 bytes core/src/debug/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 13548 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 34069 bytes .../debug/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 13548 bytes core/src/debug/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 25054 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 75392 bytes .../debug/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 25054 bytes core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 38151 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 117617 bytes .../debug/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 38151 bytes .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 2 +- core/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 4628 -> 8596 bytes .../res/mipmap-hdpi/ic_launcher_background.png | Bin 0 -> 7069 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 4876 -> 20308 bytes .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4628 -> 8596 bytes core/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2752 -> 4783 bytes .../res/mipmap-mdpi/ic_launcher_background.png | Bin 0 -> 3120 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 2884 -> 10041 bytes .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2752 -> 4783 bytes core/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 6709 -> 13307 bytes .../res/mipmap-xhdpi/ic_launcher_background.png | Bin 0 -> 13262 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 6980 -> 34640 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6709 -> 13307 bytes core/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 10809 -> 24321 bytes .../res/mipmap-xxhdpi/ic_launcher_background.png | Bin 0 -> 35451 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 12641 -> 74736 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10809 -> 24321 bytes core/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 15604 -> 37255 bytes .../res/mipmap-xxxhdpi/ic_launcher_background.png | Bin 0 -> 64580 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 19600 -> 120501 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15604 -> 37255 bytes 39 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 core/src/debug/res/mipmap-hdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-mdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-xhdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 core/src/main/res/mipmap-hdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-mdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-xhdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png (limited to 'core') diff --git a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 74ad49784..000000000 --- a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 74ad49784..000000000 --- a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher.png b/core/src/debug/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..6f8022e25 Binary files /dev/null and b/core/src/debug/res/mipmap-hdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..d2a3c3206 Binary files /dev/null and b/core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..6f8022e25 Binary files /dev/null and b/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher.png b/core/src/debug/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..d542d555f Binary files /dev/null and b/core/src/debug/res/mipmap-mdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..69c0a3433 Binary files /dev/null and b/core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..d542d555f Binary files /dev/null and b/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..a02ec4ca8 Binary files /dev/null and b/core/src/debug/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..5653dad7c Binary files /dev/null and b/core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..a02ec4ca8 Binary files /dev/null and b/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..066f9e5a5 Binary files /dev/null and b/core/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..cd30be7a5 Binary files /dev/null and b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..066f9e5a5 Binary files /dev/null and b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..7dbab284c Binary files /dev/null and b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..fe1e7df8f Binary files /dev/null and b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..7dbab284c Binary files /dev/null and b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09bc5..4ae7d1237 100644 --- a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09bc5..4ae7d1237 100644 --- a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher.png b/core/src/main/res/mipmap-hdpi/ic_launcher.png index 12e9b3395..9c922ce1c 100644 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher.png and b/core/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_background.png b/core/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 000000000..92b669f3e Binary files /dev/null and b/core/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index d687f94bb..b487de37d 100644 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png index 12e9b3395..9c922ce1c 100644 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher.png b/core/src/main/res/mipmap-mdpi/ic_launcher.png index 1da13d374..ef741cee7 100644 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher.png and b/core/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_background.png b/core/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 000000000..7f16ee8ba Binary files /dev/null and b/core/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 2e7a4b74d..4003de0ea 100644 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png index 1da13d374..ef741cee7 100644 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher.png b/core/src/main/res/mipmap-xhdpi/ic_launcher.png index 32b022ada..b05c50d44 100644 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher.png and b/core/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 000000000..170e2f72e Binary files /dev/null and b/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 5f90a1d11..0cd7ee47a 100644 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 32b022ada..b05c50d44 100644 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png index 321600e15..9d0116d26 100644 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 000000000..adf055c06 Binary files /dev/null and b/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index d72ffedbb..fb39d3c71 100644 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 321600e15..9d0116d26 100644 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png index ff2870dca..3c61e7dfc 100644 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 000000000..f0be130f2 Binary files /dev/null and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 0af16fadf..c3fd1eb5a 100644 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index ff2870dca..3c61e7dfc 100644 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ -- cgit v1.2.3 From eb3993f776da330741ef9ef6522a5b20bd45f20b Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 23:13:28 +0200 Subject: New notification icon --- .../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 +- 9 files changed, 3 insertions(+), 24 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 (limited to 'core') 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 @@ - - - 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 @@ - - - - - - - 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" /> Date: Sun, 20 Sep 2020 23:34:43 +0200 Subject: New teaser images --- core/src/main/res/drawable-nodpi/teaser.png | Bin 60183 -> 208621 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'core') diff --git a/core/src/main/res/drawable-nodpi/teaser.png b/core/src/main/res/drawable-nodpi/teaser.png index 3b5261b28..d339ed512 100644 Binary files a/core/src/main/res/drawable-nodpi/teaser.png and b/core/src/main/res/drawable-nodpi/teaser.png differ -- cgit v1.2.3 From e82702655e5b2b5a4c5fe2a3d9276f052571ac68 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 21 Sep 2020 09:32:07 +0200 Subject: Updated widget icon --- .../de/danoeh/antennapod/core/service/PlayerWidgetJobService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java index f39ac0df8..7bf1a5df1 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java @@ -132,7 +132,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService { views.setImageViewBitmap(R.id.imgvCover, icon); } catch (Throwable tr) { Log.e(TAG, "Error loading the media icon for the widget", tr); - views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_foreground); + views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round); } views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle()); @@ -171,7 +171,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService { views.setViewVisibility(R.id.txtvProgress, View.GONE); views.setViewVisibility(R.id.txtvTitle, View.GONE); views.setViewVisibility(R.id.txtNoPlaying, View.VISIBLE); - views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_foreground); + views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round); views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_play_white_48dp); } -- cgit v1.2.3 From 727f38cf633a73ff219e66d5924691b95dc9a9e9 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 21 Sep 2020 09:50:01 +0200 Subject: New splash screen --- .../res/drawable/ic_launcher_background_debug.xml | 179 --------------------- .../ic_launcher_foreground_no_finish.png | Bin 0 -> 74988 bytes core/src/main/res/drawable/bg_splash.xml | 12 +- core/src/main/res/values/colors.xml | 4 +- core/src/main/res/values/styles.xml | 4 +- 5 files changed, 14 insertions(+), 185 deletions(-) delete mode 100644 core/src/debug/res/drawable/ic_launcher_background_debug.xml create mode 100644 core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png (limited to 'core') diff --git a/core/src/debug/res/drawable/ic_launcher_background_debug.xml b/core/src/debug/res/drawable/ic_launcher_background_debug.xml deleted file mode 100644 index 3bc445a92..000000000 --- a/core/src/debug/res/drawable/ic_launcher_background_debug.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png b/core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png new file mode 100644 index 000000000..33a5b3fe4 Binary files /dev/null and b/core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png differ diff --git a/core/src/main/res/drawable/bg_splash.xml b/core/src/main/res/drawable/bg_splash.xml index 32241ec22..929fe411a 100644 --- a/core/src/main/res/drawable/bg_splash.xml +++ b/core/src/main/res/drawable/bg_splash.xml @@ -1,13 +1,19 @@ - + + + + + + android:src="@drawable/ic_launcher_foreground_no_finish"/> \ No newline at end of file diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index a86d61eba..8cb386fcf 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -23,9 +23,11 @@ #0078C2 #3D8BFF - #008AB8 #DDDDDD #191919 + #0ba2ff + #0878ff + diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index ab78eac47..b7e482a91 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -224,8 +224,8 @@