From e66feaae2843d38f9fa3664622bb547a14468be2 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Tue, 11 Oct 2022 14:19:48 -0600 Subject: [PATCH] font fix and added padding --- assets/svg/persona-easy-1.svg | 9 ++ assets/svg/persona-easy.svg | 1 - lib/pages/stack_privacy_calls.dart | 190 ++++++++++++++++------------- lib/utilities/assets.dart | 2 +- pubspec.yaml | 2 +- 5 files changed, 116 insertions(+), 88 deletions(-) create mode 100644 assets/svg/persona-easy-1.svg delete mode 100644 assets/svg/persona-easy.svg diff --git a/assets/svg/persona-easy-1.svg b/assets/svg/persona-easy-1.svg new file mode 100644 index 000000000..6cb3d4b62 --- /dev/null +++ b/assets/svg/persona-easy-1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/svg/persona-easy.svg b/assets/svg/persona-easy.svg deleted file mode 100644 index 136f29d61..000000000 --- a/assets/svg/persona-easy.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/pages/stack_privacy_calls.dart b/lib/pages/stack_privacy_calls.dart index 22856de4c..916e10f17 100644 --- a/lib/pages/stack_privacy_calls.dart +++ b/lib/pages/stack_privacy_calls.dart @@ -60,95 +60,115 @@ class _StackPrivacyCalls extends ConsumerState { controller: _pageController, physics: const NeverScrollableScrollPhysics(), children: [ - Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Choose your Stack experience", - style: STextStyles.pageTitleH1(context), - ), - const SizedBox( - height: 8, - ), - Text( - "You can change it later in Settings", - style: STextStyles.subtitle(context), - ), - const SizedBox( - height: 36, - ), - const Padding( - padding: EdgeInsets.symmetric( - horizontal: 16, + Padding( + padding: const EdgeInsets.fromLTRB(0, 40, 0, 0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "Choose your Stack experience", + style: STextStyles.pageTitleH1(context), ), - child: PrivacyToggle(), - ), - const SizedBox( - height: 36, - ), - RoundedWhiteContainer( - child: Center( - child: RichText( - textAlign: TextAlign.left, - text: TextSpan( - style: - STextStyles.label(context).copyWith(fontSize: 12.0), - children: ref.watch( - prefsChangeNotifierProvider.select( - (value) => value.externalCalls, + const SizedBox( + height: 8, + ), + Text( + "You can change it later in Settings", + style: STextStyles.subtitle(context), + ), + const SizedBox( + height: 36, + ), + const Padding( + padding: EdgeInsets.symmetric( + horizontal: 16, + ), + child: PrivacyToggle(), + ), + const SizedBox( + height: 36, + ), + Padding( + padding: const EdgeInsets.all(16.0), + child: RoundedWhiteContainer( + child: Center( + child: RichText( + textAlign: TextAlign.left, + text: TextSpan( + style: STextStyles.label(context) + .copyWith(fontSize: 12.0), + children: ref.watch( + prefsChangeNotifierProvider.select( + (value) => value.externalCalls, + ), + ) + ? [ + const TextSpan( + text: + "Exchange data preloaded for a seamless experience."), + const TextSpan( + text: + "\n\nCoinGecko enabled: (24 hour price change shown in-app, total wallet value shown in USD or other currency)."), + TextSpan( + text: + "\n\nRecommended for most crypto users.", + style: TextStyle( + color: Theme.of(context) + .extension()! + .textDark, + fontWeight: FontWeight.w600, + ), + ), + ] + : [ + const TextSpan( + text: + "Exchange data not preloaded (slower experience)."), + const TextSpan( + text: + "\n\nCoinGecko disabled (price changes not shown, no wallet value shown in other currencies)."), + TextSpan( + text: + "\n\nRecommended for the privacy conscious.", + style: TextStyle( + color: Theme.of(context) + .extension()! + .textDark, + fontWeight: FontWeight.w600, + ), + ), + ], ), - ) - ? const [ - TextSpan( - text: - "Exchange data preloaded for a seamless experience."), - TextSpan( - text: - "\n\nCoinGecko enabled: (24 hour price change shown in-app, total wallet value shown in USD or other currency)."), - TextSpan( - text: - "\n\nRecommended for most crypto users.", - style: - TextStyle(fontWeight: FontWeight.bold)), - ] - : const [ - TextSpan( - text: - "Exchange data not preloaded (slower experience)."), - TextSpan( - text: - "\n\nCoinGecko disabled (price changes not shown, no wallet value shown in other currencies)."), - TextSpan( - text: - "\n\nRecommended for the privacy conscious.", - style: - TextStyle(fontWeight: FontWeight.bold)), - ], + ), ), ), ), - ), - const Spacer( - flex: 4, - ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 16, + const Spacer( + flex: 4, ), - child: Row( - children: [ - Expanded( - child: ContinueButton( - isDesktop: isDesktop, - isSettings: widget.isSettings, - isEasy: isEasy, + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 16, + ), + child: Row( + children: [ + Expanded( + child: ContinueButton( + isDesktop: isDesktop, + isSettings: widget.isSettings, + isEasy: ref.watch( + prefsChangeNotifierProvider.select( + (value) => value.externalCalls, + ), + ), + ), ), - ), - ], + ], + ), ), - ), - ], + ], + ), ), ], ), @@ -203,8 +223,8 @@ class _PrivacyToggleState extends ConsumerState { children: [ SvgPicture.asset( Assets.svg.personaEasy, - width: 96, - height: 96, + width: 140, + height: 140, ), const Center( child: Text( @@ -299,8 +319,8 @@ class _PrivacyToggleState extends ConsumerState { children: [ SvgPicture.asset( Assets.svg.personaIncognito, - width: 96, - height: 96, + width: 140, + height: 140, ), const Center( child: Text( diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index ec5ca21bd..3bf2fa250 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -53,7 +53,7 @@ class _SVG { String get polygon => "assets/svg/Polygon.svg"; String get personaIncognito => "assets/svg/persona-incognito-1.svg"; - String get personaEasy => "assets/svg/persona-easy.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/pubspec.yaml b/pubspec.yaml index 80f4c30aa..318f143a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -290,7 +290,7 @@ flutter: - assets/svg/tx-icon-anonymize-pending.svg - assets/svg/tx-icon-anonymize-failed.svg - assets/svg/Polygon.svg - - assets/svg/persona-easy.svg + - assets/svg/persona-easy-1.svg - assets/svg/persona-incognito-1.svg # coin icons - assets/svg/coin_icons/Bitcoin.svg