diff --git a/assets/svg/fruitSorbet/bell-new.svg b/assets/svg/fruitSorbet/bell-new.svg new file mode 100644 index 000000000..ffb3d630b --- /dev/null +++ b/assets/svg/fruitSorbet/bell-new.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/svg/fruitSorbet/bg.svg b/assets/svg/fruitSorbet/bg.svg new file mode 100644 index 000000000..0a3be99a3 --- /dev/null +++ b/assets/svg/fruitSorbet/bg.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/svg/fruitSorbet/buy-coins-icon.svg b/assets/svg/fruitSorbet/buy-coins-icon.svg new file mode 100644 index 000000000..5788e2bf0 --- /dev/null +++ b/assets/svg/fruitSorbet/buy-coins-icon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/svg/fruitSorbet/exchange-2.svg b/assets/svg/fruitSorbet/exchange-2.svg new file mode 100644 index 000000000..11e246a3b --- /dev/null +++ b/assets/svg/fruitSorbet/exchange-2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/svg/fruitSorbet/stack-icon1.svg b/assets/svg/fruitSorbet/stack-icon1.svg new file mode 100644 index 000000000..f316012d7 --- /dev/null +++ b/assets/svg/fruitSorbet/stack-icon1.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/svg/fruitSorbet/tx-exchange-icon-failed.svg b/assets/svg/fruitSorbet/tx-exchange-icon-failed.svg new file mode 100644 index 000000000..a54836bba --- /dev/null +++ b/assets/svg/fruitSorbet/tx-exchange-icon-failed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/svg/fruitSorbet/tx-exchange-icon-pending.svg b/assets/svg/fruitSorbet/tx-exchange-icon-pending.svg new file mode 100644 index 000000000..5f9aa4256 --- /dev/null +++ b/assets/svg/fruitSorbet/tx-exchange-icon-pending.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/svg/fruitSorbet/tx-exchange-icon.svg b/assets/svg/fruitSorbet/tx-exchange-icon.svg new file mode 100644 index 000000000..fcd3ef9dc --- /dev/null +++ b/assets/svg/fruitSorbet/tx-exchange-icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/svg/fruitSorbet/tx-icon-receive-failed.svg b/assets/svg/fruitSorbet/tx-icon-receive-failed.svg new file mode 100644 index 000000000..189bd15c9 --- /dev/null +++ b/assets/svg/fruitSorbet/tx-icon-receive-failed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/svg/fruitSorbet/tx-icon-receive-pending.svg b/assets/svg/fruitSorbet/tx-icon-receive-pending.svg new file mode 100644 index 000000000..64ea8da3d --- /dev/null +++ b/assets/svg/fruitSorbet/tx-icon-receive-pending.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/svg/fruitSorbet/tx-icon-receive.svg b/assets/svg/fruitSorbet/tx-icon-receive.svg new file mode 100644 index 000000000..1076d8d57 --- /dev/null +++ b/assets/svg/fruitSorbet/tx-icon-receive.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/svg/fruitSorbet/tx-icon-send-failed.svg b/assets/svg/fruitSorbet/tx-icon-send-failed.svg new file mode 100644 index 000000000..9751b61e8 --- /dev/null +++ b/assets/svg/fruitSorbet/tx-icon-send-failed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/svg/fruitSorbet/tx-icon-send-pending.svg b/assets/svg/fruitSorbet/tx-icon-send-pending.svg new file mode 100644 index 000000000..e4ec777e3 --- /dev/null +++ b/assets/svg/fruitSorbet/tx-icon-send-pending.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/svg/fruitSorbet/tx-icon-send.svg b/assets/svg/fruitSorbet/tx-icon-send.svg new file mode 100644 index 000000000..ee32aa6b4 --- /dev/null +++ b/assets/svg/fruitSorbet/tx-icon-send.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/pages/settings_views/global_settings_view/appearance_settings_view.dart b/lib/pages/settings_views/global_settings_view/appearance_settings_view.dart index e48a1bb01..cefde08bb 100644 --- a/lib/pages/settings_views/global_settings_view/appearance_settings_view.dart +++ b/lib/pages/settings_views/global_settings_view/appearance_settings_view.dart @@ -7,7 +7,7 @@ import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/theme/color_theme.dart'; import 'package:stackwallet/utilities/theme/dark_colors.dart'; -import 'package:stackwallet/utilities/theme/fruit_sorbet_theme.dart'; +import 'package:stackwallet/utilities/theme/fruit_sorbet_colors.dart'; import 'package:stackwallet/utilities/theme/light_colors.dart'; import 'package:stackwallet/utilities/theme/ocean_breeze_colors.dart'; import 'package:stackwallet/utilities/theme/oled_black_colors.dart'; @@ -570,7 +570,7 @@ class _ThemeOptionsView extends ConsumerState { ); ref.read(colorThemeProvider.state).state = StackColors.fromStackColorTheme( - OledBlackColors(), + FruitSorbetColors(), ); setState(() { diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index e693b8595..3e5d24e39 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -37,6 +37,7 @@ class _SVG { return null; case ThemeType.oceanBreeze: + case ThemeType.fruitSorbet: return "assets/svg/${Theme.of(context).extension()!.themeType.name}/bg.svg"; } } diff --git a/lib/utilities/theme/color_theme.dart b/lib/utilities/theme/color_theme.dart index 0403589e4..d21b8a262 100644 --- a/lib/utilities/theme/color_theme.dart +++ b/lib/utilities/theme/color_theme.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/theme/dark_colors.dart'; -import 'package:stackwallet/utilities/theme/fruit_sorbet_theme.dart'; +import 'package:stackwallet/utilities/theme/fruit_sorbet_colors.dart'; import 'package:stackwallet/utilities/theme/light_colors.dart'; import 'package:stackwallet/utilities/theme/ocean_breeze_colors.dart'; import 'package:stackwallet/utilities/theme/oled_black_colors.dart'; diff --git a/lib/utilities/theme/fruit_sorbet_theme.dart b/lib/utilities/theme/fruit_sorbet_colors.dart similarity index 98% rename from lib/utilities/theme/fruit_sorbet_theme.dart rename to lib/utilities/theme/fruit_sorbet_colors.dart index 7956875d7..0b6122723 100644 --- a/lib/utilities/theme/fruit_sorbet_theme.dart +++ b/lib/utilities/theme/fruit_sorbet_colors.dart @@ -3,11 +3,10 @@ import 'package:stackwallet/utilities/theme/color_theme.dart'; class FruitSorbetColors extends StackColorTheme { @override - ThemeType get themeType => ThemeType.light; + ThemeType get themeType => ThemeType.fruitSorbet; @override - Color get background => - const Color(0xFFF7F7F7); //change this to background svg + Color get background => Colors.transparent; @override Color get backgroundAppBar => background; @override diff --git a/lib/widgets/background.dart b/lib/widgets/background.dart index 0a14e2df6..c966a5d98 100644 --- a/lib/widgets/background.dart +++ b/lib/widgets/background.dart @@ -24,6 +24,7 @@ class Background extends StatelessWidget { color = Theme.of(context).extension()!.background; break; case ThemeType.oceanBreeze: + case ThemeType.fruitSorbet: color = null; break; } diff --git a/pubspec.yaml b/pubspec.yaml index df7666791..3c9f26dbc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -370,7 +370,7 @@ flutter: - assets/svg/dark/stack-icon1.svg - assets/svg/dark/buy-coins-icon.svg - # light theme specific + # ocean theme specific - assets/svg/oceanBreeze/tx-exchange-icon.svg - assets/svg/oceanBreeze/tx-exchange-icon-pending.svg - assets/svg/oceanBreeze/tx-exchange-icon-failed.svg @@ -401,6 +401,22 @@ flutter: - assets/svg/oledBlack/stack-icon1.svg - assets/svg/oledBlack/buy-coins-icon.svg + # fruit sorbet theme specific + - assets/svg/fruitSorbet/tx-exchange-icon.svg + - assets/svg/fruitSorbet/tx-exchange-icon-pending.svg + - assets/svg/fruitSorbet/tx-exchange-icon-failed.svg + - assets/svg/fruitSorbet/tx-icon-send.svg + - assets/svg/fruitSorbet/tx-icon-send-pending.svg + - assets/svg/fruitSorbet/tx-icon-send-failed.svg + - assets/svg/fruitSorbet/tx-icon-receive.svg + - assets/svg/fruitSorbet/tx-icon-receive-pending.svg + - assets/svg/fruitSorbet/tx-icon-receive-failed.svg + - assets/svg/fruitSorbet/exchange-2.svg + - assets/svg/fruitSorbet/bell-new.svg + - assets/svg/fruitSorbet/stack-icon1.svg + - assets/svg/fruitSorbet/buy-coins-icon.svg + - assets/svg/fruitSorbet/bg.svg + # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. # For details regarding adding assets from package dependencies, see