From 158e7acc2b6526e7f06af57d2cb220eba79943f4 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 19 May 2019 19:26:47 +0300 Subject: [PATCH] add adaptive icons --- app/src/main/AndroidManifest.xml | 3 +- .../audiorecorder/app/AudioApplication.java | 2 +- .../services/RecordingService.java | 8 +- ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 15 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + build.gradle | 2 +- 15 files changed, 198 insertions(+), 7 deletions(-) rename app/src/main/res/drawable-hdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-mdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xhdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xxhdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_mic.png => ic_launcher_notification.png} (100%) create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8b35467..f96d923 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,13 +19,14 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/RecThemeLight"> diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java index e0b9d5d..5d521a3 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java @@ -437,7 +437,7 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli .setText(text) .setMainIntent(main) .setChannel(channelStatus) - .setSmallIcon(R.drawable.ic_mic); + .setSmallIcon(R.drawable.ic_launcher_notification); NotificationManagerCompat nm = NotificationManagerCompat.from(this); nm.notify((int) System.currentTimeMillis(), builder.build()); } diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java index 883075f..ee84eda 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java @@ -18,7 +18,6 @@ import android.widget.RemoteViews; import com.github.axet.androidlibrary.app.AlarmManager; import com.github.axet.androidlibrary.services.PersistentService; -import com.github.axet.androidlibrary.widgets.NotificationChannelCompat; import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat; import com.github.axet.androidlibrary.widgets.ProximityShader; import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat; @@ -88,7 +87,7 @@ public class RecordingService extends PersistentService { } public static void startService(Context context, String targetFile, boolean recording, boolean encoding, String duration) { - OptimizationPreferenceCompat.startService(context, new Intent(context, RecordingService.class) + start(context, new Intent(context, RecordingService.class) .putExtra("targetFile", targetFile) .putExtra("recording", recording) .putExtra("encoding", encoding) @@ -250,8 +249,9 @@ public class RecordingService extends PersistentService { .setText(text) .setWhen(notification) .setMainIntent(main) - .setOngoing(true) - .setSmallIcon(R.drawable.ic_mic); + .setAdaptiveIcon(R.drawable.ic_launcher_foreground) + .setSmallIcon(R.drawable.ic_launcher_notification) + .setOngoing(true); return builder.build(); } diff --git a/app/src/main/res/drawable-hdpi-v11/ic_mic.png b/app/src/main/res/drawable-hdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi-v11/ic_mic.png rename to app/src/main/res/drawable-hdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-hdpi/ic_mic.png b/app/src/main/res/drawable-hdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_mic.png rename to app/src/main/res/drawable-hdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-mdpi-v11/ic_mic.png b/app/src/main/res/drawable-mdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-mdpi-v11/ic_mic.png rename to app/src/main/res/drawable-mdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-mdpi/ic_mic.png b/app/src/main/res/drawable-mdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_mic.png rename to app/src/main/res/drawable-mdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_mic.png b/app/src/main/res/drawable-xhdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xhdpi-v11/ic_mic.png rename to app/src/main/res/drawable-xhdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xhdpi/ic_mic.png b/app/src/main/res/drawable-xhdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_mic.png rename to app/src/main/res/drawable-xhdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_mic.png b/app/src/main/res/drawable-xxhdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi-v11/ic_mic.png rename to app/src/main/res/drawable-xxhdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_mic.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_mic.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..6bc81af --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6345f44..c2fb838 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.github.axet:gradle-android-dx:0.0.4' } }