diff --git a/assets/images/chan-persona-easy.png b/assets/images/chan-persona-easy.png new file mode 100644 index 000000000..e76af7c55 Binary files /dev/null and b/assets/images/chan-persona-easy.png differ diff --git a/assets/images/chan-persona-incognito.png b/assets/images/chan-persona-incognito.png new file mode 100644 index 000000000..57ccb555b Binary files /dev/null and b/assets/images/chan-persona-incognito.png differ diff --git a/lib/pages/stack_privacy_calls.dart b/lib/pages/stack_privacy_calls.dart index 27ea3aa80..7795b107a 100644 --- a/lib/pages/stack_privacy_calls.dart +++ b/lib/pages/stack_privacy_calls.dart @@ -8,10 +8,12 @@ import 'package:stackwallet/pages/pinpad_views/create_pin_view.dart'; import 'package:stackwallet/pages_desktop_specific/password/create_password_view.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/price_provider.dart'; +import 'package:stackwallet/providers/ui/color_theme_provider.dart'; import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart'; import 'package:stackwallet/utilities/assets.dart'; 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/stack_colors.dart'; import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/widgets/conditional_parent.dart'; @@ -308,6 +310,10 @@ class _PrivacyToggleState extends ConsumerState { @override Widget build(BuildContext context) { + final bool lightChan = + ref.read(colorThemeProvider.state).state.themeType == ThemeType.chan; + final bool darkChan = ref.read(colorThemeProvider.state).state.themeType == + ThemeType.darkChans; return Row( children: [ Expanded( @@ -344,19 +350,15 @@ class _PrivacyToggleState extends ConsumerState { Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - // if (isDesktop) - // const SizedBox( - // height: 10, - // ), - SvgPicture.asset( - Assets.svg.personaEasy(context), - width: 140, - height: 140, - ), - // if (isDesktop) - // const SizedBox( - // height: 12, - // ), + (lightChan || darkChan) + ? Image( + image: AssetImage(Assets.png.chanEasy), + ) + : SvgPicture.asset( + Assets.svg.personaEasy(context), + width: 140, + height: 140, + ), Center( child: Text( "Easy Crypto", @@ -453,11 +455,20 @@ class _PrivacyToggleState extends ConsumerState { const SizedBox( height: 10, ), - SvgPicture.asset( - Assets.svg.personaIncognito(context), - width: 140, - height: 140, - ), + (lightChan || darkChan) + ? Image( + image: AssetImage(Assets.png.chanIncognito), + ) + : SvgPicture.asset( + Assets.svg.personaIncognito(context), + width: 140, + height: 140, + ), + // SvgPicture.asset( + // Assets.svg.personaIncognito(context), + // width: 140, + // height: 140, + // ), if (isDesktop) const SizedBox( height: 12, 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 9d61b4d3c..c86e9812c 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 @@ -6,10 +6,12 @@ import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/db/hive/db.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/price_provider.dart'; +import 'package:stackwallet/providers/ui/color_theme_provider.dart'; import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart'; import 'package:stackwallet/utilities/assets.dart'; 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/stack_colors.dart'; import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/widgets/desktop/desktop_dialog.dart'; @@ -224,6 +226,10 @@ class _PrivacyToggleState extends ConsumerState { @override Widget build(BuildContext context) { + final bool lightChan = + ref.read(colorThemeProvider.state).state.themeType == ThemeType.chan; + final bool darkChan = ref.read(colorThemeProvider.state).state.themeType == + ThemeType.darkChans; return Row( children: [ Expanded( @@ -265,11 +271,20 @@ class _PrivacyToggleState extends ConsumerState { const SizedBox( height: 10, ), - SvgPicture.asset( - Assets.svg.personaEasy(context), - width: 120, - height: 120, - ), + // + (lightChan || darkChan) + ? Image( + image: AssetImage( + Assets.png.chanEasy, + ), + width: 120, + height: 120, + ) + : SvgPicture.asset( + Assets.svg.personaEasy(context), + width: 120, + height: 120, + ), if (isDesktop) const SizedBox( height: 12, @@ -371,11 +386,22 @@ class _PrivacyToggleState extends ConsumerState { const SizedBox( height: 10, ), - SvgPicture.asset( - Assets.svg.personaIncognito(context), - width: 120, - height: 120, - ), + (lightChan || darkChan) + ? Image( + image: AssetImage(Assets.png.chanIncognito), + width: 120, + height: 120, + ) + : SvgPicture.asset( + Assets.svg.personaIncognito(context), + width: 120, + height: 120, + ), + // SvgPicture.asset( + // Assets.svg.personaIncognito(context), + // width: 120, + // height: 120, + // ), if (isDesktop) const SizedBox( height: 12, diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index c1401b8cd..7c083ad01 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -406,6 +406,9 @@ class _PNG { String get glasses => "assets/images/glasses.png"; String get glassesHidden => "assets/images/glasses-hidden.png"; + + String get chanEasy => "assets/images/chan-persona-easy.png"; + String get chanIncognito => "assets/images/chan-persona-incognito.png"; } class _ANIMATIONS { diff --git a/pubspec.yaml b/pubspec.yaml index 693daed74..cd63f7320 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -211,6 +211,8 @@ flutter: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg assets: + - assets/images/chan-persona-incognito.png + - assets/images/chan-persona-easy.png - assets/images/splash.png - assets/icon/icon.png - google_fonts/