From 427ccb41c3594f5b8b9704642159c38f78af2be1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 3 Jul 2024 18:01:41 +0200 Subject: [PATCH] Rename resource to avoid resource override when generating screenshot. --- ...nd.xml => ic_launcher_background_enterprise.xml} | 0 .../android/appicon/enterprise/IconPreview.kt | 4 ++-- .../src/main/res/mipmap-anydpi/ic_launcher.xml | 4 ++-- .../main/res/mipmap-anydpi/ic_launcher_round.xml | 4 ++-- ....webp => ic_launcher_foreground_enterprise.webp} | Bin 5 files changed, 6 insertions(+), 6 deletions(-) rename appicon/enterprise/src/debug/res/drawable/{ic_launcher_background.xml => ic_launcher_background_enterprise.xml} (100%) rename appicon/enterprise/src/main/res/mipmap-xxhdpi/{ic_launcher_foreground.webp => ic_launcher_foreground_enterprise.webp} (100%) diff --git a/appicon/enterprise/src/debug/res/drawable/ic_launcher_background.xml b/appicon/enterprise/src/debug/res/drawable/ic_launcher_background_enterprise.xml similarity index 100% rename from appicon/enterprise/src/debug/res/drawable/ic_launcher_background.xml rename to appicon/enterprise/src/debug/res/drawable/ic_launcher_background_enterprise.xml diff --git a/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt b/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt index 009c42036c..24a021922a 100644 --- a/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt +++ b/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt @@ -33,7 +33,7 @@ internal fun IconPreview() { Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null) Image( modifier = Modifier.align(Alignment.Center), - painter = painterResource(id = R.mipmap.ic_launcher_foreground), + painter = painterResource(id = R.mipmap.ic_launcher_foreground_enterprise), contentDescription = null, ) } @@ -46,7 +46,7 @@ internal fun RoundIconPreview() { Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null) Image( modifier = Modifier.align(Alignment.Center), - painter = painterResource(id = R.mipmap.ic_launcher_foreground), + painter = painterResource(id = R.mipmap.ic_launcher_foreground_enterprise), contentDescription = null, ) } diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml index ccc9fee468..5a8a441e3f 100644 --- a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -16,6 +16,6 @@ --> - - + + diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml index d80aecb99b..1bbcf33419 100644 --- a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -16,6 +16,6 @@ --> - - + + diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_enterprise.webp similarity index 100% rename from appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp rename to appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_enterprise.webp