diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java index 3a3eddddf..19c89e367 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java +++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java @@ -69,7 +69,7 @@ public class DownloaderNotifier .setAutoCancel(true) .setCategory(NotificationCompat.CATEGORY_ERROR) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) - .setSmallIcon(R.drawable.ic_splash) + .setSmallIcon(R.drawable.ic_launcher_small) .setColor(ContextCompat.getColor(mContext, R.color.notification)) .setContentTitle(title) .setContentText(content) @@ -124,7 +124,7 @@ public class DownloaderNotifier return new NotificationCompat.Builder(mContext, CHANNEL_ID) .setAutoCancel(true) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) - .setSmallIcon(R.drawable.ic_splash) + .setSmallIcon(R.drawable.ic_launcher) .setColor(ContextCompat.getColor(mContext, R.color.notification)) .setShowWhen(true) .setContentTitle(title) diff --git a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java index a217f355d..84dcf170d 100644 --- a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java +++ b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java @@ -106,7 +106,7 @@ public class TrackRecordingService extends Service implements LocationListener .setOngoing(true) .setShowWhen(true) .setOnlyAlertOnce(true) - .setSmallIcon(R.drawable.ic_splash) + .setSmallIcon(R.drawable.ic_launcher_small) .setContentTitle(context.getString(R.string.track_recording)) .addAction(0, context.getString(R.string.navigation_stop_button), getExitPendingIntent(context)) .setContentIntent(getPendingIntent(context)) diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index e1d4c125b..fc98f4b43 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -105,7 +105,7 @@ public class MapButtonsController extends Fragment if (Config.isNY() && !TextUtils.isEmpty(Config.getDonateUrl(requireContext()))) helpButton.setImageResource(R.drawable.ic_christmas_tree); else - helpButton.setImageResource(R.drawable.logo); + helpButton.setImageResource(R.drawable.ic_launcher); // Keep this button colorful in normal theme. if (!ThemeUtils.isNightTheme(requireContext())) helpButton.getDrawable().setTintList(null); diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java index 8e492dbbd..7266a13d4 100644 --- a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java +++ b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java @@ -152,7 +152,7 @@ public class NavigationService extends Service implements LocationListener .setOngoing(true) .setShowWhen(false) .setOnlyAlertOnce(true) - .setSmallIcon(R.drawable.ic_splash) + .setSmallIcon(R.drawable.ic_launcher_small) .setContentIntent(pendingIntent) .addAction(0, context.getString(R.string.navigation_stop_button), exitPendingIntent) .setColorized(isColorizedSupported()) diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_launcher_foreground.xml rename to android/app/src/main/res/drawable/ic_launcher.xml diff --git a/android/app/src/main/res/drawable/ic_launcher_small.xml b/android/app/src/main/res/drawable/ic_launcher_small.xml new file mode 100644 index 000000000..149241f9d --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_small.xml @@ -0,0 +1,10 @@ + + + + diff --git a/android/app/src/main/res/drawable/logo.xml b/android/app/src/main/res/drawable/logo.xml deleted file mode 100644 index d525940bf..000000000 --- a/android/app/src/main/res/drawable/logo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml index e66303004..85ae56473 100644 --- a/android/app/src/main/res/layout-land/about.xml +++ b/android/app/src/main/res/layout-land/about.xml @@ -58,7 +58,7 @@ android:layout_width="@dimen/about_logo" android:layout_height="@dimen/about_logo" android:contentDescription="@string/app_name" - app:srcCompat="@drawable/logo" + app:srcCompat="@drawable/ic_launcher" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/linearLayout2" app:layout_constraintHorizontal_bias="0.5" diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml index 7c71a3282..45e2dea90 100644 --- a/android/app/src/main/res/layout/about.xml +++ b/android/app/src/main/res/layout/about.xml @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/margin_base" android:layout_marginBottom="@dimen/margin_half" android:contentDescription="@string/app_name" - app:srcCompat="@drawable/logo" + app:srcCompat="@drawable/ic_launcher" app:tint="?attr/colorLogo" /> diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd1f..2dd876560 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 7353dbd1f..446d741f3 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file