Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-17 09:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP theme coloring

Browse source
This commit is contained in:
julian 2022-09-20 18:46:07 -06:00
parent a5f0443c4e
commit 1ae035bca1
167 changed files with 1597 additions and 968 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/main.dart
View file

@ -57,6 +57,8 @@ import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/prefs.dart'; import 'package:stackwallet/utilities/prefs.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/color_theme.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:window_size/window_size.dart'; import 'package:window_size/window_size.dart';
@ -156,6 +158,8 @@ class MyApp extends StatelessWidget {
final localeService = LocaleService(); final localeService = LocaleService();
localeService.loadLocale(); localeService.loadLocale();
StackTheme.instance.setTheme(ThemeType.dark);
return const KeyboardDismisser( return const KeyboardDismisser(
child: MaterialAppWithTheme(), child: MaterialAppWithTheme(),
); );
@ -529,8 +533,8 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
minimumSize: MaterialStateProperty.all<Size>(const Size(46, 46)), minimumSize: MaterialStateProperty.all<Size>(const Size(46, 46)),
textStyle: MaterialStateProperty.all<TextStyle>(STextStyles.button), textStyle: MaterialStateProperty.all<TextStyle>(STextStyles.button),
foregroundColor: MaterialStateProperty.all(CFColors.white), foregroundColor: MaterialStateProperty.all(CFColors.white),
backgroundColor: backgroundColor: MaterialStateProperty.all<Color>(
MaterialStateProperty.all<Color>(CFColors.buttonGray), StackTheme.instance.color.buttonBackSecondary),
shape: MaterialStateProperty.all<OutlinedBorder>( shape: MaterialStateProperty.all<OutlinedBorder>(
RoundedRectangleBorder( RoundedRectangleBorder(
// 1000 to be relatively sure it keeps its pill shape // 1000 to be relatively sure it keeps its pill shape
@ -550,28 +554,28 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
checkColor: MaterialStateColor.resolveWith( checkColor: MaterialStateColor.resolveWith(
(state) { (state) {
if (state.contains(MaterialState.selected)) { if (state.contains(MaterialState.selected)) {
return CFColors.white; return StackTheme.instance.color.checkboxIconChecked;
} }
return CFColors.link2; return StackTheme.instance.color.checkboxBGChecked;
}, },
), ),
fillColor: MaterialStateColor.resolveWith( fillColor: MaterialStateColor.resolveWith(
(states) { (states) {
if (states.contains(MaterialState.selected)) { if (states.contains(MaterialState.selected)) {
return CFColors.link2; return StackTheme.instance.color.checkboxBGChecked;
} }
return CFColors.disabledButton; return StackTheme.instance.color.checkboxBorderEmpty;
}, },
), ),
), ),
appBarTheme: const AppBarTheme( appBarTheme: AppBarTheme(
centerTitle: false, centerTitle: false,
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
elevation: 0, elevation: 0,
), ),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
focusColor: CFColors.fieldGray, focusColor: StackTheme.instance.color.textFieldDefaultBG,
fillColor: CFColors.fieldGray, fillColor: StackTheme.instance.color.textFieldDefaultBG,
filled: true, filled: true,
contentPadding: const EdgeInsets.symmetric( contentPadding: const EdgeInsets.symmetric(
vertical: 6, vertical: 6,
@ -579,11 +583,16 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
), ),
labelStyle: STextStyles.fieldLabel, labelStyle: STextStyles.fieldLabel,
hintStyle: STextStyles.fieldLabel, hintStyle: STextStyles.fieldLabel,
enabledBorder: _buildOutlineInputBorder(CFColors.fieldGray), enabledBorder: _buildOutlineInputBorder(
focusedBorder: _buildOutlineInputBorder(CFColors.fieldGray), StackTheme.instance.color.textFieldDefaultBG),
errorBorder: _buildOutlineInputBorder(CFColors.fieldGray), focusedBorder: _buildOutlineInputBorder(
disabledBorder: _buildOutlineInputBorder(CFColors.fieldGray), StackTheme.instance.color.textFieldDefaultBG),
focusedErrorBorder: _buildOutlineInputBorder(CFColors.fieldGray), errorBorder: _buildOutlineInputBorder(
StackTheme.instance.color.textFieldDefaultBG),
disabledBorder: _buildOutlineInputBorder(
StackTheme.instance.color.textFieldDefaultBG),
focusedErrorBorder: _buildOutlineInputBorder(
StackTheme.instance.color.textFieldDefaultBG),
), ),
), ),
home: FutureBuilder( home: FutureBuilder(

3
lib/notifications/notification_card.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/models/notification_model.dart'; import 'package:stackwallet/models/notification_model.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
@ -83,7 +84,7 @@ class NotificationCard extends StatelessWidget {
if (notification.read) if (notification.read)
Positioned.fill( Positioned.fill(
child: RoundedContainer( child: RoundedContainer(
color: CFColors.almostWhite.withOpacity(0.5), color: StackTheme.instance.color.background.withOpacity(0.5),
), ),
), ),
], ],

14
lib/notifications/show_flush_bar.dart
View file

@ -2,9 +2,9 @@ import 'package:another_flushbar/flushbar.dart';
import 'package:another_flushbar/flushbar_route.dart' as flushRoute; import 'package:another_flushbar/flushbar_route.dart' as flushRoute;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
Future<dynamic> showFloatingFlushBar({ Future<dynamic> showFloatingFlushBar({
required FlushBarType type, required FlushBarType type,
@ -19,16 +19,16 @@ Future<dynamic> showFloatingFlushBar({
Color fg; Color fg;
switch (type) { switch (type) {
case FlushBarType.success: case FlushBarType.success:
fg = CFColors.notificationGreenForeground; fg = StackTheme.instance.color.snackBarTextSuccess;
bg = CFColors.notificationGreenBackground; bg = StackTheme.instance.color.snackBarBackSuccess;
break; break;
case FlushBarType.info: case FlushBarType.info:
fg = CFColors.notificationBlueForeground; fg = StackTheme.instance.color.snackBarTextInfo;
bg = CFColors.notificationBlueBackground; bg = StackTheme.instance.color.snackBarBackInfo;
break; break;
case FlushBarType.warning: case FlushBarType.warning:
fg = CFColors.notificationRedForeground; fg = StackTheme.instance.color.snackBarTextError;
bg = CFColors.notificationRedBackground; bg = StackTheme.instance.color.snackBarBackError;
break; break;
} }
final bar = Flushbar<dynamic>( final bar = Flushbar<dynamic>(

3
lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/sub_widgets/s
import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my_stack_button.dart'; import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my_stack_button.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -186,7 +187,7 @@ class _AddWalletViewState extends State<AddWalletView> {
), ),
), ),
body: Container( body: Container(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(

5
lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
class CoinSelectItem extends ConsumerWidget { class CoinSelectItem extends ConsumerWidget {
@ -28,8 +29,8 @@ class CoinSelectItem extends ConsumerWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
// color: selectedCoin == coin ? CFColors.selection : CFColors.white, // color: selectedCoin == coin ? CFColors.selection : CFColors.white,
color: selectedCoin == coin color: selectedCoin == coin
? CFColors.textFieldActive ? StackTheme.instance.color.textFieldActiveBG
: CFColors.popupBackground, : StackTheme.instance.color.popupBG,
borderRadius: borderRadius:
BorderRadius.circular(Constants.size.circularBorderRadius), BorderRadius.circular(Constants.size.circularBorderRadius),
), ),

6
lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
View file

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart'; import 'package:stackwallet/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class AddWalletNextButton extends ConsumerWidget { class AddWalletNextButton extends ConsumerWidget {
const AddWalletNextButton({ const AddWalletNextButton({
@ -34,8 +34,8 @@ class AddWalletNextButton extends ConsumerWidget {
); );
}, },
style: enabled style: enabled
? CFColors.getPrimaryEnabledButtonColor(context) ? StackTheme.instance.getPrimaryEnabledButtonColor(context)
: CFColors.getPrimaryDisabledButtonColor(context), : StackTheme.instance.getPrimaryDisabledButtonColor(context),
child: Text( child: Text(
"Next", "Next",
style: isDesktop style: isDesktop

1
lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/pages/add_wallet_views/create_or_restore_wallet_view
import 'package:stackwallet/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart'; import 'package:stackwallet/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart';
import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my_stack_button.dart'; import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my_stack_button.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';

5
lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart
View file

@ -4,6 +4,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/enums/add_wallet_type_enum.dart'; import 'package:stackwallet/utilities/enums/add_wallet_type_enum.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
class CreateWalletButtonGroup extends StatelessWidget { class CreateWalletButtonGroup extends StatelessWidget {
@ -28,7 +29,7 @@ class CreateWalletButtonGroup extends StatelessWidget {
minWidth: isDesktop ? 480 : 0, minWidth: isDesktop ? 480 : 0,
), ),
child: TextButton( child: TextButton(
style: CFColors.getPrimaryEnabledButtonColor(context), style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
NameYourWalletView.routeName, NameYourWalletView.routeName,
@ -55,7 +56,7 @@ class CreateWalletButtonGroup extends StatelessWidget {
minWidth: isDesktop ? 480 : 0, minWidth: isDesktop ? 480 : 0,
), ),
child: TextButton( child: TextButton(
style: CFColors.getSecondaryEnabledButtonColor(context), style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
NameYourWalletView.routeName, NameYourWalletView.routeName,

7
lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
View file

@ -16,6 +16,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/name_generator.dart'; import 'package:stackwallet/utilities/name_generator.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
@ -125,7 +126,7 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
), ),
), ),
body: Container( body: Container(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: LayoutBuilder( child: LayoutBuilder(
@ -337,8 +338,8 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
} }
: null, : null,
style: _nextEnabled style: _nextEnabled
? CFColors.getPrimaryEnabledButtonColor(context) ? StackTheme.instance.getPrimaryEnabledButtonColor(context)
: CFColors.getPrimaryDisabledButtonColor(context), : StackTheme.instance.getPrimaryDisabledButtonColor(context),
child: Text( child: Text(
"Next", "Next",
style: isDesktop style: isDesktop

6
lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart
View file

@ -19,6 +19,7 @@ import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
@ -141,7 +142,7 @@ class _NewWalletRecoveryPhraseViewState
child: AspectRatio( child: AspectRatio(
aspectRatio: 1, aspectRatio: 1,
child: AppBarIconButton( child: AppBarIconButton(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
shadows: const [], shadows: const [],
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,
@ -284,7 +285,8 @@ class _NewWalletRecoveryPhraseViewState
arguments: Tuple2(_manager, _mnemonic), arguments: Tuple2(_manager, _mnemonic),
)); ));
}, },
style: CFColors.getPrimaryEnabledButtonColor(context), style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
child: Text( child: Text(
"I saved my recovery phrase", "I saved my recovery phrase",
style: isDesktop style: isDesktop

1
lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table_item.dart
View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';

8
lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
View file

@ -8,12 +8,12 @@ import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/services/coins/coin_service.dart'; import 'package:stackwallet/services/coins/coin_service.dart';
import 'package:stackwallet/services/coins/manager.dart'; import 'package:stackwallet/services/coins/manager.dart';
import 'package:stackwallet/services/transaction_notification_tracker.dart'; import 'package:stackwallet/services/transaction_notification_tracker.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/default_nodes.dart'; import 'package:stackwallet/utilities/default_nodes.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
@ -269,8 +269,10 @@ class _NewWalletRecoveryPhraseWarningViewState
} }
: null, : null,
style: ref.read(checkBoxStateProvider.state).state style: ref.read(checkBoxStateProvider.state).state
? CFColors.getPrimaryEnabledButtonColor(context) ? StackTheme.instance
: CFColors.getPrimaryDisabledButtonColor(context), .getPrimaryEnabledButtonColor(context)
: StackTheme.instance
.getPrimaryDisabledButtonColor(context),
child: Text( child: Text(
"View recovery phrase", "View recovery phrase",
style: isDesktop style: isDesktop

14
lib/pages/add_wallet_views/restore_wallet_view/confirm_recovery_dialog.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class ConfirmRecoveryDialog extends StatelessWidget { class ConfirmRecoveryDialog extends StatelessWidget {
@ -20,11 +20,7 @@ class ConfirmRecoveryDialog extends StatelessWidget {
message: message:
"Restoring your wallet may take a while. Please do not exit this screen once the process is started.", "Restoring your wallet may take a while. Please do not exit this screen once the process is started.",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,
@ -34,11 +30,7 @@ class ConfirmRecoveryDialog extends StatelessWidget {
}, },
), ),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.stackAccent,
),
),
child: Text( child: Text(
"Restore", "Restore",
style: STextStyles.button, style: STextStyles.button,

12
lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
View file

@ -17,6 +17,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
@ -262,7 +263,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
"Choose start date", "Choose start date",
style: isDesktop style: isDesktop
? STextStyles.desktopTextExtraSmall.copyWith( ? STextStyles.desktopTextExtraSmall.copyWith(
color: CFColors.textFieldActiveSearchIconRight, color: StackTheme.instance.color.textDark3,
) )
: STextStyles.smallMed12, : STextStyles.smallMed12,
textAlign: TextAlign.left, textAlign: TextAlign.left,
@ -307,7 +308,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
"Choose recovery phrase length", "Choose recovery phrase length",
style: isDesktop style: isDesktop
? STextStyles.desktopTextExtraSmall.copyWith( ? STextStyles.desktopTextExtraSmall.copyWith(
color: CFColors.textFieldActiveSearchIconRight, color: StackTheme.instance.color.textDark3,
) )
: STextStyles.smallMed12, : STextStyles.smallMed12,
textAlign: TextAlign.left, textAlign: TextAlign.left,
@ -342,20 +343,21 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
Assets.svg.chevronDown, Assets.svg.chevronDown,
width: 12, width: 12,
height: 6, height: 6,
color: CFColors.textFieldActiveSearchIconRight, color: StackTheme
.instance.color.textFieldActiveSearchIconRight,
), ),
buttonPadding: const EdgeInsets.symmetric( buttonPadding: const EdgeInsets.symmetric(
horizontal: 16, horizontal: 16,
vertical: 8, vertical: 8,
), ),
buttonDecoration: BoxDecoration( buttonDecoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
), ),
dropdownDecoration: BoxDecoration( dropdownDecoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),

1
lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/mobile_mnemonic_length_selector.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/providers/ui/verify_recovery_phrase/mnemonic_word_count_state_provider.dart'; import 'package:stackwallet/providers/ui/verify_recovery_phrase/mnemonic_word_count_state_provider.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';

1
lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_from_date_picker.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
class RestoreFromDatePicker extends StatefulWidget { class RestoreFromDatePicker extends StatefulWidget {

6
lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_options_next_button.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class RestoreOptionsNextButton extends StatelessWidget { class RestoreOptionsNextButton extends StatelessWidget {
const RestoreOptionsNextButton({ const RestoreOptionsNextButton({
@ -21,8 +21,8 @@ class RestoreOptionsNextButton extends StatelessWidget {
child: TextButton( child: TextButton(
onPressed: onPressed, onPressed: onPressed,
style: onPressed != null style: onPressed != null
? CFColors.getPrimaryEnabledButtonColor(context) ? StackTheme.instance.getPrimaryEnabledButtonColor(context)
: CFColors.getPrimaryDisabledButtonColor(context), : StackTheme.instance.getPrimaryDisabledButtonColor(context),
child: Text( child: Text(
"Next", "Next",
style: STextStyles.button, style: STextStyles.button,

1
lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_options_platform_layout.dart
View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class RestoreOptionsPlatformLayout extends StatelessWidget { class RestoreOptionsPlatformLayout extends StatelessWidget {
const RestoreOptionsPlatformLayout({ const RestoreOptionsPlatformLayout({

29
lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
View file

@ -34,6 +34,7 @@ import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/enums/form_input_status_enum.dart'; import 'package:stackwallet/utilities/enums/form_input_status_enum.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart';
@ -354,27 +355,27 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
Widget? suffixIcon; Widget? suffixIcon;
switch (status) { switch (status) {
case FormInputStatus.empty: case FormInputStatus.empty:
color = CFColors.fieldGray; color = StackTheme.instance.color.textFieldDefaultBG;
prefixColor = CFColors.gray3; prefixColor = CFColors.gray3;
break; break;
case FormInputStatus.invalid: case FormInputStatus.invalid:
color = CFColors.notificationRedBackground; color = StackTheme.instance.color.textFieldErrorBG;
prefixColor = CFColors.notificationRedForeground; prefixColor = StackTheme.instance.color.textFieldErrorSearchIconLeft;
suffixIcon = SvgPicture.asset( suffixIcon = SvgPicture.asset(
Assets.svg.alertCircle, Assets.svg.alertCircle,
width: 16, width: 16,
height: 16, height: 16,
color: CFColors.notificationRedForeground, color: StackTheme.instance.color.textFieldErrorSearchIconRight,
); );
break; break;
case FormInputStatus.valid: case FormInputStatus.valid:
color = CFColors.notificationGreenBackground; color = StackTheme.instance.color.textFieldSuccessBG;
prefixColor = CFColors.notificationGreenForeground; prefixColor = StackTheme.instance.color.textFieldSuccessSearchIconLeft;
suffixIcon = SvgPicture.asset( suffixIcon = SvgPicture.asset(
Assets.svg.checkCircle, Assets.svg.checkCircle,
width: 16, width: 16,
height: 16, height: 16,
color: CFColors.notificationGreenForeground, color: StackTheme.instance.color.textFieldSuccessSearchIconRight,
); );
break; break;
} }
@ -547,7 +548,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
key: const Key("restoreWalletViewQrCodeButton"), key: const Key("restoreWalletViewQrCodeButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: const QrCodeIcon( icon: const QrCodeIcon(
width: 20, width: 20,
height: 20, height: 20,
@ -569,7 +570,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
key: const Key("restoreWalletPasteButton"), key: const Key("restoreWalletPasteButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: const ClipboardIcon( icon: const ClipboardIcon(
width: 20, width: 20,
height: 20, height: 20,
@ -582,7 +583,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
], ],
), ),
body: Container( body: Container(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
child: Padding( child: Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Column( child: Column(
@ -669,8 +670,8 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
"Please check spelling", "Please check spelling",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: STextStyles.label.copyWith( style: STextStyles.label.copyWith(
color: CFColors color: StackTheme
.notificationRedForeground, .instance.color.textError,
), ),
), ),
), ),
@ -682,8 +683,8 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
top: 8.0, top: 8.0,
), ),
child: TextButton( child: TextButton(
style: CFColors.getPrimaryEnabledButtonColor( style: StackTheme.instance
context), .getPrimaryEnabledButtonColor(context),
onPressed: requestRestore, onPressed: requestRestore,
child: Text( child: Text(
"Restore", "Restore",

6
lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/mnemonic_word_count_select_sheet.dart
View file

@ -4,6 +4,7 @@ import 'package:stackwallet/providers/ui/verify_recovery_phrase/mnemonic_word_co
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class MnemonicWordCountSelectSheet extends ConsumerWidget { class MnemonicWordCountSelectSheet extends ConsumerWidget {
const MnemonicWordCountSelectSheet({ const MnemonicWordCountSelectSheet({
@ -42,7 +43,7 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
Center( Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
@ -96,7 +97,8 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: lengthOptions[i], value: lengthOptions[i],
groupValue: ref groupValue: ref
.watch(mnemonicWordCountStateProvider .watch(mnemonicWordCountStateProvider

8
lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart
View file

@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class RestoreFailedDialog extends ConsumerStatefulWidget { class RestoreFailedDialog extends ConsumerStatefulWidget {
@ -45,11 +45,7 @@ class _RestoreFailedDialogState extends ConsumerState<RestoreFailedDialog> {
title: "Restore failed", title: "Restore failed",
message: errorMessage, message: errorMessage,
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,

9
lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_succeeded_dialog.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class RestoreSucceededDialog extends StatelessWidget { class RestoreSucceededDialog extends StatelessWidget {
@ -17,14 +18,10 @@ class RestoreSucceededDialog extends StatelessWidget {
Assets.svg.checkCircle, Assets.svg.checkCircle,
width: 24, width: 24,
height: 24, height: 24,
color: CFColors.stackGreen, color: StackTheme.instance.color.accentColorGreen,
), ),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,

7
lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restoring_dialog.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class RestoringDialog extends StatefulWidget { class RestoringDialog extends StatefulWidget {
@ -67,11 +68,7 @@ class _RestoringDialogState extends State<RestoringDialog>
), ),
), ),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,

1
lib/pages/add_wallet_views/verify_recovery_phrase_view/sub_widgets/word_table_item.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';

11
lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart
View file

@ -16,6 +16,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
@ -263,7 +264,7 @@ class _VerifyRecoveryPhraseViewState
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius), Constants.size.circularBorderRadius),
), ),
@ -322,10 +323,10 @@ class _VerifyRecoveryPhraseViewState
} }
: null, : null,
style: selectedWord.isNotEmpty style: selectedWord.isNotEmpty
? CFColors.getPrimaryEnabledButtonColor( ? StackTheme.instance
context) .getPrimaryEnabledButtonColor(context)
: CFColors.getPrimaryDisabledButtonColor( : StackTheme.instance
context), .getPrimaryDisabledButtonColor(context),
child: isDesktop child: isDesktop
? Text( ? Text(
"Verify", "Verify",

7
lib/pages/address_book_views/address_book_view.dart
View file

@ -10,6 +10,7 @@ import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart'; import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -102,7 +103,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
addressBookServiceProvider.select((value) => value.addressBookEntries)); addressBookServiceProvider.select((value) => value.addressBookEntries));
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -126,7 +127,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
key: const Key("addressBookFilterViewButton"), key: const Key("addressBookFilterViewButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.filter, Assets.svg.filter,
color: CFColors.stackAccent, color: CFColors.stackAccent,
@ -153,7 +154,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
key: const Key("addressBookAddNewContactViewButton"), key: const Key("addressBookAddNewContactViewButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.plus, Assets.svg.plus,
color: CFColors.stackAccent, color: CFColors.stackAccent,

33
lib/pages/address_book_views/subviews/add_address_book_entry_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/emoji_select_sheet.dart'; import 'package:stackwallet/widgets/emoji_select_sheet.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
@ -93,7 +94,7 @@ class _AddAddressBookEntryViewState
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -123,10 +124,12 @@ class _AddAddressBookEntryViewState
key: const Key("addAddressBookEntryFavoriteButtonKey"), key: const Key("addAddressBookEntryFavoriteButtonKey"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.star, Assets.svg.star,
color: _isFavorite ? CFColors.link2 : CFColors.buttonGray, color: _isFavorite
? StackTheme.instance.color.accentColorRed
: StackTheme.instance.color.buttonBackSecondary,
width: 20, width: 20,
height: 20, height: 20,
), ),
@ -198,7 +201,8 @@ class _AddAddressBookEntryViewState
width: 48, width: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: CFColors.textFieldActive, color: StackTheme
.instance.color.textFieldActiveBG,
), ),
child: Center( child: Center(
child: _selectedEmoji == null child: _selectedEmoji == null
@ -336,12 +340,8 @@ class _AddAddressBookEntryViewState
children: [ children: [
Expanded( Expanded(
child: TextButton( child: TextButton(
style: ButtonStyle( style: StackTheme.instance
backgroundColor: .getSecondaryEnabledButtonColor(context),
MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -380,13 +380,12 @@ class _AddAddressBookEntryViewState
validForms && nameExists; validForms && nameExists;
return TextButton( return TextButton(
style: ButtonStyle( style: shouldEnableSave
backgroundColor: ? StackTheme.instance
MaterialStateProperty.all<Color>( .getPrimaryEnabledButtonColor(context)
shouldEnableSave : StackTheme.instance
? CFColors.stackAccent .getPrimaryDisabledButtonColor(
: CFColors.disabledButton, context),
)),
onPressed: shouldEnableSave onPressed: shouldEnableSave
? () async { ? () async {
if (FocusScope.of(context).hasFocus) { if (FocusScope.of(context).hasFocus) {

29
lib/pages/address_book_views/subviews/add_new_contact_address_view.dart
View file

@ -12,6 +12,7 @@ import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
class AddNewContactAddressView extends ConsumerStatefulWidget { class AddNewContactAddressView extends ConsumerStatefulWidget {
@ -56,7 +57,7 @@ class _AddNewContactAddressViewState
.select((value) => value.getContactById(contactId))); .select((value) => value.getContactById(contactId)));
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -99,7 +100,8 @@ class _AddNewContactAddressViewState
width: 48, width: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: CFColors.textFieldActive, color:
StackTheme.instance.color.textFieldActiveBG,
), ),
child: Center( child: Center(
child: contact.emojiChar == null child: contact.emojiChar == null
@ -144,12 +146,8 @@ class _AddNewContactAddressViewState
children: [ children: [
Expanded( Expanded(
child: TextButton( child: TextButton(
style: ButtonStyle( style: StackTheme.instance
backgroundColor: .getSecondaryEnabledButtonColor(context),
MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -178,14 +176,13 @@ class _AddNewContactAddressViewState
ref.watch(validContactStateProvider([0])); ref.watch(validContactStateProvider([0]));
return TextButton( return TextButton(
style: ButtonStyle( style: shouldEnableSave
backgroundColor: ? StackTheme.instance
MaterialStateProperty.all<Color>( .getPrimaryEnabledButtonColor(
shouldEnableSave context)
? CFColors.stackAccent : StackTheme.instance
: CFColors.disabledButton, .getPrimaryDisabledButtonColor(
), context),
),
onPressed: shouldEnableSave onPressed: shouldEnableSave
? () async { ? () async {
if (FocusScope.of(context) if (FocusScope.of(context)

5
lib/pages/address_book_views/subviews/address_book_filter_view.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart';
import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart'; import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -42,9 +43,9 @@ class _AddressBookFilterViewState extends ConsumerState<AddressBookFilterView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
Navigator.of(context).pop(); Navigator.of(context).pop();

3
lib/pages/address_book_views/subviews/coin_select_sheet.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class CoinSelectSheet extends StatelessWidget { class CoinSelectSheet extends StatelessWidget {
const CoinSelectSheet({Key? key}) : super(key: key); const CoinSelectSheet({Key? key}) : super(key: key);
@ -39,7 +40,7 @@ class CoinSelectSheet extends StatelessWidget {
Center( Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),

50
lib/pages/address_book_views/subviews/contact_details_view.dart
View file

@ -18,6 +18,7 @@ import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
@ -105,7 +106,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
.select((value) => value.getContactById(_contactId))); .select((value) => value.getContactById(_contactId)));
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -129,12 +130,12 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
key: const Key("contactDetails"), key: const Key("contactDetails"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.star, Assets.svg.star,
color: _contact.isFavorite color: _contact.isFavorite
? CFColors.link2 ? StackTheme.instance.color.infoItemIcons
: CFColors.buttonGray, : StackTheme.instance.color.buttonBackSecondary,
width: 20, width: 20,
height: 20, height: 20,
), ),
@ -160,7 +161,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
key: const Key("contactDetailsViewDeleteContactButtonKey"), key: const Key("contactDetailsViewDeleteContactButtonKey"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.trash, Assets.svg.trash,
color: CFColors.stackAccent, color: CFColors.stackAccent,
@ -176,14 +177,8 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
title: "Delete ${_contact.name}?", title: "Delete ${_contact.name}?",
message: "Contact will be deleted permanently!", message: "Contact will be deleted permanently!",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(context),
.style
?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,
@ -193,14 +188,8 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
}, },
), ),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getPrimaryEnabledButtonColor(context),
.style
?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.stackAccent,
),
),
child: Text( child: Text(
"Delete", "Delete",
style: STextStyles.button, style: STextStyles.button,
@ -246,7 +235,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
width: 48, width: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: CFColors.textFieldActive, color: StackTheme.instance.color.textFieldActiveBG,
), ),
child: Center( child: Center(
child: _contact.emojiChar == null child: _contact.emojiChar == null
@ -280,12 +269,11 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
arguments: _contact.id, arguments: _contact.id,
); );
}, },
style: ButtonStyle( style: StackTheme.instance
minimumSize: .getSecondaryEnabledButtonColor(context)!
MaterialStateProperty.all<Size>(const Size(46, 32)), .copyWith(
backgroundColor: MaterialStateProperty.all( minimumSize: MaterialStateProperty.all<Size>(
CFColors.buttonGray, const Size(46, 32)),
),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12), padding: const EdgeInsets.symmetric(horizontal: 12),
@ -391,7 +379,8 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
); );
}, },
child: RoundedContainer( child: RoundedContainer(
color: CFColors.fieldGray, color: StackTheme
.instance.color.textFieldDefaultBG,
padding: const EdgeInsets.all(4), padding: const EdgeInsets.all(4),
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.pencil, Assets.svg.pencil,
@ -417,7 +406,8 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
); );
}, },
child: RoundedContainer( child: RoundedContainer(
color: CFColors.fieldGray, color: StackTheme
.instance.color.textFieldDefaultBG,
padding: const EdgeInsets.all(4), padding: const EdgeInsets.all(4),
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,

25
lib/pages/address_book_views/subviews/contact_popup.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
@ -98,7 +99,8 @@ class ContactPopUp extends ConsumerWidget {
width: 32, width: 32,
height: 32, height: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.contactIconBackground, color: StackTheme
.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular(32), borderRadius: BorderRadius.circular(32),
), ),
child: contact.id == "default" child: contact.id == "default"
@ -138,14 +140,13 @@ class ContactPopUp extends ConsumerWidget {
arguments: contact.id, arguments: contact.id,
); );
}, },
style: ButtonStyle( style: StackTheme.instance
.getSecondaryEnabledButtonColor(
context)!
.copyWith(
minimumSize: minimumSize:
MaterialStateProperty.all<Size>( MaterialStateProperty.all<
const Size(46, 32)), Size>(const Size(46, 32)),
backgroundColor:
MaterialStateProperty.all(
CFColors.buttonGray,
),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
@ -162,7 +163,7 @@ class ContactPopUp extends ConsumerWidget {
), ),
Container( Container(
height: 1, height: 1,
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
), ),
if (addresses.isEmpty) if (addresses.isEmpty)
Padding( Padding(
@ -254,7 +255,8 @@ class ContactPopUp extends ConsumerWidget {
); );
}, },
child: RoundedContainer( child: RoundedContainer(
color: CFColors.fieldGray, color: StackTheme.instance.color
.textFieldDefaultBG,
padding: const EdgeInsets.all(4), padding: const EdgeInsets.all(4),
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,
@ -304,7 +306,8 @@ class ContactPopUp extends ConsumerWidget {
} }
}, },
child: RoundedContainer( child: RoundedContainer(
color: CFColors.fieldGray, color: StackTheme.instance.color
.textFieldDefaultBG,
padding: padding:
const EdgeInsets.all(4), const EdgeInsets.all(4),
child: SvgPicture.asset( child: SvgPicture.asset(

29
lib/pages/address_book_views/subviews/edit_contact_address_view.dart
View file

@ -12,6 +12,7 @@ import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
class EditContactAddressView extends ConsumerStatefulWidget { class EditContactAddressView extends ConsumerStatefulWidget {
@ -60,7 +61,7 @@ class _EditContactAddressViewState
.select((value) => value.getContactById(contactId))); .select((value) => value.getContactById(contactId)));
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -103,7 +104,8 @@ class _EditContactAddressViewState
width: 48, width: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: CFColors.textFieldActive, color:
StackTheme.instance.color.textFieldActiveBG,
), ),
child: Center( child: Center(
child: contact.emojiChar == null child: contact.emojiChar == null
@ -179,12 +181,8 @@ class _EditContactAddressViewState
children: [ children: [
Expanded( Expanded(
child: TextButton( child: TextButton(
style: ButtonStyle( style: StackTheme.instance
backgroundColor: .getSecondaryEnabledButtonColor(context),
MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -213,14 +211,13 @@ class _EditContactAddressViewState
ref.watch(validContactStateProvider([0])); ref.watch(validContactStateProvider([0]));
return TextButton( return TextButton(
style: ButtonStyle( style: shouldEnableSave
backgroundColor: ? StackTheme.instance
MaterialStateProperty.all<Color>( .getPrimaryEnabledButtonColor(
shouldEnableSave context)
? CFColors.stackAccent : StackTheme.instance
: CFColors.disabledButton, .getPrimaryDisabledButtonColor(
), context),
),
onPressed: shouldEnableSave onPressed: shouldEnableSave
? () async { ? () async {
if (FocusScope.of(context) if (FocusScope.of(context)

29
lib/pages/address_book_views/subviews/edit_contact_name_emoji_view.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/emoji_select_sheet.dart'; import 'package:stackwallet/widgets/emoji_select_sheet.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
@ -68,7 +69,7 @@ class _EditContactNameEmojiViewState
.select((value) => value.getContactById(contactId))); .select((value) => value.getContactById(contactId)));
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -139,7 +140,8 @@ class _EditContactNameEmojiViewState
width: 48, width: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: CFColors.textFieldActive, color: StackTheme
.instance.color.textFieldActiveBG,
), ),
child: Center( child: Center(
child: _selectedEmoji == null child: _selectedEmoji == null
@ -230,12 +232,8 @@ class _EditContactNameEmojiViewState
children: [ children: [
Expanded( Expanded(
child: TextButton( child: TextButton(
style: ButtonStyle( style: StackTheme.instance
backgroundColor: .getSecondaryEnabledButtonColor(context),
MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -264,14 +262,13 @@ class _EditContactNameEmojiViewState
nameController.text.isNotEmpty; nameController.text.isNotEmpty;
return TextButton( return TextButton(
style: ButtonStyle( style: shouldEnableSave
backgroundColor: ? StackTheme.instance
MaterialStateProperty.all<Color>( .getPrimaryEnabledButtonColor(
shouldEnableSave context)
? CFColors.stackAccent : StackTheme.instance
: CFColors.disabledButton, .getPrimaryDisabledButtonColor(
), context),
),
onPressed: shouldEnableSave onPressed: shouldEnableSave
? () async { ? () async {
if (FocusScope.of(context) if (FocusScope.of(context)

4
lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
View file

@ -9,11 +9,13 @@ import 'package:stackwallet/utilities/address_utils.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/barcode_scanner_interface.dart'; import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart';
import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
@ -352,7 +354,7 @@ class _NewContactAddressEntryFormState
"Invalid address", "Invalid address",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: STextStyles.label.copyWith( style: STextStyles.label.copyWith(
color: CFColors.notificationRedForeground, color: StackTheme.instance.color.textError,
), ),
), ),
], ],

14
lib/pages/exchange_view/confirm_change_now_send.dart
View file

@ -12,6 +12,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -86,7 +87,7 @@ class _ConfirmChangeNowSendViewState
// pop sending dialog // pop sending dialog
Navigator.of(context).pop(); Navigator.of(context).pop();
showDialog<dynamic>( await showDialog<dynamic>(
context: context, context: context,
useSafeArea: false, useSafeArea: false,
barrierDismissible: true, barrierDismissible: true,
@ -95,11 +96,8 @@ class _ConfirmChangeNowSendViewState
title: "Broadcast transaction failed", title: "Broadcast transaction failed",
message: e.toString(), message: e.toString(),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style:
backgroundColor: MaterialStateProperty.all<Color>( StackTheme.instance.getSecondaryEnabledButtonColor(context),
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -131,7 +129,7 @@ class _ConfirmChangeNowSendViewState
.select((value) => value.getManagerProvider(walletId))); .select((value) => value.getManagerProvider(walletId)));
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
// if (FocusScope.of(context).hasFocus) { // if (FocusScope.of(context).hasFocus) {
@ -317,7 +315,7 @@ class _ConfirmChangeNowSendViewState
height: 12, height: 12,
), ),
RoundedContainer( RoundedContainer(
color: CFColors.stackGreen15, color: StackTheme.instance.color.snackBarBackSuccess,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [

5
lib/pages/exchange_view/edit_trade_note_view.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/exchange/trade_note_service_provider.dart'; import 'package:stackwallet/providers/exchange/trade_note_service_provider.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -46,9 +47,9 @@ class _EditNoteViewState extends ConsumerState<EditTradeNoteView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
if (FocusScope.of(context).hasFocus) { if (FocusScope.of(context).hasFocus) {

3
lib/pages/exchange_view/exchange_coin_selection/fixed_rate_pair_coin_selection_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/models/exchange/change_now/currency.dart';
import 'package:stackwallet/models/exchange/change_now/fixed_rate_market.dart'; import 'package:stackwallet/models/exchange/change_now/fixed_rate_market.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -119,7 +120,7 @@ class _FixedRateMarketPairCoinSelectionViewState
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

3
lib/pages/exchange_view/exchange_coin_selection/floating_rate_currency_selection_view.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/models/exchange/change_now/currency.dart'; import 'package:stackwallet/models/exchange/change_now/currency.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -75,7 +76,7 @@ class _FloatingRateCurrencySelectionViewState
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

1
lib/pages/exchange_view/exchange_loading_overlay.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/exchange/changenow_initial_load_status.dart'; import 'package:stackwallet/providers/exchange/changenow_initial_load_status.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_loading_overlay.dart'; import 'package:stackwallet/widgets/custom_loading_overlay.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';

3
lib/pages/exchange_view/exchange_step_views/step_1_view.dart
View file

@ -4,6 +4,7 @@ import 'package:stackwallet/pages/exchange_view/exchange_step_views/step_2_view.
import 'package:stackwallet/pages/exchange_view/sub_widgets/exchange_rate_sheet.dart'; import 'package:stackwallet/pages/exchange_view/sub_widgets/exchange_rate_sheet.dart';
import 'package:stackwallet/pages/exchange_view/sub_widgets/step_row.dart'; import 'package:stackwallet/pages/exchange_view/sub_widgets/step_row.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -40,7 +41,7 @@ class _Step1ViewState extends State<Step1View> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

3
lib/pages/exchange_view/exchange_step_views/step_2_view.dart
View file

@ -11,6 +11,7 @@ import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/address_utils.dart'; import 'package:stackwallet/utilities/address_utils.dart';
import 'package:stackwallet/utilities/barcode_scanner_interface.dart'; import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
@ -95,7 +96,7 @@ class _Step2ViewState extends ConsumerState<Step2View> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

3
lib/pages/exchange_view/exchange_step_views/step_3_view.dart
View file

@ -13,6 +13,7 @@ import 'package:stackwallet/providers/global/trades_service_provider.dart';
import 'package:stackwallet/services/notifications_api.dart'; import 'package:stackwallet/services/notifications_api.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -50,7 +51,7 @@ class _Step3ViewState extends ConsumerState<Step3View> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

25
lib/pages/exchange_view/exchange_step_views/step_4_view.dart
View file

@ -25,6 +25,7 @@ import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -114,7 +115,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
final bool isWalletCoin = final bool isWalletCoin =
_isWalletCoinAndHasWallet(model.trade!.fromCurrency, ref); _isWalletCoinAndHasWallet(model.trade!.fromCurrency, ref);
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -225,7 +226,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,
color: CFColors.link2, color: StackTheme
.instance.color.infoItemIcons,
width: 10, width: 10,
), ),
const SizedBox( const SizedBox(
@ -282,7 +284,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,
color: CFColors.link2, color: StackTheme
.instance.color.infoItemIcons,
width: 10, width: 10,
), ),
const SizedBox( const SizedBox(
@ -340,7 +343,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,
color: CFColors.link2, color: StackTheme
.instance.color.infoItemIcons,
width: 12, width: 12,
), ),
) )
@ -562,16 +566,9 @@ class _Step4ViewState extends ConsumerState<Step4View> {
title: "Transaction failed", title: "Transaction failed",
message: e.toString(), message: e.toString(),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(
.style context),
?.copyWith(
backgroundColor:
MaterialStateProperty
.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: STextStyles.button style: STextStyles.button

17
lib/pages/exchange_view/exchange_view.dart
View file

@ -33,6 +33,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_loading_overlay.dart'; import 'package:stackwallet/widgets/custom_loading_overlay.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -1136,7 +1137,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
.select((value) => .select((value) =>
value.canExchange))) value.canExchange)))
? CFColors.stackAccent ? CFColors.stackAccent
: CFColors.buttonGray, : StackTheme
.instance.color.buttonBackSecondary,
), ),
), ),
onPressed: ((ref onPressed: ((ref
@ -1303,16 +1305,9 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
message: message:
"${response.value!.warningMessage!}\n\nDo you want to attempt trade anyways?", "${response.value!.warningMessage!}\n\nDo you want to attempt trade anyways?",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(
.style context),
?.copyWith(
backgroundColor:
MaterialStateProperty.all<
Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,

10
lib/pages/exchange_view/send_from_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart'; import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/animated_text.dart'; import 'package:stackwallet/widgets/animated_text.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -58,7 +59,7 @@ class _SendFromViewState extends ConsumerState<SendFromView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -240,11 +241,8 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
title: "Transaction failed", title: "Transaction failed",
message: e.toString(), message: e.toString(),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getSecondaryEnabledButtonColor(context),
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(

9
lib/pages/exchange_view/sub_widgets/exchange_rate_sheet.dart
View file

@ -4,6 +4,7 @@ import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
enum ExchangeRateType { estimated, fixed } enum ExchangeRateType { estimated, fixed }
@ -35,7 +36,7 @@ class ExchangeRateSheet extends ConsumerWidget {
Center( Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
@ -76,7 +77,8 @@ class ExchangeRateSheet extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: ExchangeRateType.estimated, value: ExchangeRateType.estimated,
groupValue: ref.watch(prefsChangeNotifierProvider groupValue: ref.watch(prefsChangeNotifierProvider
.select((value) => value.exchangeRateType)), .select((value) => value.exchangeRateType)),
@ -146,7 +148,8 @@ class ExchangeRateSheet extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: ExchangeRateType.fixed, value: ExchangeRateType.fixed,
groupValue: ref.watch(prefsChangeNotifierProvider groupValue: ref.watch(prefsChangeNotifierProvider
.select((value) => value.exchangeRateType)), .select((value) => value.exchangeRateType)),

7
lib/pages/exchange_view/sub_widgets/step_indicator.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
enum StepIndicatorStatus { current, completed, incomplete } enum StepIndicatorStatus { current, completed, incomplete }
@ -38,13 +39,13 @@ class StepIndicator extends StatelessWidget {
style: GoogleFonts.roboto( style: GoogleFonts.roboto(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 8, fontSize: 8,
color: CFColors.link2, color: StackTheme.instance.color.stepIndicatorIconNumber,
), ),
); );
case StepIndicatorStatus.completed: case StepIndicatorStatus.completed:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.check, Assets.svg.check,
color: CFColors.link2, color: StackTheme.instance.color.stepIndicatorIconText,
width: 10, width: 10,
); );
case StepIndicatorStatus.incomplete: case StepIndicatorStatus.incomplete:
@ -53,7 +54,7 @@ class StepIndicator extends StatelessWidget {
style: GoogleFonts.roboto( style: GoogleFonts.roboto(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 8, fontSize: 8,
color: CFColors.white, color: StackTheme.instance.color.stepIndicatorIconInactive,
), ),
); );
} }

5
lib/pages/exchange_view/sub_widgets/step_row.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:stackwallet/pages/exchange_view/sub_widgets/step_indicator.dart'; import 'package:stackwallet/pages/exchange_view/sub_widgets/step_indicator.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class StepRow extends StatelessWidget { class StepRow extends StatelessWidget {
const StepRow({ const StepRow({
@ -24,9 +25,9 @@ class StepRow extends StatelessWidget {
} }
if (current <= index) { if (current <= index) {
return CFColors.stackAccent.withOpacity(0.2); return StackTheme.instance.color.stepIndicatorBGLinesInactive;
} else { } else {
return CFColors.link2; return StackTheme.instance.color.stepIndicatorBGLines;
} }
} }

25
lib/pages/exchange_view/trade_details_view.dart
View file

@ -23,6 +23,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -140,9 +141,9 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
Decimal.parse("-1"); Decimal.parse("-1");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -402,13 +403,9 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
// await _capturePng(true); // await _capturePng(true);
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
style: ButtonStyle( style: StackTheme.instance
backgroundColor: .getSecondaryEnabledButtonColor(
MaterialStateProperty.all< context),
Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: style:
@ -431,7 +428,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
Assets.svg.pencil, Assets.svg.pencil,
width: 10, width: 10,
height: 10, height: 10,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
), ),
const SizedBox( const SizedBox(
width: 4, width: 4,
@ -478,7 +475,8 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
Assets.svg.pencil, Assets.svg.pencil,
width: 10, width: 10,
height: 10, height: 10,
color: CFColors.link2, color:
StackTheme.instance.color.infoItemIcons,
), ),
const SizedBox( const SizedBox(
width: 4, width: 4,
@ -536,7 +534,8 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
Assets.svg.pencil, Assets.svg.pencil,
width: 10, width: 10,
height: 10, height: 10,
color: CFColors.link2, color:
StackTheme.instance.color.infoItemIcons,
), ),
const SizedBox( const SizedBox(
width: 4, width: 4,
@ -655,7 +654,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
width: 12, width: 12,
), ),
) )

19
lib/pages/exchange_view/wallet_initiated_exchange_view.dart
View file

@ -30,6 +30,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_loading_overlay.dart'; import 'package:stackwallet/widgets/custom_loading_overlay.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
@ -353,7 +354,7 @@ class _WalletInitiatedExchangeViewState
}); });
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -1233,7 +1234,8 @@ class _WalletInitiatedExchangeViewState
.select((value) => .select((value) =>
value.canExchange))) value.canExchange)))
? CFColors.stackAccent ? CFColors.stackAccent
: CFColors.buttonGray, : StackTheme.instance.color
.buttonBackSecondary,
), ),
), ),
onPressed: ((ref onPressed: ((ref
@ -1471,16 +1473,9 @@ class _WalletInitiatedExchangeViewState
message: message:
"${response.value!.warningMessage!}\n\nDo you want to attempt trade anyways?", "${response.value!.warningMessage!}\n\nDo you want to attempt trade anyways?",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(
.style context),
?.copyWith(
backgroundColor:
MaterialStateProperty.all<
Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,

12
lib/pages/home_view/home_view.dart
View file

@ -18,6 +18,7 @@ import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -44,7 +45,6 @@ class _HomeViewState extends ConsumerState<HomeView> {
final _cnLoadingService = ChangeNowLoadingService(); final _cnLoadingService = ChangeNowLoadingService();
Future<bool> _onWillPop() async { Future<bool> _onWillPop() async {
// go to home view when tapping back on the main exchange view // go to home view when tapping back on the main exchange view
if (ref.read(homeViewPageIndexStateProvider.state).state == 1) { if (ref.read(homeViewPageIndexStateProvider.state).state == 1) {
ref.read(homeViewPageIndexStateProvider.state).state = 0; ref.read(homeViewPageIndexStateProvider.state).state = 0;
@ -172,7 +172,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
key: const Key("walletsViewAlertsButton"), key: const Key("walletsViewAlertsButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
ref.watch(notificationsProvider ref.watch(notificationsProvider
.select((value) => value.hasUnreadNotifications)) .select((value) => value.hasUnreadNotifications))
@ -225,7 +225,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
key: const Key("walletsViewSettingsButton"), key: const Key("walletsViewSettingsButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.gear, Assets.svg.gear,
color: CFColors.stackAccent, color: CFColors.stackAccent,
@ -243,13 +243,13 @@ class _HomeViewState extends ConsumerState<HomeView> {
], ],
), ),
body: Container( body: Container(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
child: Column( child: Column(
children: [ children: [
if (Constants.enableExchange) if (Constants.enableExchange)
Container( Container(
decoration: const BoxDecoration( decoration: BoxDecoration(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
boxShadow: [ boxShadow: [
CFColors.standardBoxShadow, CFColors.standardBoxShadow,
], ],

39
lib/pages/home_view/sub_widgets/home_view_button_bar.dart
View file

@ -13,6 +13,7 @@ import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class HomeViewButtonBar extends ConsumerStatefulWidget { class HomeViewButtonBar extends ConsumerStatefulWidget {
@ -147,13 +148,18 @@ class _HomeViewButtonBarState extends ConsumerState<HomeViewButtonBar> {
children: [ children: [
Expanded( Expanded(
child: TextButton( child: TextButton(
style: ButtonStyle( style: selectedIndex == 0
minimumSize: MaterialStateProperty.all<Size>(const Size(46, 36)), ? StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getPrimaryEnabledButtonColor(context)!
selectedIndex == 0 .copyWith(
? CFColors.stackAccent minimumSize:
: CFColors.disabledButton, MaterialStateProperty.all<Size>(const Size(46, 36)),
), )
: StackTheme.instance
.getPrimaryDisabledButtonColor(context)!
.copyWith(
minimumSize:
MaterialStateProperty.all<Size>(const Size(46, 36)),
), ),
onPressed: () { onPressed: () {
FocusScope.of(context).unfocus(); FocusScope.of(context).unfocus();
@ -176,13 +182,18 @@ class _HomeViewButtonBarState extends ConsumerState<HomeViewButtonBar> {
), ),
Expanded( Expanded(
child: TextButton( child: TextButton(
style: ButtonStyle( style: selectedIndex == 0
minimumSize: MaterialStateProperty.all<Size>(const Size(46, 36)), ? StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getPrimaryEnabledButtonColor(context)!
selectedIndex == 1 .copyWith(
? CFColors.stackAccent minimumSize:
: CFColors.disabledButton, MaterialStateProperty.all<Size>(const Size(46, 36)),
), )
: StackTheme.instance
.getPrimaryDisabledButtonColor(context)!
.copyWith(
minimumSize:
MaterialStateProperty.all<Size>(const Size(46, 36)),
), ),
onPressed: () async { onPressed: () async {
FocusScope.of(context).unfocus(); FocusScope.of(context).unfocus();

5
lib/pages/intro_view.dart
View file

@ -6,6 +6,7 @@ import 'package:stackwallet/pages_desktop_specific/create_password/create_passwo
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/utilities/util.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
@ -29,7 +30,7 @@ class _IntroViewState extends State<IntroView> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType "); debugPrint("BUILD: $runtimeType ");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
body: Center( body: Center(
child: !isDesktop child: !isDesktop
? Column( ? Column(
@ -253,7 +254,7 @@ class GetStartedButton extends StatelessWidget {
width: 328, width: 328,
height: 70, height: 70,
child: TextButton( child: TextButton(
style: CFColors.getPrimaryEnabledButtonColor(context), style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(CreatePasswordView.routeName); Navigator.of(context).pushNamed(CreatePasswordView.routeName);
}, },

5
lib/pages/loading_view.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:lottie/lottie.dart'; import 'package:lottie/lottie.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class LoadingView extends StatelessWidget { class LoadingView extends StatelessWidget {
const LoadingView({Key? key}) : super(key: key); const LoadingView({Key? key}) : super(key: key);
@ -12,9 +13,9 @@ class LoadingView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final size = MediaQuery.of(context).size; final size = MediaQuery.of(context).size;
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
body: Container( body: Container(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
child: Center( child: Center(
child: SizedBox( child: SizedBox(
width: min(size.width, size.height) * 0.5, width: min(size.width, size.height) * 0.5,

3
lib/pages/manage_favorites_view/manage_favorites_view.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/services/coins/manager.dart'; import 'package:stackwallet/services/coins/manager.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -29,7 +30,7 @@ class ManageFavoritesView extends StatelessWidget {
), ),
), ),
body: Container( body: Container(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 12, left: 12,

3
lib/pages/notification_views/notifications_view.dart
View file

@ -4,6 +4,7 @@ import 'package:stackwallet/notifications/notification_card.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/providers/ui/unread_notifications_provider.dart'; import 'package:stackwallet/providers/ui/unread_notifications_provider.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -44,7 +45,7 @@ class _NotificationsViewState extends ConsumerState<NotificationsView> {
.toList(growable: false); .toList(growable: false);
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
title: Text( title: Text(
"Notifications", "Notifications",

19
lib/pages/pinpad_views/create_pin_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart'; import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart';
@ -81,7 +82,7 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -129,21 +130,21 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
controller: _pinPutController1, controller: _pinPutController1,
useNativeKeyboard: false, useNativeKeyboard: false,
obscureText: "", obscureText: "",
inputDecoration: const InputDecoration( inputDecoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
disabledBorder: InputBorder.none, disabledBorder: InputBorder.none,
errorBorder: InputBorder.none, errorBorder: InputBorder.none,
focusedErrorBorder: InputBorder.none, focusedErrorBorder: InputBorder.none,
fillColor: CFColors.almostWhite, fillColor: StackTheme.instance.color.background,
counterText: "", counterText: "",
), ),
submittedFieldDecoration: _pinPutDecoration.copyWith( submittedFieldDecoration: _pinPutDecoration.copyWith(
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
border: Border.all( border: Border.all(
width: 1, width: 1,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
), ),
), ),
selectedFieldDecoration: _pinPutDecoration, selectedFieldDecoration: _pinPutDecoration,
@ -189,21 +190,21 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
controller: _pinPutController2, controller: _pinPutController2,
useNativeKeyboard: false, useNativeKeyboard: false,
obscureText: "", obscureText: "",
inputDecoration: const InputDecoration( inputDecoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
disabledBorder: InputBorder.none, disabledBorder: InputBorder.none,
errorBorder: InputBorder.none, errorBorder: InputBorder.none,
focusedErrorBorder: InputBorder.none, focusedErrorBorder: InputBorder.none,
fillColor: CFColors.almostWhite, fillColor: StackTheme.instance.color.background,
counterText: "", counterText: "",
), ),
submittedFieldDecoration: _pinPutDecoration.copyWith( submittedFieldDecoration: _pinPutDecoration.copyWith(
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
border: Border.all( border: Border.all(
width: 1, width: 1,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
), ),
), ),
selectedFieldDecoration: _pinPutDecoration, selectedFieldDecoration: _pinPutDecoration,

11
lib/pages/pinpad_views/lock_screen_view.dart
View file

@ -17,6 +17,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart'; import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart';
import 'package:stackwallet/widgets/shake/shake.dart'; import 'package:stackwallet/widgets/shake/shake.dart';
@ -164,7 +165,7 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
late Biometrics biometrics; late Biometrics biometrics;
Scaffold get _body => Scaffold( Scaffold get _body => Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: widget.showBackButton leading: widget.showBackButton
? AppBarBackButton( ? AppBarBackButton(
@ -213,21 +214,21 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
controller: _pinTextController, controller: _pinTextController,
useNativeKeyboard: false, useNativeKeyboard: false,
obscureText: "", obscureText: "",
inputDecoration: const InputDecoration( inputDecoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
disabledBorder: InputBorder.none, disabledBorder: InputBorder.none,
errorBorder: InputBorder.none, errorBorder: InputBorder.none,
focusedErrorBorder: InputBorder.none, focusedErrorBorder: InputBorder.none,
fillColor: CFColors.almostWhite, fillColor: StackTheme.instance.color.background,
counterText: "", counterText: "",
), ),
submittedFieldDecoration: _pinPutDecoration.copyWith( submittedFieldDecoration: _pinPutDecoration.copyWith(
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
border: Border.all( border: Border.all(
width: 1, width: 1,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
), ),
), ),
selectedFieldDecoration: _pinPutDecoration, selectedFieldDecoration: _pinPutDecoration,

13
lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
View file

@ -19,6 +19,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -101,7 +102,7 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -338,13 +339,9 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
// TODO: add save button as well // TODO: add save button as well
await _capturePng(true); await _capturePng(true);
}, },
style: ButtonStyle( style: StackTheme.instance
backgroundColor: .getSecondaryEnabledButtonColor(
MaterialStateProperty.all< context),
Color>(
CFColors.buttonGray,
),
),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,

13
lib/pages/receive_view/receive_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
import 'package:stackwallet/widgets/custom_loading_overlay.dart'; import 'package:stackwallet/widgets/custom_loading_overlay.dart';
@ -110,7 +111,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
}); });
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -158,7 +159,8 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
Assets.svg.copy, Assets.svg.copy,
width: 10, width: 10,
height: 10, height: 10,
color: CFColors.link2, color:
StackTheme.instance.color.infoItemIcons,
), ),
const SizedBox( const SizedBox(
width: 4, width: 4,
@ -195,11 +197,8 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
if (coin != Coin.epicCash) if (coin != Coin.epicCash)
TextButton( TextButton(
onPressed: generateNewAddress, onPressed: generateNewAddress,
style: ButtonStyle( style: StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getSecondaryEnabledButtonColor(context),
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Generate new address", "Generate new address",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(

15
lib/pages/send_view/confirm_transaction_view.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/pages/pinpad_views/lock_screen_view.dart';
import 'package:stackwallet/pages/send_view/sub_widgets/sending_transaction_dialog.dart'; import 'package:stackwallet/pages/send_view/sub_widgets/sending_transaction_dialog.dart';
import 'package:stackwallet/pages/wallet_view/wallet_view.dart'; import 'package:stackwallet/pages/wallet_view/wallet_view.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/providers/wallet/public_private_balance_state_provider.dart';
import 'package:stackwallet/route_generator.dart'; import 'package:stackwallet/route_generator.dart';
import 'package:stackwallet/services/coins/epiccash/epiccash_wallet.dart'; import 'package:stackwallet/services/coins/epiccash/epiccash_wallet.dart';
import 'package:stackwallet/services/coins/firo/firo_wallet.dart'; import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
@ -15,13 +16,12 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
import '../../providers/wallet/public_private_balance_state_provider.dart';
class ConfirmTransactionView extends ConsumerStatefulWidget { class ConfirmTransactionView extends ConsumerStatefulWidget {
const ConfirmTransactionView({ const ConfirmTransactionView({
Key? key, Key? key,
@ -112,11 +112,8 @@ class _ConfirmTransactionViewState
title: "Broadcast transaction failed", title: "Broadcast transaction failed",
message: e.toString(), message: e.toString(),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style:
backgroundColor: MaterialStateProperty.all<Color>( StackTheme.instance.getSecondaryEnabledButtonColor(context),
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -147,7 +144,7 @@ class _ConfirmTransactionViewState
.select((value) => value.getManagerProvider(walletId))); .select((value) => value.getManagerProvider(walletId)));
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
// if (FocusScope.of(context).hasFocus) { // if (FocusScope.of(context).hasFocus) {
@ -288,7 +285,7 @@ class _ConfirmTransactionViewState
height: 12, height: 12,
), ),
RoundedContainer( RoundedContainer(
color: CFColors.stackGreen15, color: StackTheme.instance.color.snackBarBackSuccess,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [

45
lib/pages/send_view/send_view.dart
View file

@ -28,6 +28,7 @@ import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/animated_text.dart'; import 'package:stackwallet/widgets/animated_text.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
@ -360,7 +361,7 @@ class _SendViewState extends ConsumerState<SendView> {
} }
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -840,7 +841,8 @@ class _SendViewState extends ConsumerState<SendView> {
error, error,
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: STextStyles.label.copyWith( style: STextStyles.label.copyWith(
color: CFColors.notificationRedForeground, color:
StackTheme.instance.color.textError,
), ),
), ),
), ),
@ -1406,16 +1408,9 @@ class _SendViewState extends ConsumerState<SendView> {
message: message:
"Sending to self is currently disabled", "Sending to self is currently disabled",
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(
.style context),
?.copyWith(
backgroundColor:
MaterialStateProperty.all<
Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: style:
@ -1475,16 +1470,9 @@ class _SendViewState extends ConsumerState<SendView> {
message: message:
"You are about to send your entire balance. Would you like to continue?", "You are about to send your entire balance. Would you like to continue?",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(
.style context),
?.copyWith(
backgroundColor:
MaterialStateProperty.all<
Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: style:
@ -1611,16 +1599,9 @@ class _SendViewState extends ConsumerState<SendView> {
title: "Transaction failed", title: "Transaction failed",
message: e.toString(), message: e.toString(),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(
.style context),
?.copyWith(
backgroundColor:
MaterialStateProperty
.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Ok", "Ok",
style: style:

7
lib/pages/send_view/sub_widgets/building_transaction_dialog.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class BuildingTransactionDialog extends StatefulWidget { class BuildingTransactionDialog extends StatefulWidget {
@ -68,11 +69,7 @@ class _RestoringDialogState extends State<BuildingTransactionDialog>
), ),
), ),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,

9
lib/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart
View file

@ -8,6 +8,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/animated_text.dart'; import 'package:stackwallet/widgets/animated_text.dart';
class FiroBalanceSelectionSheet extends ConsumerStatefulWidget { class FiroBalanceSelectionSheet extends ConsumerStatefulWidget {
@ -69,7 +70,7 @@ class _FiroBalanceSelectionSheetState
Center( Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
@ -114,7 +115,8 @@ class _FiroBalanceSelectionSheetState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: "Private", value: "Private",
groupValue: ref groupValue: ref
.watch( .watch(
@ -205,7 +207,8 @@ class _FiroBalanceSelectionSheetState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: "Public", value: "Public",
groupValue: ref groupValue: ref
.watch( .watch(

1
lib/pages/send_view/sub_widgets/sending_transaction_dialog.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class SendingTransactionDialog extends StatefulWidget { class SendingTransactionDialog extends StatefulWidget {

12
lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
View file

@ -12,6 +12,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart'; import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/animated_text.dart'; import 'package:stackwallet/widgets/animated_text.dart';
final feeSheetSessionCacheProvider = final feeSheetSessionCacheProvider =
@ -182,7 +183,7 @@ class _TransactionFeeSelectionSheetState
Center( Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
@ -235,7 +236,8 @@ class _TransactionFeeSelectionSheetState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: FeeRateType.fast, value: FeeRateType.fast,
groupValue: ref groupValue: ref
.watch(feeRateTypeStateProvider.state) .watch(feeRateTypeStateProvider.state)
@ -360,7 +362,8 @@ class _TransactionFeeSelectionSheetState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: FeeRateType.average, value: FeeRateType.average,
groupValue: ref groupValue: ref
.watch(feeRateTypeStateProvider.state) .watch(feeRateTypeStateProvider.state)
@ -484,7 +487,8 @@ class _TransactionFeeSelectionSheetState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: FeeRateType.slow, value: FeeRateType.slow,
groupValue: ref groupValue: ref
.watch(feeRateTypeStateProvider.state) .watch(feeRateTypeStateProvider.state)

51
lib/pages/settings_views/global_settings_view/about_view.dart
View file

@ -1,21 +1,20 @@
import 'dart:convert'; import 'dart:convert';
import 'package:http/http.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS;
import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS;
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:http/http.dart';
import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS;
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS;
import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS;
import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS;
import 'package:stackwallet/utilities/logger.dart';
const kGithubAPI = "https://api.github.com"; const kGithubAPI = "https://api.github.com";
const kGithubSearch = "/search/commits"; const kGithubSearch = "/search/commits";
@ -119,7 +118,7 @@ class AboutView extends ConsumerWidget {
Future commitMoneroFuture = Future.wait(futureMoneroList); Future commitMoneroFuture = Future.wait(futureMoneroList);
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -269,15 +268,21 @@ class AboutView extends ConsumerWidget {
switch (stateOfCommit) { switch (stateOfCommit) {
case CommitStatus.isHead: case CommitStatus.isHead:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackGreen); .copyWith(
color: StackTheme
.instance.color.accentColorGreen);
break; break;
case CommitStatus.isOldCommit: case CommitStatus.isOldCommit:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackYellow); .copyWith(
color: StackTheme
.instance.color.accentColorYellow);
break; break;
case CommitStatus.notACommit: case CommitStatus.notACommit:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackRed); .copyWith(
color: StackTheme
.instance.color.accentColorRed);
break; break;
default: default:
break; break;
@ -329,15 +334,21 @@ class AboutView extends ConsumerWidget {
switch (stateOfCommit) { switch (stateOfCommit) {
case CommitStatus.isHead: case CommitStatus.isHead:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackGreen); .copyWith(
color: StackTheme
.instance.color.accentColorGreen);
break; break;
case CommitStatus.isOldCommit: case CommitStatus.isOldCommit:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackYellow); .copyWith(
color: StackTheme
.instance.color.accentColorYellow);
break; break;
case CommitStatus.notACommit: case CommitStatus.notACommit:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackRed); .copyWith(
color: StackTheme
.instance.color.accentColorRed);
break; break;
default: default:
break; break;
@ -389,15 +400,21 @@ class AboutView extends ConsumerWidget {
switch (stateOfCommit) { switch (stateOfCommit) {
case CommitStatus.isHead: case CommitStatus.isHead:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackGreen); .copyWith(
color: StackTheme
.instance.color.accentColorGreen);
break; break;
case CommitStatus.isOldCommit: case CommitStatus.isOldCommit:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackYellow); .copyWith(
color: StackTheme
.instance.color.accentColorYellow);
break; break;
case CommitStatus.notACommit: case CommitStatus.notACommit:
indicationStyle = STextStyles.itemSubtitle indicationStyle = STextStyles.itemSubtitle
.copyWith(color: CFColors.stackRed); .copyWith(
color: StackTheme
.instance.color.accentColorRed);
break; break;
default: default:
break; break;

3
lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/settings_views/global_settings_view/advanced_views/debug_view.dart'; import 'package:stackwallet/pages/settings_views/global_settings_view/advanced_views/debug_view.dart';
import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -21,7 +22,7 @@ class AdvancedSettingsView extends StatelessWidget {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

26
lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
import 'package:stackwallet/widgets/custom_loading_overlay.dart'; import 'package:stackwallet/widgets/custom_loading_overlay.dart';
@ -89,7 +90,7 @@ class _DebugViewState extends ConsumerState<DebugView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -113,7 +114,7 @@ class _DebugViewState extends ConsumerState<DebugView> {
key: const Key("deleteLogsAppBarButtonKey"), key: const Key("deleteLogsAppBarButtonKey"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.trash, Assets.svg.trash,
color: CFColors.stackAccent, color: CFColors.stackAccent,
@ -128,14 +129,8 @@ class _DebugViewState extends ConsumerState<DebugView> {
message: message:
"You are about to delete all logs permanently. Are you sure?", "You are about to delete all logs permanently. Are you sure?",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context) style: StackTheme.instance
.textButtonTheme .getSecondaryEnabledButtonColor(context),
.style
?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Cancel", "Cancel",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,
@ -401,14 +396,19 @@ class _DebugViewState extends ConsumerState<DebugView> {
style: STextStyles.baseXS.copyWith( style: STextStyles.baseXS.copyWith(
fontSize: 8, fontSize: 8,
color: (log.logLevel == LogLevel.Info color: (log.logLevel == LogLevel.Info
? CFColors.stackGreen ? StackTheme.instance.color
.accentColorGreen
: (log.logLevel == : (log.logLevel ==
LogLevel.Warning LogLevel.Warning
? CFColors.stackYellow ? StackTheme.instance.color
.accentColorYellow
: (log.logLevel == : (log.logLevel ==
LogLevel.Error LogLevel.Error
? Colors.orange ? Colors.orange
: CFColors.stackRed))), : StackTheme
.instance
.color
.accentColorRed))),
), ),
), ),
Text( Text(

3
lib/pages/settings_views/global_settings_view/appearance_settings_view.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -16,7 +17,7 @@ class AppearanceSettingsView extends ConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

6
lib/pages/settings_views/global_settings_view/currency_view.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
@ -101,7 +102,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
} }
currenciesWithoutSelected = _filtered(); currenciesWithoutSelected = _filtered();
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -234,7 +235,8 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance.color
.radioButtonIconEnabled,
materialTapTargetSize: materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap, MaterialTapTargetSize.shrinkWrap,
value: true, value: true,

3
lib/pages/settings_views/global_settings_view/global_settings_view.dart
View file

@ -16,6 +16,7 @@ import 'package:stackwallet/pages/settings_views/sub_widgets/settings_list_butto
import 'package:stackwallet/route_generator.dart'; import 'package:stackwallet/route_generator.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -31,7 +32,7 @@ class GlobalSettingsView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

3
lib/pages/settings_views/global_settings_view/hidden_settings.dart
View file

@ -6,6 +6,7 @@ import 'package:stackwallet/notifications/show_flush_bar.dart';
import 'package:stackwallet/providers/global/debug_service_provider.dart'; import 'package:stackwallet/providers/global/debug_service_provider.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -18,7 +19,7 @@ class HiddenSettings extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: Container(), leading: Container(),
title: Text( title: Text(

6
lib/pages/settings_views/global_settings_view/language_view.dart
View file

@ -7,6 +7,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/languages_enum.dart'; import 'package:stackwallet/utilities/enums/languages_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
@ -99,7 +100,7 @@ class _LanguageViewState extends ConsumerState<LanguageSettingsView> {
} }
listWithoutSelected = _filtered(); listWithoutSelected = _filtered();
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -232,7 +233,8 @@ class _LanguageViewState extends ConsumerState<LanguageSettingsView> {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance.color
.radioButtonIconEnabled,
value: true, value: true,
groupValue: index == 0, groupValue: index == 0,
onChanged: (_) { onChanged: (_) {

28
lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
View file

@ -20,6 +20,7 @@ import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/test_epic_box_connection.dart'; import 'package:stackwallet/utilities/test_epic_box_connection.dart';
import 'package:stackwallet/utilities/test_monero_node_connection.dart'; import 'package:stackwallet/utilities/test_monero_node_connection.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -189,7 +190,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
: null; : null;
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -220,7 +221,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
key: const Key("deleteNodeAppBarButtonKey"), key: const Key("deleteNodeAppBarButtonKey"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.trash, Assets.svg.trash,
color: CFColors.stackAccent, color: CFColors.stackAccent,
@ -290,11 +291,8 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
await _testConnection(); await _testConnection();
} }
: null, : null,
style: ButtonStyle( style: StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getSecondaryEnabledButtonColor(context),
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Test connection", "Test connection",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -306,15 +304,11 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextButton( TextButton(
style: style: saveEnabled
Theme.of(context).textButtonTheme.style?.copyWith( ? StackTheme.instance
backgroundColor: .getPrimaryEnabledButtonColor(context)
MaterialStateProperty.all<Color>( : StackTheme.instance
saveEnabled .getPrimaryDisabledButtonColor(context),
? CFColors.stackAccent
: CFColors.disabledButton,
),
),
onPressed: saveEnabled onPressed: saveEnabled
? () async { ? () async {
final canConnect = await _testConnection( final canConnect = await _testConnection(
@ -892,7 +886,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
child: Checkbox( child: Checkbox(
fillColor: widget.readOnly fillColor: widget.readOnly
? MaterialStateProperty.all( ? MaterialStateProperty.all(
CFColors.disabledButton) StackTheme.instance.color.checkboxBGDisabled)
: null, : null,
materialTapTargetSize: materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap, MaterialTapTargetSize.shrinkWrap,

5
lib/pages/settings_views/global_settings_view/manage_nodes_views/coin_nodes_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/manage_nod
import 'package:stackwallet/pages/settings_views/sub_widgets/nodes_list.dart'; import 'package:stackwallet/pages/settings_views/sub_widgets/nodes_list.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -38,7 +39,7 @@ class _CoinNodesViewState extends ConsumerState<CoinNodesView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -62,7 +63,7 @@ class _CoinNodesViewState extends ConsumerState<CoinNodesView> {
key: const Key("manageNodesAddNewNodeButtonKey"), key: const Key("manageNodesAddNewNodeButtonKey"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.plus, Assets.svg.plus,
color: CFColors.stackAccent, color: CFColors.stackAccent,

3
lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/manage_nod
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -48,7 +49,7 @@ class _ManageNodesViewState extends ConsumerState<ManageNodesView> {
: _coins.sublist(0, Coin.values.length - kTestNetCoinCount); : _coins.sublist(0, Coin.values.length - kTestNetCoinCount);
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

12
lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
View file

@ -18,6 +18,7 @@ import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/test_epic_box_connection.dart'; import 'package:stackwallet/utilities/test_epic_box_connection.dart';
import 'package:stackwallet/utilities/test_monero_node_connection.dart'; import 'package:stackwallet/utilities/test_monero_node_connection.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
@ -138,7 +139,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -169,7 +170,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
key: const Key("nodeDetailsEditNodeAppBarButtonKey"), key: const Key("nodeDetailsEditNodeAppBarButtonKey"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.pencil, Assets.svg.pencil,
color: CFColors.stackAccent, color: CFColors.stackAccent,
@ -221,11 +222,8 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
), ),
const Spacer(), const Spacer(),
TextButton( TextButton(
style: ButtonStyle( style: StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getSecondaryEnabledButtonColor(context),
CFColors.buttonGray,
),
),
onPressed: () async { onPressed: () async {
await _testConnection(ref, context); await _testConnection(ref, context);
}, },

19
lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
View file

@ -9,6 +9,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart'; import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart';
@ -69,7 +70,7 @@ class _ChangePinViewState extends State<ChangePinView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -112,21 +113,21 @@ class _ChangePinViewState extends State<ChangePinView> {
controller: _pinPutController1, controller: _pinPutController1,
useNativeKeyboard: false, useNativeKeyboard: false,
obscureText: "", obscureText: "",
inputDecoration: const InputDecoration( inputDecoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
disabledBorder: InputBorder.none, disabledBorder: InputBorder.none,
errorBorder: InputBorder.none, errorBorder: InputBorder.none,
focusedErrorBorder: InputBorder.none, focusedErrorBorder: InputBorder.none,
fillColor: CFColors.almostWhite, fillColor: StackTheme.instance.color.background,
counterText: "", counterText: "",
), ),
submittedFieldDecoration: _pinPutDecoration.copyWith( submittedFieldDecoration: _pinPutDecoration.copyWith(
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
border: Border.all( border: Border.all(
width: 1, width: 1,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
), ),
), ),
selectedFieldDecoration: _pinPutDecoration, selectedFieldDecoration: _pinPutDecoration,
@ -168,21 +169,21 @@ class _ChangePinViewState extends State<ChangePinView> {
controller: _pinPutController2, controller: _pinPutController2,
useNativeKeyboard: false, useNativeKeyboard: false,
obscureText: "", obscureText: "",
inputDecoration: const InputDecoration( inputDecoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
disabledBorder: InputBorder.none, disabledBorder: InputBorder.none,
errorBorder: InputBorder.none, errorBorder: InputBorder.none,
focusedErrorBorder: InputBorder.none, focusedErrorBorder: InputBorder.none,
fillColor: CFColors.almostWhite, fillColor: StackTheme.instance.color.background,
counterText: "", counterText: "",
), ),
submittedFieldDecoration: _pinPutDecoration.copyWith( submittedFieldDecoration: _pinPutDecoration.copyWith(
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
border: Border.all( border: Border.all(
width: 1, width: 1,
color: CFColors.link2, color: StackTheme.instance.color.infoItemIcons,
), ),
), ),
selectedFieldDecoration: _pinPutDecoration, selectedFieldDecoration: _pinPutDecoration,

3
lib/pages/settings_views/global_settings_view/security_views/security_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/security_v
import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart';
import 'package:stackwallet/route_generator.dart'; import 'package:stackwallet/route_generator.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -23,7 +24,7 @@ class SecurityView extends StatelessWidget {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

15
lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart
View file

@ -11,6 +11,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/backup_frequency_type.dart'; import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
import 'package:stackwallet/widgets/custom_buttons/draggable_switch_button.dart'; import 'package:stackwallet/widgets/custom_buttons/draggable_switch_button.dart';
@ -81,11 +82,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
title: "Enable Auto Backup", title: "Enable Auto Backup",
message: "To enable Auto Backup, you need to create a backup file.", message: "To enable Auto Backup, you need to create a backup file.",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Back", "Back",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -141,11 +138,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
message: message:
"You are turning off Auto Backup. You can turn it back on at any time. Your previous Auto Backup file will not be deleted. Remember to backup your wallets manually so you don't lose important information.", "You are turning off Auto Backup. You can turn it back on at any time. Your previous Auto Backup file will not be deleted. Remember to backup your wallets manually so you don't lose important information.",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Back", "Back",
style: STextStyles.button.copyWith( style: STextStyles.button.copyWith(
@ -230,7 +223,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
}); });
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

24
lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart
View file

@ -21,6 +21,7 @@ import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/progress_bar.dart'; import 'package:stackwallet/widgets/progress_bar.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -102,7 +103,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -302,11 +303,12 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
width: MediaQuery.of(context).size.width - 32 - 24, width: MediaQuery.of(context).size.width - 32 - 24,
height: 5, height: 5,
fillColor: passwordStrength < 0.51 fillColor: passwordStrength < 0.51
? CFColors.stackRed ? StackTheme.instance.color.accentColorRed
: passwordStrength < 1 : passwordStrength < 1
? CFColors.stackYellow ? StackTheme.instance.color.accentColorYellow
: CFColors.stackGreen, : StackTheme.instance.color.accentColorGreen,
backgroundColor: CFColors.buttonGray, backgroundColor:
StackTheme.instance.color.buttonBackSecondary,
percent: percent:
passwordStrength < 0.25 ? 0.03 : passwordStrength, passwordStrength < 0.25 ? 0.03 : passwordStrength,
), ),
@ -438,13 +440,11 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
height: 10, height: 10,
), ),
TextButton( TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: shouldEnableCreate
backgroundColor: MaterialStateProperty.all<Color>( ? StackTheme.instance
shouldEnableCreate .getPrimaryEnabledButtonColor(context)
? CFColors.stackAccent : StackTheme.instance
: CFColors.disabledButton, .getPrimaryDisabledButtonColor(context),
),
),
onPressed: !shouldEnableCreate onPressed: !shouldEnableCreate
? null ? null
: () async { : () async {

3
lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_information_view.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart'; import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -13,7 +14,7 @@ class CreateBackupInfoView extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

29
lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart
View file

@ -14,6 +14,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/progress_bar.dart'; import 'package:stackwallet/widgets/progress_bar.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -82,7 +83,7 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -306,11 +307,14 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
width: MediaQuery.of(context).size.width - 32 - 24, width: MediaQuery.of(context).size.width - 32 - 24,
height: 5, height: 5,
fillColor: passwordStrength < 0.51 fillColor: passwordStrength < 0.51
? CFColors.stackRed ? StackTheme.instance.color.accentColorRed
: passwordStrength < 1 : passwordStrength < 1
? CFColors.stackYellow ? StackTheme
: CFColors.stackGreen, .instance.color.accentColorYellow
backgroundColor: CFColors.buttonGray, : StackTheme
.instance.color.accentColorGreen,
backgroundColor:
StackTheme.instance.color.buttonBackSecondary,
percent: passwordStrength < 0.25 percent: passwordStrength < 0.25
? 0.03 ? 0.03
: passwordStrength, : passwordStrength,
@ -376,16 +380,11 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
), ),
const Spacer(), const Spacer(),
TextButton( TextButton(
style: Theme.of(context) style: shouldEnableCreate
.textButtonTheme ? StackTheme.instance
.style .getPrimaryEnabledButtonColor(context)
?.copyWith( : StackTheme.instance
backgroundColor: MaterialStateProperty.all<Color>( .getPrimaryDisabledButtonColor(context),
shouldEnableCreate
? CFColors.stackAccent
: CFColors.disabledButton,
),
),
onPressed: !shouldEnableCreate onPressed: !shouldEnableCreate
? null ? null
: () async { : () async {

13
lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
class CancelStackRestoreDialog extends StatelessWidget { class CancelStackRestoreDialog extends StatelessWidget {
@ -19,11 +20,7 @@ class CancelStackRestoreDialog extends StatelessWidget {
message: message:
"Cancelling will revert any changes that may have been applied", "Cancelling will revert any changes that may have been applied",
leftButton: TextButton( leftButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.buttonGray,
),
),
child: Text( child: Text(
"Back", "Back",
style: STextStyles.itemSubtitle12, style: STextStyles.itemSubtitle12,
@ -33,11 +30,7 @@ class CancelStackRestoreDialog extends StatelessWidget {
}, },
), ),
rightButton: TextButton( rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
backgroundColor: MaterialStateProperty.all<Color>(
CFColors.stackAccent,
),
),
child: Text( child: Text(
"Yes, cancel", "Yes, cancel",
style: STextStyles.itemSubtitle12.copyWith( style: STextStyles.itemSubtitle12.copyWith(

24
lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart
View file

@ -21,6 +21,7 @@ import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/progress_bar.dart'; import 'package:stackwallet/widgets/progress_bar.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -104,7 +105,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -304,11 +305,12 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
width: MediaQuery.of(context).size.width - 32 - 24, width: MediaQuery.of(context).size.width - 32 - 24,
height: 5, height: 5,
fillColor: passwordStrength < 0.51 fillColor: passwordStrength < 0.51
? CFColors.stackRed ? StackTheme.instance.color.accentColorRed
: passwordStrength < 1 : passwordStrength < 1
? CFColors.stackYellow ? StackTheme.instance.color.accentColorYellow
: CFColors.stackGreen, : StackTheme.instance.color.accentColorGreen,
backgroundColor: CFColors.buttonGray, backgroundColor:
StackTheme.instance.color.buttonBackSecondary,
percent: percent:
passwordStrength < 0.25 ? 0.03 : passwordStrength, passwordStrength < 0.25 ? 0.03 : passwordStrength,
), ),
@ -440,13 +442,11 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
height: 10, height: 10,
), ),
TextButton( TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith( style: shouldEnableCreate
backgroundColor: MaterialStateProperty.all<Color>( ? StackTheme.instance
shouldEnableCreate .getPrimaryEnabledButtonColor(context)
? CFColors.stackAccent : StackTheme.instance
: CFColors.disabledButton, .getPrimaryDisabledButtonColor(context),
),
),
onPressed: !shouldEnableCreate onPressed: !shouldEnableCreate
? null ? null
: () async { : () async {

17
lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart
View file

@ -12,6 +12,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/stack_text_field.dart';
@ -63,7 +64,7 @@ class _RestoreFromEncryptedStringViewState
return WillPopScope( return WillPopScope(
onWillPop: _onWillPop, onWillPop: _onWillPop,
child: Scaffold( child: Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -150,15 +151,11 @@ class _RestoreFromEncryptedStringViewState
), ),
const Spacer(), const Spacer(),
TextButton( TextButton(
style: style: passwordController.text.isEmpty
Theme.of(context).textButtonTheme.style?.copyWith( ? StackTheme.instance
backgroundColor: .getPrimaryEnabledButtonColor(context)
MaterialStateProperty.all<Color>( : StackTheme.instance
passwordController.text.isEmpty .getPrimaryDisabledButtonColor(context),
? CFColors.disabledButton
: CFColors.stackAccent,
),
),
onPressed: passwordController.text.isEmpty onPressed: passwordController.text.isEmpty
? null ? null
: () async { : () async {

18
lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/stack_text_field.dart';
@ -64,7 +65,7 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -218,17 +219,12 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
), ),
const Spacer(), const Spacer(),
TextButton( TextButton(
style: Theme.of(context) style: passwordController.text.isEmpty ||
.textButtonTheme
.style
?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
passwordController.text.isEmpty ||
fileLocationController.text.isEmpty fileLocationController.text.isEmpty
? CFColors.disabledButton ? StackTheme.instance
: CFColors.stackAccent, .getPrimaryEnabledButtonColor(context)
), : StackTheme.instance
), .getPrimaryDisabledButtonColor(context),
onPressed: passwordController.text.isEmpty || onPressed: passwordController.text.isEmpty ||
fileLocationController.text.isEmpty fileLocationController.text.isEmpty
? null ? null

3
lib/pages/settings_views/global_settings_view/stack_backup_views/stack_backup_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart'; import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -22,7 +23,7 @@ class StackBackupView extends StatelessWidget {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

6
lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/backup_frequency_type_select_sheet.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/backup_frequency_type.dart'; import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class BackupFrequencyTypeSelectSheet extends ConsumerWidget { class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
const BackupFrequencyTypeSelectSheet({ const BackupFrequencyTypeSelectSheet({
@ -51,7 +52,7 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
Center( Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.fieldGray, color: StackTheme.instance.color.textFieldDefaultBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
@ -100,7 +101,8 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme
.instance.color.radioButtonIconEnabled,
value: BackupFrequencyType.values[i], value: BackupFrequencyType.values[i],
groupValue: ref.watch( groupValue: ref.watch(
prefsChangeNotifierProvider.select( prefsChangeNotifierProvider.select(

5
lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/recovery_phrase_view.dart
View file

@ -5,6 +5,7 @@ import 'package:stackwallet/notifications/show_flush_bar.dart';
import 'package:stackwallet/pages/add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table.dart'; import 'package:stackwallet/pages/add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -28,7 +29,7 @@ class RecoverPhraseView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -41,7 +42,7 @@ class RecoverPhraseView extends StatelessWidget {
child: AspectRatio( child: AspectRatio(
aspectRatio: 1, aspectRatio: 1,
child: AppBarIconButton( child: AppBarIconButton(
color: CFColors.almostWhite, color: StackTheme.instance.color.background,
shadows: const [], shadows: const [],
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.copy, Assets.svg.copy,

29
lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart
View file

@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/enums/stack_restoring_status.dart'; import 'package:stackwallet/utilities/enums/stack_restoring_status.dart';
import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/addressbook_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/addressbook_icon.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
@ -138,22 +139,22 @@ class _StackRestoreProgressViewState
case StackRestoringStatus.waiting: case StackRestoringStatus.waiting:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.loader, Assets.svg.loader,
color: CFColors.buttonGray, color: StackTheme.instance.color.buttonBackSecondary,
); );
case StackRestoringStatus.restoring: case StackRestoringStatus.restoring:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.loader, Assets.svg.loader,
color: CFColors.stackGreen, color: StackTheme.instance.color.accentColorGreen,
); );
case StackRestoringStatus.success: case StackRestoringStatus.success:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.checkCircle, Assets.svg.checkCircle,
color: CFColors.stackGreen, color: StackTheme.instance.color.accentColorGreen,
); );
case StackRestoringStatus.failed: case StackRestoringStatus.failed:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.circleAlert, Assets.svg.circleAlert,
color: CFColors.error, color: StackTheme.instance.color.textError,
); );
} }
} }
@ -178,7 +179,7 @@ class _StackRestoreProgressViewState
return WillPopScope( return WillPopScope(
onWillPop: _onWillPop, onWillPop: _onWillPop,
child: Scaffold( child: Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -237,7 +238,8 @@ class _StackRestoreProgressViewState
height: 32, height: 32,
child: RoundedContainer( child: RoundedContainer(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
color: CFColors.buttonGray, color:
StackTheme.instance.color.buttonBackSecondary,
child: Center( child: Center(
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.gear, Assets.svg.gear,
@ -271,13 +273,14 @@ class _StackRestoreProgressViewState
final state = ref.watch(stackRestoringUIStateProvider final state = ref.watch(stackRestoringUIStateProvider
.select((value) => value.addressBook)); .select((value) => value.addressBook));
return RestoringItemCard( return RestoringItemCard(
left: const SizedBox( left: SizedBox(
width: 32, width: 32,
height: 32, height: 32,
child: RoundedContainer( child: RoundedContainer(
padding: EdgeInsets.all(0), padding: const EdgeInsets.all(0),
color: CFColors.buttonGray, color:
child: Center( StackTheme.instance.color.buttonBackSecondary,
child: const Center(
child: AddressBookIcon( child: AddressBookIcon(
width: 16, width: 16,
height: 16, height: 16,
@ -314,7 +317,8 @@ class _StackRestoreProgressViewState
height: 32, height: 32,
child: RoundedContainer( child: RoundedContainer(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
color: CFColors.buttonGray, color:
StackTheme.instance.color.buttonBackSecondary,
child: Center( child: Center(
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.node, Assets.svg.node,
@ -353,7 +357,8 @@ class _StackRestoreProgressViewState
height: 32, height: 32,
child: RoundedContainer( child: RoundedContainer(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
color: CFColors.buttonGray, color:
StackTheme.instance.color.buttonBackSecondary,
child: Center( child: Center(
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.arrowRotate2, Assets.svg.arrowRotate2,

11
lib/pages/settings_views/global_settings_view/stack_backup_views/sub_widgets/restoring_wallet_card.dart
View file

@ -11,6 +11,7 @@ import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/stack_restoring_status.dart'; import 'package:stackwallet/utilities/enums/stack_restoring_status.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
@ -35,23 +36,23 @@ class _RestoringWalletCardState extends ConsumerState<RestoringWalletCard> {
case StackRestoringStatus.waiting: case StackRestoringStatus.waiting:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.loader, Assets.svg.loader,
color: CFColors.buttonGray, color:StackTheme.instance.color.buttonBackSecondary,
); );
case StackRestoringStatus.restoring: case StackRestoringStatus.restoring:
return const LoadingIndicator(); return const LoadingIndicator();
// return SvgPicture.asset( // return SvgPicture.asset(
// Assets.svg.loader, // Assets.svg.loader,
// color: CFColors.stackGreen, // color: StackTheme.instance.color.accentColorGreen,
// ); // );
case StackRestoringStatus.success: case StackRestoringStatus.success:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.checkCircle, Assets.svg.checkCircle,
color: CFColors.stackGreen, color: StackTheme.instance.color.accentColorGreen,
); );
case StackRestoringStatus.failed: case StackRestoringStatus.failed:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.circleAlert, Assets.svg.circleAlert,
color: CFColors.error, color: StackTheme.instance.color.textError,
); );
} }
} }
@ -155,7 +156,7 @@ class _RestoringWalletCardState extends ConsumerState<RestoringWalletCard> {
? Container( ? Container(
height: 20, height: 20,
decoration: BoxDecoration( decoration: BoxDecoration(
color: CFColors.buttonGray, color: StackTheme.instance.color.buttonBackSecondary,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
1000, 1000,
), ),

10
lib/pages/settings_views/global_settings_view/startup_preferences/startup_preferences_view.dart
View file

@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/settings_views/global_settings_view/startup_preferences/startup_wallet_selection_view.dart'; import 'package:stackwallet/pages/settings_views/global_settings_view/startup_preferences/startup_wallet_selection_view.dart';
import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -23,7 +23,7 @@ class _StartupPreferencesViewState
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -81,7 +81,8 @@ class _StartupPreferencesViewState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance
.color.radioButtonIconEnabled,
value: false, value: false,
groupValue: ref.watch( groupValue: ref.watch(
prefsChangeNotifierProvider prefsChangeNotifierProvider
@ -153,7 +154,8 @@ class _StartupPreferencesViewState
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance
.color.radioButtonIconEnabled,
value: true, value: true,
groupValue: ref.watch( groupValue: ref.watch(
prefsChangeNotifierProvider prefsChangeNotifierProvider

6
lib/pages/settings_views/global_settings_view/startup_preferences/startup_wallet_selection_view.dart
View file

@ -6,6 +6,7 @@ import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/custom_buttons/draggable_switch_button.dart'; import 'package:stackwallet/widgets/custom_buttons/draggable_switch_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -34,7 +35,7 @@ class _StartupWalletSelectionViewState
} }
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -161,7 +162,8 @@ class _StartupWalletSelectionViewState
height: 20, height: 20,
width: 20, width: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance.color
.radioButtonIconEnabled,
value: manager.walletId, value: manager.walletId,
groupValue: ref.watch( groupValue: ref.watch(
prefsChangeNotifierProvider.select( prefsChangeNotifierProvider.select(

3
lib/pages/settings_views/global_settings_view/support_view.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -21,7 +22,7 @@ class SupportView extends StatelessWidget {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {

13
lib/pages/settings_views/global_settings_view/syncing_preferences_views/syncing_options_view.dart
View file

@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart'; import 'package:stackwallet/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/sync_type_enum.dart'; import 'package:stackwallet/utilities/enums/sync_type_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
@ -17,7 +17,7 @@ class SyncingOptionsView extends ConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {
@ -90,7 +90,8 @@ class SyncingOptionsView extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance
.color.radioButtonIconEnabled,
value: value:
SyncingType.currentWalletOnly, SyncingType.currentWalletOnly,
groupValue: ref.watch( groupValue: ref.watch(
@ -177,7 +178,8 @@ class SyncingOptionsView extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance
.color.radioButtonIconEnabled,
value: value:
SyncingType.allWalletsOnStartup, SyncingType.allWalletsOnStartup,
groupValue: ref.watch( groupValue: ref.watch(
@ -268,7 +270,8 @@ class SyncingOptionsView extends ConsumerWidget {
width: 20, width: 20,
height: 20, height: 20,
child: Radio( child: Radio(
activeColor: CFColors.link2, activeColor: StackTheme.instance
.color.radioButtonIconEnabled,
value: SyncingType value: SyncingType
.selectedWalletsAtStartup, .selectedWalletsAtStartup,
groupValue: ref.watch( groupValue: ref.watch(

3
lib/pages/settings_views/global_settings_view/syncing_preferences_views/syncing_preferences_view.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/settings_views/global_settings_view/syncing_preferences_views/syncing_options_view.dart'; import 'package:stackwallet/pages/settings_views/global_settings_view/syncing_preferences_views/syncing_options_view.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/sync_type_enum.dart'; import 'package:stackwallet/utilities/enums/sync_type_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
@ -29,7 +30,7 @@ class SyncingPreferencesView extends ConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

3
lib/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart
View file

@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart'; import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/sync_type_enum.dart'; import 'package:stackwallet/utilities/enums/sync_type_enum.dart';
@ -26,7 +27,7 @@ class WalletSyncingOptionsView extends ConsumerWidget {
.watch(walletsChangeNotifierProvider.select((value) => value.managers)); .watch(walletsChangeNotifierProvider.select((value) => value.managers));
return Scaffold( return Scaffold(
backgroundColor: CFColors.almostWhite, backgroundColor: StackTheme.instance.color.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () async { onPressed: () async {

Some files were not shown because too many files have changed in this diff Show more