Unciv Adaptive Android Icon (#6672)

* Use both icon and roundIcon properties

* Studio-generated Android Icon

* Studio-generated Android Icon to fastlane

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>

android/AndroidManifest.xml

@@ -12,7 +12,8 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/uncivicon2"
+        android:icon="@mipmap/uncivicon"
+        android:roundIcon="@mipmap/uncivicon_round"
         android:label="@string/app_name"
         android:isGame="true"
         android:appCategory="game"

android/res/mipmap-anydpi-v26/uncivicon.xml

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

android/res/mipmap-anydpi-v26/uncivicon_round.xml

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

android/res/values/uncivicon_back.xml

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

android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt

@@ -128,7 +128,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
                                     appContext.resources.getString(R.string.Notify_Persist_Long_P2) + " " + checkPeriod + " "
                                     + appContext.resources.getString(R.string.Notify_Persist_Long_P3)
                                     + " " + appContext.resources.getString(R.string.Notify_Persist_Long_P4)))
-                    .setSmallIcon(R.drawable.uncivicon2)
+                    .setSmallIcon(R.drawable.uncivnotification)
                     .setContentIntent(pendingIntent)
                     .setCategory(NotificationCompat.CATEGORY_SERVICE)
                     .setOnlyAlertOnce(true)
@@ -156,7 +156,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
                     // without at least vibrate, some Android versions don't show a heads-up notification
                     .setDefaults(DEFAULT_VIBRATE)
                     .setLights(Color.YELLOW, 300, 100)
-                    .setSmallIcon(R.drawable.uncivicon2)
+                    .setSmallIcon(R.drawable.uncivnotification)
                     .setContentIntent(pendingIntent)
                     .setCategory(NotificationCompat.CATEGORY_SOCIAL)
                     .setOngoing(false)
@@ -348,7 +348,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
                 .setPriority(NotificationManagerCompat.IMPORTANCE_DEFAULT) // No direct user action expected
                 .setContentTitle(applicationContext.resources.getString(R.string.Notify_Error_Short))
                 .setContentText(applicationContext.resources.getString(R.string.Notify_Error_Long))
-                .setSmallIcon(R.drawable.uncivicon2)
+                .setSmallIcon(R.drawable.uncivnotification)
                 // without at least vibrate, some Android versions don't show a heads-up notification
                 .setDefaults(DEFAULT_VIBRATE)
                 .setLights(Color.YELLOW, 300, 100)