diff --git a/cardinal-android/app/build.gradle.kts b/cardinal-android/app/build.gradle.kts index cc5824afa818ae66b447b13b4281a5f4517e0221..9275192ae0df6fd69b81d55881980b7604e00602 100644 --- a/cardinal-android/app/build.gradle.kts +++ b/cardinal-android/app/build.gradle.kts @@ -78,9 +78,13 @@ android { "proguard-rules.pro" ) signingConfig = signingConfigs["release"] as ApkSigningConfig + manifestPlaceholders["icon"] = "@mipmap/ic_launcher" + manifestPlaceholders["round_icon"] = "@mipmap/ic_launcher_round" } debug { applicationIdSuffix = ".debug" + manifestPlaceholders["icon"] = "@mipmap/ic_launcher_debug" + manifestPlaceholders["round_icon"] = "@mipmap/ic_launcher_round_debug" } } diff --git a/cardinal-android/app/src/debug/res/values/strings.xml b/cardinal-android/app/src/debug/res/values/strings.xml index f9515d90e10dded4753bbfdec6dd155e44132d1f..cd55a737c867a24e9a777d9b988e0a725d42312d 100644 --- a/cardinal-android/app/src/debug/res/values/strings.xml +++ b/cardinal-android/app/src/debug/res/values/strings.xml @@ -17,5 +17,5 @@ --> - Maps (Debug) + Cardinal (Debug) diff --git a/cardinal-android/app/src/main/AndroidManifest.xml b/cardinal-android/app/src/main/AndroidManifest.xml index 238fdd5e925b78a79274ec2f28c5716575a6c147..6ed7a82b5a9e3ee3b50a843819096aa2a3f8db7f 100644 --- a/cardinal-android/app/src/main/AndroidManifest.xml +++ b/cardinal-android/app/src/main/AndroidManifest.xml @@ -31,9 +31,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="${icon}" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="${round_icon}" android:supportsRtl="true" android:theme="@style/Theme.CardinalMaps" android:networkSecurityConfig="@xml/network_security_config"> diff --git a/cardinal-android/app/src/main/res/drawable/ic_launcher.xml b/cardinal-android/app/src/main/res/drawable/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..415320c1dcee369cf101d8e49437d77c7e198208 --- /dev/null +++ b/cardinal-android/app/src/main/res/drawable/ic_launcher.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cardinal-android/app/src/main/res/drawable/ic_launcher_background.xml b/cardinal-android/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 0948ab15596af509eb83bcb4d35a8c1ae0110998..0000000000000000000000000000000000000000 --- a/cardinal-android/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/cardinal-android/app/src/main/res/drawable/ic_launcher_debug_foreground.xml b/cardinal-android/app/src/main/res/drawable/ic_launcher_debug_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..8d9b1c620b9b29e3dc67cb16ba51dbbddf5dcd42 --- /dev/null +++ b/cardinal-android/app/src/main/res/drawable/ic_launcher_debug_foreground.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + diff --git a/cardinal-android/app/src/main/res/drawable/ic_launcher_debug_foreground_round.xml b/cardinal-android/app/src/main/res/drawable/ic_launcher_debug_foreground_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..09ee9feaff885b24cc8781d0255afafd1e364868 --- /dev/null +++ b/cardinal-android/app/src/main/res/drawable/ic_launcher_debug_foreground_round.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + diff --git a/cardinal-android/app/src/main/res/drawable/ic_launcher_foreground.xml b/cardinal-android/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 856ffba027dbbbfdc4fdde3ce853debfcfda0717..0000000000000000000000000000000000000000 --- a/cardinal-android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/cardinal-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/cardinal-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index b4b28cb56df20ed72c51f05771767981bc0c2575..0000000000000000000000000000000000000000 --- a/cardinal-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cardinal-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/cardinal-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index bbd3e021239ce758474da78cfc2ca3cf85ed0d91..0000000000000000000000000000000000000000 --- a/cardinal-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/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..7582ee0a109f6a7cc6a1a644fb0525ca048ffada --- /dev/null +++ b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_debug.xml b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_debug.xml new file mode 100644 index 0000000000000000000000000000000000000000..bf4b82cdbbe902fbf6d57188ee1d8c279c3f42de --- /dev/null +++ b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_debug.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..c4c4a4fccc707fe599380b294ec4bf541134fff7 --- /dev/null +++ b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_round_debug.xml b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_round_debug.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c1ed99820dafabfc3300edf0da62adea5f18878 --- /dev/null +++ b/cardinal-android/app/src/main/res/mipmap-anydpi/ic_launcher_round_debug.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cardinal-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/cardinal-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index d1ac74379c4a0756f2566c666c31714ae23cb2a3..0000000000000000000000000000000000000000 Binary files a/cardinal-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/cardinal-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/cardinal-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 5b089a50f60b00feeecc191ccdd55173575333fc..0000000000000000000000000000000000000000 Binary files a/cardinal-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/cardinal-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/cardinal-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 8a115ea9d44f47fd8cba2cd5aea7bbd30e4a8d19..0000000000000000000000000000000000000000 Binary files a/cardinal-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/cardinal-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/cardinal-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 8e028559a883ee11318d7c3d3a9920f11ce0d4b0..0000000000000000000000000000000000000000 Binary files a/cardinal-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/cardinal-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/cardinal-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index b297d101899f617dd813fc18f22169a73dd310e5..0000000000000000000000000000000000000000 Binary files a/cardinal-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/cardinal-android/app/src/main/res/values/strings.xml b/cardinal-android/app/src/main/res/values/strings.xml index 7cb44f3de20e9c642427c0f4dac23bfe65deaf35..33b25e9eecc5cb480e44cbcc36d1d2f2aa043feb 100644 --- a/cardinal-android/app/src/main/res/values/strings.xml +++ b/cardinal-android/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ --> - Maps + Cardinal Work Home