diff --git a/assets/images/fruitSorbet/bitcoin.png b/assets/images/fruitSorbet/bitcoin.png index 63408e07e..9424682fe 100644 Binary files a/assets/images/fruitSorbet/bitcoin.png and b/assets/images/fruitSorbet/bitcoin.png differ diff --git a/assets/images/fruitSorbet/bitcoincash.png b/assets/images/fruitSorbet/bitcoincash.png index 18552e02e..a10e138bc 100644 Binary files a/assets/images/fruitSorbet/bitcoincash.png and b/assets/images/fruitSorbet/bitcoincash.png differ diff --git a/assets/images/fruitSorbet/firo.png b/assets/images/fruitSorbet/firo.png index 4a679586d..543ef4abb 100644 Binary files a/assets/images/fruitSorbet/firo.png and b/assets/images/fruitSorbet/firo.png differ diff --git a/assets/svg/persona-easy-1.svg b/assets/svg/dark/persona-easy-1.svg similarity index 100% rename from assets/svg/persona-easy-1.svg rename to assets/svg/dark/persona-easy-1.svg diff --git a/assets/svg/persona-incognito-1.svg b/assets/svg/dark/persona-incognito-1.svg similarity index 100% rename from assets/svg/persona-incognito-1.svg rename to assets/svg/dark/persona-incognito-1.svg diff --git a/assets/svg/forest/bell-new.svg b/assets/svg/forest/bell-new.svg index 8cef32715..2ca7ccca6 100644 --- a/assets/svg/forest/bell-new.svg +++ b/assets/svg/forest/bell-new.svg @@ -1,5 +1,5 @@ - - + + diff --git a/assets/svg/forest/buy-coins-icon.svg b/assets/svg/forest/buy-coins-icon.svg index d9613bccb..9db3fb792 100644 --- a/assets/svg/forest/buy-coins-icon.svg +++ b/assets/svg/forest/buy-coins-icon.svg @@ -1,17 +1,17 @@ - + - - - + + + - - - - + + + + - + diff --git a/assets/svg/forest/exchange-2.svg b/assets/svg/forest/exchange-2.svg index 7baeaf87f..597c2b1ac 100644 --- a/assets/svg/forest/exchange-2.svg +++ b/assets/svg/forest/exchange-2.svg @@ -1,4 +1,11 @@ - - + + + + + + + + + diff --git a/assets/svg/forest/persona-easy-1.svg b/assets/svg/forest/persona-easy-1.svg new file mode 100644 index 000000000..11383fbaf --- /dev/null +++ b/assets/svg/forest/persona-easy-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/forest/persona-incognito-1.svg b/assets/svg/forest/persona-incognito-1.svg new file mode 100644 index 000000000..526a8f4a0 --- /dev/null +++ b/assets/svg/forest/persona-incognito-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/fruitSorbet/bitcoin.svg b/assets/svg/fruitSorbet/bitcoin.svg new file mode 100644 index 000000000..d3abd0954 --- /dev/null +++ b/assets/svg/fruitSorbet/bitcoin.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/fruitSorbet/bitcoincash.svg b/assets/svg/fruitSorbet/bitcoincash.svg new file mode 100644 index 000000000..6a10cce09 --- /dev/null +++ b/assets/svg/fruitSorbet/bitcoincash.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/fruitSorbet/doge.svg b/assets/svg/fruitSorbet/doge.svg new file mode 100644 index 000000000..2c1d693b4 --- /dev/null +++ b/assets/svg/fruitSorbet/doge.svg @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/fruitSorbet/firo.svg b/assets/svg/fruitSorbet/firo.svg new file mode 100644 index 000000000..6f502205c --- /dev/null +++ b/assets/svg/fruitSorbet/firo.svg @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/fruitSorbet/particl.svg b/assets/svg/fruitSorbet/particl.svg new file mode 100644 index 000000000..d15918985 --- /dev/null +++ b/assets/svg/fruitSorbet/particl.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/fruitSorbet/persona-easy-1.svg b/assets/svg/fruitSorbet/persona-easy-1.svg new file mode 100644 index 000000000..1e15b8dab --- /dev/null +++ b/assets/svg/fruitSorbet/persona-easy-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/fruitSorbet/persona-incognito-1.svg b/assets/svg/fruitSorbet/persona-incognito-1.svg new file mode 100644 index 000000000..c31c285b1 --- /dev/null +++ b/assets/svg/fruitSorbet/persona-incognito-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/fruitSorbet/wownero.svg b/assets/svg/fruitSorbet/wownero.svg new file mode 100644 index 000000000..812123542 --- /dev/null +++ b/assets/svg/fruitSorbet/wownero.svg @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/light/persona-easy-1.svg b/assets/svg/light/persona-easy-1.svg new file mode 100644 index 000000000..1e15b8dab --- /dev/null +++ b/assets/svg/light/persona-easy-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/light/persona-incognito-1.svg b/assets/svg/light/persona-incognito-1.svg new file mode 100644 index 000000000..c31c285b1 --- /dev/null +++ b/assets/svg/light/persona-incognito-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/oceanBreeze/persona-easy-1.svg b/assets/svg/oceanBreeze/persona-easy-1.svg new file mode 100644 index 000000000..1e15b8dab --- /dev/null +++ b/assets/svg/oceanBreeze/persona-easy-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/oceanBreeze/persona-incognito-1.svg b/assets/svg/oceanBreeze/persona-incognito-1.svg new file mode 100644 index 000000000..c31c285b1 --- /dev/null +++ b/assets/svg/oceanBreeze/persona-incognito-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/oledBlack/persona-easy-1.svg b/assets/svg/oledBlack/persona-easy-1.svg new file mode 100644 index 000000000..1e15b8dab --- /dev/null +++ b/assets/svg/oledBlack/persona-easy-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/oledBlack/persona-incognito-1.svg b/assets/svg/oledBlack/persona-incognito-1.svg new file mode 100644 index 000000000..c31c285b1 --- /dev/null +++ b/assets/svg/oledBlack/persona-incognito-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lib/pages/stack_privacy_calls.dart b/lib/pages/stack_privacy_calls.dart index 9e1f83599..5ec5b881d 100644 --- a/lib/pages/stack_privacy_calls.dart +++ b/lib/pages/stack_privacy_calls.dart @@ -21,6 +21,8 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart'; +import '../providers/ui/color_theme_provider.dart'; + class StackPrivacyCalls extends ConsumerStatefulWidget { const StackPrivacyCalls({ Key? key, @@ -39,11 +41,13 @@ class _StackPrivacyCalls extends ConsumerState { late final bool isDesktop; late bool isEasy; late bool infoToggle; + late final bool usePNG; @override void initState() { isDesktop = Util.isDesktop; isEasy = ref.read(prefsChangeNotifierProvider).externalCalls; + usePNG = ref.read(colorThemeProvider.state).state == "fruitSorbet"; infoToggle = isEasy; super.initState(); } @@ -277,7 +281,7 @@ class _StackPrivacyCalls extends ConsumerState { } } -class PrivacyToggle extends StatefulWidget { +class PrivacyToggle extends ConsumerStatefulWidget { const PrivacyToggle({ Key? key, required this.externalCallsEnabled, @@ -288,17 +292,19 @@ class PrivacyToggle extends StatefulWidget { final void Function(bool)? onChanged; @override - State createState() => _PrivacyToggleState(); + ConsumerState createState() => _PrivacyToggleState(); } -class _PrivacyToggleState extends State { +class _PrivacyToggleState extends ConsumerState { late bool externalCallsEnabled; late final bool isDesktop; + late final bool usePNG; @override void initState() { isDesktop = Util.isDesktop; + usePNG = ref.read(colorThemeProvider.state).state == "fruitSorbet"; // initial toggle state externalCallsEnabled = widget.externalCallsEnabled; super.initState(); @@ -346,8 +352,11 @@ class _PrivacyToggleState extends State { const SizedBox( height: 10, ), + // Image.asset( + // // Assets.png.personaEasy, + // ), SvgPicture.asset( - Assets.svg.personaEasy, + Assets.svg.personaEasy(context), width: isDesktop ? 120 : 140, height: isDesktop ? 120 : 140, ), @@ -452,7 +461,7 @@ class _PrivacyToggleState extends State { height: 10, ), SvgPicture.asset( - Assets.svg.personaIncognito, + Assets.svg.personaIncognito(context), width: isDesktop ? 120 : 140, height: isDesktop ? 120 : 140, ), diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart index e95be7bbf..a2591e57a 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart @@ -263,7 +263,7 @@ class _PrivacyToggleState extends State { height: 10, ), SvgPicture.asset( - Assets.svg.personaEasy, + Assets.svg.personaEasy(context), width: 120, height: 120, ), @@ -369,7 +369,7 @@ class _PrivacyToggleState extends State { height: 10, ), SvgPicture.asset( - Assets.svg.personaIncognito, + Assets.svg.personaIncognito(context), width: 120, height: 120, ), diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 2c092dd34..6806e85f3 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -94,6 +94,11 @@ class _SVG { String txExchangeFailed(BuildContext context) => "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-failed.svg"; + String personaIncognito(BuildContext context) => + "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-incognito-1.svg"; + String personaEasy(BuildContext context) => + "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-easy-1.svg"; + String get themeFruit => "assets/svg/fruit-sorbet-theme.svg"; String get themeForest => "assets/svg/forest-theme.svg"; String get themeOledBlack => "assets/svg/oled-black-theme.svg"; @@ -115,8 +120,6 @@ class _SVG { String get enableButton => "assets/svg/enabled-button.svg"; String get disableButton => "assets/svg/Button.svg"; String get polygon => "assets/svg/Polygon.svg"; - String get personaIncognito => "assets/svg/persona-incognito-1.svg"; - String get personaEasy => "assets/svg/persona-easy-1.svg"; String get drd => "assets/svg/drd-icon.svg"; String get boxAuto => "assets/svg/box-auto.svg"; String get plus => "assets/svg/plus.svg"; diff --git a/lib/widgets/background.dart b/lib/widgets/background.dart index aa8836570..a0ae868e3 100644 --- a/lib/widgets/background.dart +++ b/lib/widgets/background.dart @@ -23,6 +23,8 @@ class Background extends StatelessWidget { case ThemeType.light: case ThemeType.dark: case ThemeType.oledBlack: + color = Theme.of(context).extension()!.background; + break; case ThemeType.forest: color = Theme.of(context).extension()!.background; break; diff --git a/pubspec.yaml b/pubspec.yaml index 7377c7fd2..92e2d4210 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -280,8 +280,6 @@ flutter: - assets/svg/tx-icon-anonymize-pending.svg - assets/svg/tx-icon-anonymize-failed.svg - assets/svg/Polygon.svg - - assets/svg/persona-easy-1.svg - - assets/svg/persona-incognito-1.svg - assets/svg/Button.svg - assets/svg/enabled-button.svg - assets/svg/lock-circle.svg @@ -423,6 +421,8 @@ flutter: - assets/svg/light/bell-new.svg - assets/svg/light/stack-icon1.svg - assets/svg/light/buy-coins-icon.svg + - assets/svg/persona-easy-1.svg + - assets/svg/persona-incognito-1.svg # dark theme specific - assets/svg/dark/tx-exchange-icon.svg @@ -438,6 +438,8 @@ flutter: - assets/svg/dark/bell-new.svg - assets/svg/dark/stack-icon1.svg - assets/svg/dark/buy-coins-icon.svg + - assets/svg/persona-easy-1.svg + - assets/svg/persona-incognito-1.svg # ocean theme specific - assets/svg/oceanBreeze/tx-exchange-icon.svg @@ -454,6 +456,8 @@ flutter: - assets/svg/oceanBreeze/stack-icon1.svg - assets/svg/oceanBreeze/buy-coins-icon.svg - assets/svg/oceanBreeze/bg.svg + - assets/svg/persona-easy-1.svg + - assets/svg/persona-incognito-1.svg # OLED black theme specific - assets/svg/oledBlack/tx-exchange-icon.svg @@ -469,6 +473,8 @@ flutter: - assets/svg/oledBlack/bell-new.svg - assets/svg/oledBlack/stack-icon1.svg - assets/svg/oledBlack/buy-coins-icon.svg + - assets/svg/persona-easy-1.svg + - assets/svg/persona-incognito-1.svg # fruit sorbet theme specific - assets/svg/fruitSorbet/tx-exchange-icon.svg @@ -485,6 +491,8 @@ flutter: - assets/svg/fruitSorbet/stack-icon1.svg - assets/svg/fruitSorbet/buy-coins-icon.svg - assets/svg/fruitSorbet/bg.svg + - assets/svg/persona-easy-1.svg + - assets/svg/persona-incognito-1.svg # forest theme specific - assets/svg/forest/tx-exchange-icon.svg @@ -501,6 +509,8 @@ flutter: - assets/svg/forest/stack-icon1.svg - assets/svg/forest/buy-coins-icon.svg - assets/svg/forest/bg.svg + - assets/svg/persona-easy-1.svg + - assets/svg/persona-incognito-1.svg # buy - assets/svg/buy/Simplex-Nuvei-Logo.svg