diff --git a/android/.idea/icon.svg b/android/.idea/icon.svg new file mode 100644 index 000000000..430734c70 --- /dev/null +++ b/android/.idea/icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/android/app/ic_launcher-playstore.png b/android/app/ic_launcher-playstore.png deleted file mode 100644 index cfb08eaa5..000000000 Binary files a/android/app/ic_launcher-playstore.png and /dev/null differ diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png index 8f95a4f44..cde6e240a 100644 Binary files a/android/app/src/main/ic_launcher-playstore.png and b/android/app/src/main/ic_launcher-playstore.png differ diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index bd5abff11..096fbe6fa 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -850,7 +850,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void drawIcon(FloatingActionButton imageView) { - imageView.setImageResource(R.drawable.ic_question_mark); + imageView.setImageResource(R.drawable.ic_logo_monochrome); } @Override @@ -2615,7 +2615,7 @@ public class MwmActivity extends BaseMwmFragmentActivity items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected)); if (!BUTTON_HELP_CODE.equals(activeLeftButton)) - items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_question_mark, this::showHelp)); + items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_logo_monochrome, this::showHelp)); return items; } 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 499d3d9bd..c3c2d791a 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_launcher_small) + .setSmallIcon(R.drawable.ic_logo_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_launcher_small) + .setSmallIcon(R.drawable.ic_logo_small) .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 270846932..ef9f496bb 100644 --- a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java +++ b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java @@ -107,7 +107,7 @@ public class TrackRecordingService extends Service implements LocationListener .setOngoing(true) .setShowWhen(true) .setOnlyAlertOnce(true) - .setSmallIcon(R.drawable.ic_launcher_small) + .setSmallIcon(R.drawable.ic_logo_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/routing/NavigationService.java b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java index 9d2a9c371..ac92486f9 100644 --- a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java +++ b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java @@ -154,7 +154,7 @@ public class NavigationService extends Service implements LocationListener .setOngoing(true) .setShowWhen(false) .setOnlyAlertOnce(true) - .setSmallIcon(R.drawable.ic_launcher_small) + .setSmallIcon(R.drawable.ic_logo_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.xml b/android/app/src/main/res/drawable/ic_launcher.xml deleted file mode 100644 index a593628a2..000000000 --- a/android/app/src/main/res/drawable/ic_launcher.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..1bc6c04f4 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml new file mode 100644 index 000000000..8e9a764dd --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml @@ -0,0 +1,4 @@ + diff --git a/android/app/src/main/res/drawable/ic_launcher_small.xml b/android/app/src/main/res/drawable/ic_launcher_small.xml deleted file mode 100644 index 08df30fd4..000000000 --- a/android/app/src/main/res/drawable/ic_launcher_small.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/android/app/src/main/res/drawable/ic_logo.xml b/android/app/src/main/res/drawable/ic_logo.xml new file mode 100644 index 000000000..0a5f45e9e --- /dev/null +++ b/android/app/src/main/res/drawable/ic_logo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/android/app/src/main/res/drawable/ic_logo_monochrome.xml b/android/app/src/main/res/drawable/ic_logo_monochrome.xml new file mode 100644 index 000000000..a843e260e --- /dev/null +++ b/android/app/src/main/res/drawable/ic_logo_monochrome.xml @@ -0,0 +1,12 @@ + + + + diff --git a/android/app/src/main/res/drawable/ic_logo_small.xml b/android/app/src/main/res/drawable/ic_logo_small.xml new file mode 100644 index 000000000..516758aa8 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_logo_small.xml @@ -0,0 +1,12 @@ + + + + diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml index 8b3cbd9dd..2537b06f5 100644 --- a/android/app/src/main/res/layout/about.xml +++ b/android/app/src/main/res/layout/about.xml @@ -17,15 +17,14 @@ android:orientation="vertical" android:padding="@dimen/margin_base"> - + app:srcCompat="@drawable/ic_logo_monochrome" + app:tint="?attr/colorLogo"/> @@ -22,8 +22,18 @@ android:id="@+id/tv__app_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/margin_double" + android:text="@string/app_name" + android:gravity="center_horizontal" + android:textAppearance="@style/MwmTextAppearance.Title.Splash" /> + + diff --git a/android/app/src/main/res/layout/map_buttons_help.xml b/android/app/src/main/res/layout/map_buttons_help.xml index daadd50ae..40912c945 100644 --- a/android/app/src/main/res/layout/map_buttons_help.xml +++ b/android/app/src/main/res/layout/map_buttons_help.xml @@ -4,6 +4,5 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/help_button" style="@style/MwmWidget.MapButton.Square" - android:tint="@null" app:shapeAppearanceOverlay="@style/MwmWidget.MapButton.Square" app:srcCompat="@drawable/ic_question_mark" /> \ No newline at end of file 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 2dd876560..5dfac840d 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,6 +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 deleted file mode 100644 index 446d741f3..000000000 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 2a159c33a..3a7599ec7 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp deleted file mode 100644 index c8db9c0f0..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index a18056413..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 1c8542fff..e78c32183 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp deleted file mode 100644 index 857989d0d..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 7d9d1efa8..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index e5d40431e..f7b843b90 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp deleted file mode 100644 index 1de2a9490..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 64c3e804d..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 104dca14f..bec3dcee5 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp deleted file mode 100644 index db4e8958a..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 60925d3b0..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aea5f404c..e7b33f2a9 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp deleted file mode 100644 index d24c2dea5..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index f1d6c9aa9..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index cc673bd3b..000000000 --- a/android/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #588157 - \ No newline at end of file diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml index 3a139acec..8e9ede75e 100644 --- a/android/app/src/main/res/values/themes-base.xml +++ b/android/app/src/main/res/values/themes-base.xml @@ -169,7 +169,7 @@ @color/base_accent_transparent @color/white_24 @color/bg_panel_night - @color/white_primary + @color/base_accent_night @color/white_secondary @color/white_12 @color/yellow