[Android] Change to the new logo 🎉

Signed-off-by: Harry Bond <me@hbond.xyz>

android/.idea/icon.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64pt" height="64pt" viewBox="0 0 835 835">
+<path d="M698.5 141.1a20 20 0 0 1 30.8-1.3A416 416 0 0 1 835 417.4a416 416 0 0 1-93.3 263 20 20 0 0 1-31.3-.6l-43-56.6a20 20 0 0 1-.2-24 307 307 0 0 0 59.3-181.8c0-74.2-26.2-142.3-69.9-195.6a20 20 0 0 1-.5-24.8zM260.7 456.4a20 20 0 0 1-7.7-36.7l282-177.4a20 20 0 0 1 29.9 22.7l-97 318.9a20 20 0 0 1-37.5 2.2l-49.2-111.5z" style="fill:#ccdfca"/>
+<path d="M626.3 753a20 20 0 0 1-6.2 29.6A416 416 0 0 1 417.5 835 417.7 417.7 0 0 1 0 417.4 417.7 417.7 0 0 1 603.3 43.5a20 20 0 0 1 7 30l-42.4 55.8a20 20 0 0 1-24.2 6.1 307 307 0 0 0-126.2-27 309 309 0 0 0-309 309c0 170.6 138.5 309 309 309a307 307 0 0 0 141.6-34.3 20 20 0 0 1 25.1 5.6z" style="fill:#fefdf6"/>
+</svg>

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;
     }

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)

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

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

android/app/src/main/res/drawable/ic_launcher.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M28.2,58.5q-1.6,0 -2.87,-0.74 -1.26,-0.73 -1.98,-2.09t-0.72,-3.21q0,-1.87 0.72,-3.23t1.98,-2.1q1.27,-0.72 2.87,-0.72 1.03,0 1.91,0.3 0.88,0.31 1.56,0.88 0.68,0.56 1.11,1.36 0.44,0.79 0.58,1.77L30.9,50.72q-0.1,-0.52 -0.34,-0.92 -0.23,-0.4 -0.58,-0.68t-0.8,-0.43q-0.43,-0.15 -0.96,-0.15 -1,0 -1.7,0.48t-1.08,1.36 -0.38,2.08 0.37,2.07 1.09,1.35 1.7,0.48q0.53,0 0.97,-0.14t0.78,-0.43 0.59,-0.68 0.35,-0.91h2.44q-0.14,0.97 -0.58,1.76 -0.43,0.8 -1.11,1.36t-1.57,0.88q-0.87,0.3 -1.9,0.3m10.56,0q-1.25,0 -2.2,-0.55 -0.95,-0.54 -1.48,-1.51 -0.53,-0.98 -0.53,-2.28t0.53,-2.27 1.48,-1.52 2.2,-0.55q1.27,0 2.21,0.55 0.95,0.54 1.48,1.52 0.54,0.97 0.54,2.27t-0.54,2.28 -1.48,1.51 -2.2,0.55m0,-1.88q0.57,0 1,-0.3 0.42,-0.3 0.65,-0.84 0.24,-0.55 0.24,-1.32t-0.24,-1.32q-0.23,-0.55 -0.66,-0.84 -0.42,-0.3 -0.99,-0.3 -0.55,0 -0.98,0.3 -0.42,0.29 -0.66,0.84 -0.23,0.55 -0.23,1.32 0,0.78 0.23,1.33 0.24,0.54 0.66,0.84t0.98,0.29m5.82,1.69L44.58,46.6h3.53l1.93,5.45 0.29,0.91 0.33,1.13q0.18,0.58 0.32,1.11l0.24,0.9h-0.6l0.23,-0.9 0.32,-1.11 0.34,-1.13 0.27,-0.9 1.91,-5.46h3.53v11.7h-2.37v-5.56l0.01,-0.93 0.03,-1.16 0.03,-1.25 0.03,-1.2h0.29l-0.38,1.27 -0.37,1.27 -0.34,1.13 -0.28,0.87 -1.98,5.57h-1.96l-2,-5.57 -0.3,-0.87 -0.35,-1.13 -0.38,-1.27 -0.39,-1.27h0.35l0.02,1.2 0.03,1.25 0.03,1.16 0.01,0.93v5.57zM61.72,58.45q-0.82,0 -1.47,-0.28 -0.64,-0.27 -1.01,-0.82 -0.37,-0.56 -0.37,-1.39 0,-0.7 0.26,-1.16 0.26,-0.47 0.7,-0.75 0.46,-0.3 1.04,-0.44 0.6,-0.15 1.24,-0.2 0.76,-0.09 1.2,-0.16 0.46,-0.07 0.65,-0.2 0.2,-0.14 0.2,-0.4v-0.06q0,-0.3 -0.17,-0.53 -0.16,-0.24 -0.47,-0.37 -0.3,-0.14 -0.72,-0.14t-0.75,0.14 -0.52,0.38q-0.18,0.24 -0.22,0.56h-2.17q0.05,-0.85 0.5,-1.48 0.46,-0.63 1.27,-0.97 0.82,-0.35 1.96,-0.35 0.85,0 1.52,0.2 0.67,0.19 1.12,0.56 0.47,0.37 0.7,0.9 0.24,0.52 0.24,1.19v5.63h-2.27v-1.17h-0.03q-0.22,0.4 -0.54,0.7t-0.79,0.45 -1.1,0.16m0.65,-1.61q0.56,0 0.96,-0.2t0.63,-0.57 0.22,-0.8v-0.83l-0.27,0.11 -0.39,0.1 -0.48,0.08 -0.53,0.09q-0.4,0.06 -0.72,0.2 -0.33,0.12 -0.52,0.34 -0.18,0.21 -0.18,0.54 0,0.3 0.15,0.5 0.16,0.22 0.45,0.33t0.68,0.1m5.98,4.75L68.35,50.01h2.29v1.12h0.02q0.26,-0.43 0.62,-0.72 0.37,-0.29 0.83,-0.43 0.48,-0.15 1.01,-0.15 1.06,0 1.86,0.55 0.81,0.55 1.26,1.52 0.46,0.97 0.46,2.25 0,1.3 -0.45,2.27 -0.45,0.98 -1.25,1.52t-1.9,0.54q-0.54,0 -1,-0.16 -0.46,-0.15 -0.82,-0.47t-0.59,-0.79h-0.02v4.53zM72.51,56.58q0.56,0 0.97,-0.28 0.42,-0.29 0.65,-0.83 0.23,-0.55 0.23,-1.33t-0.23,-1.32 -0.65,-0.83q-0.4,-0.3 -0.97,-0.3 -0.59,0 -1.03,0.31 -0.44,0.3 -0.69,0.85 -0.23,0.54 -0.23,1.29 0,0.74 0.23,1.29 0.25,0.55 0.69,0.85 0.45,0.3 1.03,0.3m9.18,1.92q-1.08,0 -1.92,-0.33 -0.84,-0.34 -1.35,-0.97 -0.5,-0.62 -0.58,-1.51h2.28q0.07,0.54 0.46,0.85 0.4,0.3 1.07,0.3 0.64,0 1,-0.24 0.37,-0.24 0.37,-0.63 0,-0.33 -0.28,-0.53 -0.27,-0.2 -0.79,-0.3l-1.45,-0.29q-1.21,-0.23 -1.84,-0.84 -0.63,-0.62 -0.63,-1.58 0,-0.78 0.43,-1.37t1.21,-0.91q0.8,-0.33 1.88,-0.33t1.88,0.35 1.25,0.97q0.46,0.63 0.48,1.49h-2.14q-0.01,-0.5 -0.4,-0.83 -0.38,-0.33 -1,-0.33 -0.6,0 -0.94,0.26 -0.34,0.25 -0.34,0.62 0,0.32 0.27,0.52t0.74,0.31l1.57,0.3q1.26,0.25 1.85,0.8 0.6,0.56 0.6,1.48 0,0.82 -0.48,1.44 -0.46,0.62 -1.3,0.96 -0.82,0.34 -1.9,0.34"
-      android:fillColor="#fff"/>
-</vector>

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,4 @@
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_logo"
+    android:inset="20dp" />

android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml

@@ -0,0 +1,4 @@
+<inset
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:drawable="@drawable/ic_logo_monochrome"
+android:inset="20dp" />

android/app/src/main/res/drawable/ic_launcher_small.xml

@@ -1,10 +0,0 @@
-<!-- Used for notification icon etc -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="144dp"
-    android:height="144dp"
-    android:viewportWidth="144"
-    android:viewportHeight="144">
-  <path
-      android:pathData="M40.34 29.42a41.6 41.6 0 0 0-19.66 5.03q-8.77 4.85-13.8 14.42-5.05 9.57-5.05 23.18 0 13.4 5.04 22.88a36 36 0 0 0 13.71 14.51q8.67 5.04 19.76 5.04 7.95 0 14.2-2.42A33.6 33.6 0 0 0 72.8 96.24a33 33 0 0 0 3.43-11.09l-17.64-0.1q-0.6 3.33-2.22 5.95a12 12 0 0 1-3.83 4.33 19 19 0 0 1-5.44 2.73q-2.93 0.9-6.45 0.9-6.15 0-10.99-3.02-4.82-3.03-7.46-9.07-2.61-6.05-2.62-14.82 0-8.56 2.62-14.61 2.63-6.06 7.46-9.28 4.64-3.22 11.09-3.22 3.53 0 6.55 1 3.13 1.01 5.44 3.03a14.5 14.5 0 0 1 3.83 4.63q1.51 2.63 2.02 6.05h17.64a37 37 0 0 0-3.83-12.8 30 30 0 0 0-7.76-9.47 34 34 0 0 0-10.99-5.95 43 43 0 0 0-13.3-2.01m71.29 21.16q-9.37 0-16.23 4.03a26.6 26.6 0 0 0-10.59 11.2q-3.62 7.14-3.62 16.82 0 9.48 3.62 16.73a28 28 0 0 0 10.69 11.2q6.84 4.01 16.28 4.02 9.24 0 16.07-4.03a27.4 27.4 0 0 0 10.59-11.19q3.72-7.25 3.73-16.73 0-9.87-3.73-16.93a27.6 27.6 0 0 0-10.59-11.09q-6.86-4.03-16.22-4.03m0.2 13.1a9.8 9.8 0 0 1 7.05 2.42 16 16 0 0 1 4.34 6.76q1.5 4.23 1.5 9.57a33 33 0 0 1-1.5 9.68 14 14 0 0 1-4.44 6.65q-2.72 2.52-7.05 2.52-4.24 0-7.26-2.52a15 15 0 0 1-4.44-6.65 31 31 0 0 1-1.4-9.68q0-5.34 1.4-9.57 1.52-4.24 4.44-6.76 2.92-2.41 7.36-2.42"
-      android:fillColor="#fff"/>
-</vector>

android/app/src/main/res/drawable/ic_logo.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="835"
+    android:viewportHeight="835">
+  <path
+      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
+      android:fillColor="#ccdfca"/>
+  <path
+      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
+      android:fillColor="#fefdf6"/>
+</vector>

android/app/src/main/res/drawable/ic_logo_monochrome.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="835"
+    android:viewportHeight="835">
+  <path
+      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
+      android:fillColor="#BFFFFFFF"/>
+  <path
+      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
+      android:fillColor="#FFFFFFFF"/>
+</vector>

android/app/src/main/res/drawable/ic_logo_small.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="835dp"
+    android:height="835dp"
+    android:viewportWidth="835"
+    android:viewportHeight="835">
+  <path
+      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/layout/about.xml

@@ -17,15 +17,14 @@
       android:orientation="vertical"
       android:padding="@dimen/margin_base">
 
-    <!--ImageView
+    <ImageView
         android:layout_width="@dimen/about_logo"
         android:layout_height="@dimen/about_logo"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/margin_base"
+        android:layout_marginBottom="@dimen/margin_base"
-        android:layout_marginBottom="@dimen/margin_half"
         android:contentDescription="@string/app_name"
-        app:srcCompat="@drawable/ic_launcher"
+        app:srcCompat="@drawable/ic_logo_monochrome"
-        app:tint="?attr/colorLogo" /-->
+        app:tint="?attr/colorLogo"/>
 
     <TextView
         android:id="@+id/version"

android/app/src/main/res/layout/activity_splash.xml

@@ -14,7 +14,7 @@
       android:layout_width="300dp"
       android:layout_height="0dp"
       android:contentDescription="@null"
-      app:srcCompat="@drawable/ic_launcher"
+      app:srcCompat="@drawable/ic_launcher_foreground"
       android:layout_weight="1000"
       android:layout_margin="@dimen/margin_double"/>
 
@@ -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" />
+
+  <TextView
+      android:id="@+id/tv__splash_subtitle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
       android:text="@string/splash_subtitle"
+      android:layout_marginStart="@dimen/margin_double"
+      android:layout_marginEnd="@dimen/margin_double"
+      android:layout_marginBottom="@dimen/margin_double"
       android:gravity="center_horizontal"
       android:textAppearance="@style/MwmTextAppearance.Toolbar" />
 

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" />

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@color/bg_primary"/>
-    <foreground android:drawable="@drawable/ic_launcher"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher"/>
-</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#588157</color>
-</resources>

android/app/src/main/res/values/themes-base.xml

@@ -169,7 +169,7 @@
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
     <item name="colorBtnHighlight">@color/white_24</item>
     <item name="panel">@color/bg_panel_night</item>
-    <item name="colorLogo">@color/white_primary</item>
+    <item name="colorLogo">@color/base_accent_night</item>
     <item name="iconTint">@color/white_secondary</item>
     <item name="iconTintDisabled">@color/white_12</item>
     <item name="iconTintActive">@color/yellow</item>