diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index b97b5bf05e..d59d954d5b 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -12,7 +12,8 @@ + + + + \ No newline at end of file diff --git a/android/res/mipmap-anydpi-v26/uncivicon_round.xml b/android/res/mipmap-anydpi-v26/uncivicon_round.xml new file mode 100644 index 0000000000..df8fdf9ef7 --- /dev/null +++ b/android/res/mipmap-anydpi-v26/uncivicon_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/res/mipmap-hdpi/uncivicon.png b/android/res/mipmap-hdpi/uncivicon.png new file mode 100644 index 0000000000..4d83cee58e Binary files /dev/null and b/android/res/mipmap-hdpi/uncivicon.png differ diff --git a/android/res/mipmap-hdpi/uncivicon_fore.png b/android/res/mipmap-hdpi/uncivicon_fore.png new file mode 100644 index 0000000000..327e57e91c Binary files /dev/null and b/android/res/mipmap-hdpi/uncivicon_fore.png differ diff --git a/android/res/mipmap-hdpi/uncivicon_round.png b/android/res/mipmap-hdpi/uncivicon_round.png new file mode 100644 index 0000000000..b8b680b15d Binary files /dev/null and b/android/res/mipmap-hdpi/uncivicon_round.png differ diff --git a/android/res/mipmap-mdpi/uncivicon.png b/android/res/mipmap-mdpi/uncivicon.png new file mode 100644 index 0000000000..eed6679caf Binary files /dev/null and b/android/res/mipmap-mdpi/uncivicon.png differ diff --git a/android/res/mipmap-mdpi/uncivicon_fore.png b/android/res/mipmap-mdpi/uncivicon_fore.png new file mode 100644 index 0000000000..23461c52de Binary files /dev/null and b/android/res/mipmap-mdpi/uncivicon_fore.png differ diff --git a/android/res/mipmap-mdpi/uncivicon_round.png b/android/res/mipmap-mdpi/uncivicon_round.png new file mode 100644 index 0000000000..21a9657a7e Binary files /dev/null and b/android/res/mipmap-mdpi/uncivicon_round.png differ diff --git a/android/res/mipmap-xhdpi/uncivicon.png b/android/res/mipmap-xhdpi/uncivicon.png new file mode 100644 index 0000000000..203b0e5ad6 Binary files /dev/null and b/android/res/mipmap-xhdpi/uncivicon.png differ diff --git a/android/res/mipmap-xhdpi/uncivicon_fore.png b/android/res/mipmap-xhdpi/uncivicon_fore.png new file mode 100644 index 0000000000..4877711430 Binary files /dev/null and b/android/res/mipmap-xhdpi/uncivicon_fore.png differ diff --git a/android/res/mipmap-xhdpi/uncivicon_round.png b/android/res/mipmap-xhdpi/uncivicon_round.png new file mode 100644 index 0000000000..97c846926b Binary files /dev/null and b/android/res/mipmap-xhdpi/uncivicon_round.png differ diff --git a/android/res/mipmap-xxhdpi/uncivicon.png b/android/res/mipmap-xxhdpi/uncivicon.png new file mode 100644 index 0000000000..5c5986ae1d Binary files /dev/null and b/android/res/mipmap-xxhdpi/uncivicon.png differ diff --git a/android/res/mipmap-xxhdpi/uncivicon_fore.png b/android/res/mipmap-xxhdpi/uncivicon_fore.png new file mode 100644 index 0000000000..d5021932a9 Binary files /dev/null and b/android/res/mipmap-xxhdpi/uncivicon_fore.png differ diff --git a/android/res/mipmap-xxhdpi/uncivicon_round.png b/android/res/mipmap-xxhdpi/uncivicon_round.png new file mode 100644 index 0000000000..331d388b67 Binary files /dev/null and b/android/res/mipmap-xxhdpi/uncivicon_round.png differ diff --git a/android/res/mipmap-xxxhdpi/uncivicon.png b/android/res/mipmap-xxxhdpi/uncivicon.png new file mode 100644 index 0000000000..0497780a1d Binary files /dev/null and b/android/res/mipmap-xxxhdpi/uncivicon.png differ diff --git a/android/res/mipmap-xxxhdpi/uncivicon_fore.png b/android/res/mipmap-xxxhdpi/uncivicon_fore.png new file mode 100644 index 0000000000..5d23a3d440 Binary files /dev/null and b/android/res/mipmap-xxxhdpi/uncivicon_fore.png differ diff --git a/android/res/mipmap-xxxhdpi/uncivicon_round.png b/android/res/mipmap-xxxhdpi/uncivicon_round.png new file mode 100644 index 0000000000..0ce2f59513 Binary files /dev/null and b/android/res/mipmap-xxxhdpi/uncivicon_round.png differ diff --git a/android/res/values/uncivicon_back.xml b/android/res/values/uncivicon_back.xml new file mode 100644 index 0000000000..a5c03558d8 --- /dev/null +++ b/android/res/values/uncivicon_back.xml @@ -0,0 +1,4 @@ + + + #ECDFC6 + \ No newline at end of file diff --git a/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt b/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt index bdf29a5e07..82e2a52951 100644 --- a/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt +++ b/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) diff --git a/android/uncivicon-playstore.png b/android/uncivicon-playstore.png new file mode 100644 index 0000000000..61e1ce19ad Binary files /dev/null and b/android/uncivicon-playstore.png differ diff --git a/extraImages/Unciv icon v5.png b/extraImages/Unciv icon v5.png new file mode 100644 index 0000000000..8fbc6a4de8 Binary files /dev/null and b/extraImages/Unciv icon v5.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 17905bbcfe..0ce2f59513 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ