diff --git a/assets/images/cake_logo.png b/assets/images/cake_logo.png deleted file mode 100644 index abbb4e62b..000000000 Binary files a/assets/images/cake_logo.png and /dev/null differ diff --git a/assets/images/cakepay.png b/assets/images/cakepay.png deleted file mode 100644 index 2d1c12c03..000000000 Binary files a/assets/images/cakepay.png and /dev/null differ diff --git a/assets/images/cakewallet_icon_1024.png b/assets/images/cakewallet_icon_1024.png deleted file mode 100644 index 35cf42245..000000000 Binary files a/assets/images/cakewallet_icon_1024.png and /dev/null differ diff --git a/assets/images/cakewallet_icon_120.png b/assets/images/cakewallet_icon_120.png deleted file mode 100644 index 6e45f6423..000000000 Binary files a/assets/images/cakewallet_icon_120.png and /dev/null differ diff --git a/assets/images/cakewallet_icon_180.png b/assets/images/cakewallet_icon_180.png deleted file mode 100644 index da585ca42..000000000 Binary files a/assets/images/cakewallet_icon_180.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png deleted file mode 100644 index c465fa26c..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png deleted file mode 100644 index e79db4d99..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png deleted file mode 100644 index 2d030845b..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png deleted file mode 100644 index eef607c2c..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png deleted file mode 100644 index a09896830..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png deleted file mode 100644 index a98c5faf8..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png and /dev/null differ diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png deleted file mode 100644 index d8141a250..000000000 Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png and /dev/null differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_1024.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_1024.png new file mode 100644 index 000000000..e9c48116f Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_1024.png differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_128.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_128.png new file mode 100644 index 000000000..11e3c5613 Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_128.png differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_16.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_16.png new file mode 100644 index 000000000..566ce2c4f Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_16.png differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_256.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_256.png new file mode 100644 index 000000000..fc64d36fc Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_256.png differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_32.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_32.png new file mode 100644 index 000000000..8db01c8f0 Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_32.png differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_512.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_512.png new file mode 100644 index 000000000..e99e23507 Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_512.png differ diff --git a/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_64.png b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_64.png new file mode 100644 index 000000000..7f9a9ca8f Binary files /dev/null and b/assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_64.png differ diff --git a/com.suchsoftware.HashWallet.yml b/com.suchsoftware.HashWallet.yml index 5d779e2f8..7c2bfb468 100644 --- a/com.suchsoftware.HashWallet.yml +++ b/com.suchsoftware.HashWallet.yml @@ -21,13 +21,13 @@ modules: - "mkdir -p /app/bin" - "ln -s /app/hash_wallet/hash_wallet /app/bin/hash_wallet" - "mkdir -p /app/share/icons/hicolor/scalable/apps" - - "cp cakewallet_icon_180.png /app/share/icons/hicolor/scalable/apps/com.suchsoftware.HashWallet.png" + - "cp cakewallet_logo.png /app/share/icons/hicolor/scalable/apps/com.suchsoftware.HashWallet.png" - "mkdir -p /app/share/applications" - "cp com.suchsoftware.HashWallet.desktop /app/share/applications" sources: - type: dir path: build/linux/x64/release - type: file - path: assets/images/cakewallet_icon_180.png + path: assets/images/cakewallet_logo.png - type: file path: linux/com.suchsoftware.HashWallet.desktop diff --git a/lib/view_model/settings/display_settings_view_model.dart b/lib/view_model/settings/display_settings_view_model.dart index ea8e243ef..d9748e823 100644 --- a/lib/view_model/settings/display_settings_view_model.dart +++ b/lib/view_model/settings/display_settings_view_model.dart @@ -249,21 +249,17 @@ abstract class DisplaySettingsViewModelBase with Store { @action void setBackgroundImage(String path) => _settingsStore.backgroundImage = path; + /// Preview icon for the theme picker. + /// + /// This matched on `theme.title`, which is built from the accent colour's + /// display name, so renaming an accent silently changed which icon a theme + /// got. It did: the list still named Cake Primary, Tron Red and Frosting + /// Purple, none of which ship any more, while Such Pink and Such Blue were + /// absent and fell through to the plain dark icon. Ask the theme what it is + /// instead of what it is called. String getImageForTheme(MaterialThemeBase theme) { - switch (theme.title) { - case 'Dark Theme': - return 'assets/new-ui/dark.svg'; - case 'Light Theme': - return 'assets/new-ui/light.svg'; - case 'Black Theme (Cake Primary)': - case 'Black Theme (BCH Green)': - case 'Black Theme (Bitcoin Yellow)': - case 'Black Theme (Monero Orange)': - case 'Black Theme (Tron Red)': - case 'Black Theme (Frosting Purple)': - return 'assets/new-ui/black_accent.svg'; - default: - return 'assets/new-ui/dark.svg'; - } + if (theme is BlackTheme) return 'assets/new-ui/black_accent.svg'; + if (theme.type == ThemeType.light) return 'assets/new-ui/light.svg'; + return 'assets/new-ui/dark.svg'; } } diff --git a/pubspec_description.yaml b/pubspec_description.yaml index 0b0904565..59a729b0f 100644 --- a/pubspec_description.yaml +++ b/pubspec_description.yaml @@ -1,6 +1,6 @@ name: hash_wallet description: Hash Bags — a noncustodial multi-currency wallet by Such Software LLC. -version: 1.0.2+12 +version: 1.0.3+13 publish_to: none environment: diff --git a/scripts/macos/app_icon.sh b/scripts/macos/app_icon.sh index 28ca9c17b..924047df8 100755 --- a/scripts/macos/app_icon.sh +++ b/scripts/macos/app_icon.sh @@ -18,13 +18,13 @@ case $APP_MACOS_TYPE in ICON_512_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_512.png ICON_1024_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_1024.png;; "cakewallet") - ICON_16_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png - ICON_32_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png - ICON_64_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png - ICON_128_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png - ICON_256_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png - ICON_512_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png - ICON_1024_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png;; + ICON_16_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_16.png + ICON_32_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_32.png + ICON_64_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_64.png + ICON_128_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_128.png + ICON_256_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_256.png + ICON_512_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_512.png + ICON_1024_PATH=`pwd`/../../assets/images/macos_icons/hashbags_macos_icons/hashbags_macos_1024.png;; esac rm $DEST_DIR_PATH/app_icon_16.png