From 410e6db034569911db7763174546a660e5e83a88 Mon Sep 17 00:00:00 2001 From: OmarHatem Date: Fri, 1 Mar 2024 23:13:45 +0200 Subject: [PATCH] Revert default Cake Theme add custom package id for test builds --- .github/workflows/pr_test_build.yml | 2 +- lib/store/settings_store.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml index 6902d2d8e..f905fdc50 100644 --- a/.github/workflows/pr_test_build.yml +++ b/.github/workflows/pr_test_build.yml @@ -149,7 +149,7 @@ jobs: echo "const ankrApiKey = '${{ secrets.ANKR_API_KEY }}';" >> cw_solana/lib/.secrets.g.dart - name: Rename app - run: echo -e "id=com.cakewallet.test\nname=${{ env.BRANCH_NAME }}" > /opt/android/cake_wallet/android/app.properties + run: echo -e "id=com.cakewallet.test_${{ echo -n env.BRANCH_NAME | sha512sum }}\nname=${{ env.BRANCH_NAME }}" > /opt/android/cake_wallet/android/app.properties - name: Build run: | diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index a95dd2b73..6c91d73f3 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -793,7 +793,7 @@ abstract class SettingsStoreBase with Store { final bool isNewInstall = sharedPreferences.getBool(PreferencesKey.isNewInstall) ?? true; final int defaultTheme; if (isNewInstall) { - defaultTheme = isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.cakeDarkTheme.raw; + defaultTheme = isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.brightTheme.raw; } else { defaultTheme = ThemeType.bright.index; } @@ -1159,7 +1159,7 @@ abstract class SettingsStoreBase with Store { ExchangeApiMode.enabled.raw); currentTheme = ThemeList.deserialize( raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ?? - (isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.cakeDarkTheme.raw)); + (isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.brightTheme.raw)); actionlistDisplayMode = ObservableList(); actionlistDisplayMode.addAll(deserializeActionlistDisplayModes( sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ?? defaultActionsMode));