From 24e657b58c565dd35164b0b1e468bcd40a604017 Mon Sep 17 00:00:00 2001 From: Nikita Kulikov Date: Sat, 4 Nov 2023 11:44:46 +0400 Subject: [PATCH] Fix splashscreen WearOS icon (#732) **Background** Right now we not compain under Play Store review policy: ``` Their latest submission was rejected because the launcher icon does not match the splash screen icon, those 2 need to be exactly the same. See WO-V15 from https://developer.android.com/docs/quality-guidelines/wear-app-quality. ``` **Changes** Use for splashscreen wearos app icon **Test plan** Try launch wearos app and check icon --- .github/workflows/internal.yml | 1 + CHANGELOG.md | 2 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 - instances/app/src/main/AndroidManifest.xml | 2 +- .../wearable/src/main/AndroidManifest.xml | 2 +- .../res/drawable/pic_splashscreen_dolphin.xml | 390 ------------------ .../src/main/res/drawable/splash_screen.xml | 2 +- .../wearable/src/main/res/values/styles.xml | 2 +- 8 files changed, 7 insertions(+), 400 deletions(-) delete mode 100644 components/core/ui/res/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 instances/wearable/src/main/res/drawable/pic_splashscreen_dolphin.xml diff --git a/.github/workflows/internal.yml b/.github/workflows/internal.yml index ca1b967a44..62393e778b 100644 --- a/.github/workflows/internal.yml +++ b/.github/workflows/internal.yml @@ -289,3 +289,4 @@ jobs: releaseFiles: ${{steps.download-wearos.outputs.download-path}}/flipper-zero-wearos.aab track: wear:production mappingFile: ${{steps.download-wearos.outputs.download-path}}/mapping-wearos.txt + changesNotSentForReview: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d5da13ca0..8f06974089 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # 1.6.7 - In progress +- [FIX] Splashscreen WearOS icon + # 1.6.6 - [Feature] Bump deps diff --git a/components/core/ui/res/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/components/core/ui/res/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 9076a11ec9..0000000000 --- a/components/core/ui/res/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/instances/app/src/main/AndroidManifest.xml b/instances/app/src/main/AndroidManifest.xml index f3a07fd96e..d6bf90abb8 100644 --- a/instances/app/src/main/AndroidManifest.xml +++ b/instances/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ android:allowBackup="true" android:fullBackupContent="false" android:icon="@mipmap/ic_launcher" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:label="@string/app_name" android:name="com.flipperdevices.app.FlipperApplication" android:supportsRtl="false" diff --git a/instances/wearable/src/main/AndroidManifest.xml b/instances/wearable/src/main/AndroidManifest.xml index 6c700db0bb..ebfa2c7179 100644 --- a/instances/wearable/src/main/AndroidManifest.xml +++ b/instances/wearable/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:name="com.flipperdevices.wearable.FlipperApplication" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/FlipperTheme"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/instances/wearable/src/main/res/drawable/splash_screen.xml b/instances/wearable/src/main/res/drawable/splash_screen.xml index 0d3e5d6a92..c379da4d13 100644 --- a/instances/wearable/src/main/res/drawable/splash_screen.xml +++ b/instances/wearable/src/main/res/drawable/splash_screen.xml @@ -1,7 +1,7 @@ diff --git a/instances/wearable/src/main/res/values/styles.xml b/instances/wearable/src/main/res/values/styles.xml index 8414e4ded9..f77a381597 100644 --- a/instances/wearable/src/main/res/values/styles.xml +++ b/instances/wearable/src/main/res/values/styles.xml @@ -11,6 +11,6 @@ @style/FlipperTheme - @android:color/white + @color/ic_launcher_background \ No newline at end of file