[android] New splash screen

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>

android/app/build.gradle

@@ -399,6 +399,7 @@ dependencies {
   implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.10'))
   implementation 'androidx.annotation:annotation:1.9.1'
   implementation 'androidx.appcompat:appcompat:1.7.0'
+  implementation 'androidx.core:core-splashscreen:1.0.1'
   implementation 'androidx.car.app:app:1.7.0-rc01'
   implementation 'androidx.car.app:app-projected:1.7.0-rc01'
   implementation 'androidx.constraintlayout:constraintlayout:2.2.0'

android/app/src/main/AndroidManifest.xml

@@ -76,7 +76,7 @@
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:localeConfig="@xml/locales_config"
-      android:theme="@style/MwmTheme"
+      android:theme="@style/MwmTheme.Splash"
       android:resizeableActivity="true"
       android:supportsRtl="true"
       android:networkSecurityConfig="@xml/network_security_config"

android/app/src/main/java/app/organicmaps/SplashActivity.java

@@ -17,6 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.splashscreen.SplashScreen;
 
 import app.organicmaps.display.DisplayManager;
 import app.organicmaps.downloader.DownloaderActivity;
@@ -57,19 +58,12 @@ public class SplashActivity extends AppCompatActivity
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState)
   {
+    SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
+    splashScreen.setKeepOnScreenCondition(() -> true);
     super.onCreate(savedInstanceState);
 
-    final Context context = getApplicationContext();
-    final String theme = Config.getCurrentUiTheme(context);
-    if (ThemeUtils.isDefaultTheme(context, theme))
-      setTheme(R.style.MwmTheme_Splash);
-    else if (ThemeUtils.isNightTheme(context, theme))
-      setTheme(R.style.MwmTheme_Night_Splash);
-    else
-      throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
-
     UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
-    setContentView(R.layout.activity_splash);
+
     mPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(),
         result -> Config.setLocationRequested());
     mApiRequest = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {

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.logo)
         .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.logo)
             .setColor(ContextCompat.getColor(mContext, R.color.notification))
             .setShowWhen(true)
             .setContentTitle(title)

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

@@ -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.logo)
         .setContentIntent(pendingIntent)
         .addAction(0, context.getString(R.string.navigation_stop_button), exitPendingIntent)
         .setColorized(isColorizedSupported())

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

@@ -1,5 +0,0 @@
-<vector android:height="256dp" android:viewportHeight="135.46667"
-    android:viewportWidth="135.46666" android:width="256dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
-        android:pathData="M128.274,22.419C131.432,31.024 114.539,51.944 98.437,57.312 69.309,46.971 68.362,64.338 44.524,80.837 72.704,100.81 102.225,85.258 101.673,65.601c-22.181,13.026 -36.073,14.447 -44.046,14.052 26.838,-5.447 55.807,-22.341 61.877,-29.446 0.006,0.315 0.009,0.631 0.009,0.948 0,33.946 -51.15,84.312 -51.15,84.312 0,0 -26.775,-26.282 -41.581,-53.732 -2.07,-0.029 -14.526,4.612 -19.12,-1.608C2.53,73.18 21.554,49.892 38.052,42.945 67.573,56.681 83.755,21.078 92.99,19.104 65.442,2.368 38.209,9.236 35.131,34.103 50.444,25.183 69.231,20.13 77.914,20.525 53.521,25.635 25.58,44.129 17.212,51.155c0,-28.253 22.901,-51.155 51.15,-51.155 16.706,0 31.541,8.009 40.875,20.398 0.001,-0.001 16.669,-5.557 19.037,2.021zM122.433,24.945c-2.194,-3.061 -9.832,0.514 -9.832,0.514 1.069,1.838 2.028,3.748 2.865,5.722 0.849,2.001 1.575,4.067 2.167,6.189 0,0.001 7.799,-8.24 4.799,-12.424zM13.333,77.239c2.372,3.308 10.627,-0.556 10.627,-0.556 -1.156,-1.986 -2.192,-4.051 -3.098,-6.184 -0.918,-2.162 -1.702,-4.396 -2.342,-6.689 0,0 -8.429,8.907 -5.187,13.43z" android:strokeWidth="1.4541"/>
-</vector>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            android:opacity="opaque">
-  <item android:drawable="?attr/colorPrimary"/>
-  <item android:drawable="@drawable/ic_splash" android:gravity="center"/>
-</layer-list>

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

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:orientation="vertical"
-  android:gravity="center">
-
-  <ImageView
-      android:id="@+id/iv__logo"
-      android:layout_width="wrap_content"
-      android:layout_height="0dp"
-      android:contentDescription="@null"
-      app:srcCompat="@drawable/splash"
-      android:layout_weight="1000"
-      android:layout_margin="@dimen/margin_double"/>
-
-  <LinearLayout
-      android:gravity="center"
-      android:orientation="vertical"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingBottom="@dimen/margin_double">
-
-    <TextView
-        android:id="@+id/tv__app_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_eighth"
-        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:gravity="center_horizontal"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar" />
-
-  </LinearLayout>
-
-</LinearLayout>

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="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

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

@@ -3,18 +3,12 @@
   <style name="MwmTheme" parent="MwmTheme.Base"/>
   <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
 
-  <style name="MwmTheme.Splash">
-    <item name="android:windowBackground">@color/bg_primary</item>
+  <style name="MwmTheme.Splash" parent="Theme.SplashScreen">
+    <item name="windowSplashScreenBackground">@color/bg_primary</item>
     <item name="android:textColorPrimary">@color/white_primary</item>
     <item name="android:navigationBarColor">@color/bg_primary</item>
     <item name="android:statusBarColor">@color/bg_primary</item>
-  </style>
-
-  <style name="MwmTheme.Night.Splash">
-    <item name="android:windowBackground">@color/bg_primary_night</item>
-    <item name="android:textColorPrimary">@color/white_primary</item>
-    <item name="android:navigationBarColor">@color/bg_primary_night</item>
-    <item name="android:statusBarColor">@color/bg_primary_night</item>
+    <item name="postSplashScreenTheme">@style/MwmTheme</item>
   </style>
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->