mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2024-12-23 03:49:22 +00:00
Color theming mostly done with dark colors
This commit is contained in:
julian
parent
7d3a9bf0d9
commit
e830286511
146 changed files with 1086 additions and 1168 deletions
|
|
@ -50,7 +50,6 @@ import 'package:stackwallet/services/notifications_api.dart';
|
|||
import 'package:stackwallet/services/notifications_service.dart';
|
||||
import 'package:stackwallet/services/trade_service.dart';
|
||||
import 'package:stackwallet/services/wallets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/db_version_migration.dart';
|
||||
import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
|
||||
|
|
@ -511,11 +510,16 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
|
|||
title: 'Stack Wallet',
|
||||
onGenerateRoute: RouteGenerator.generateRoute,
|
||||
theme: ThemeData(
|
||||
highlightColor: CFColors.splashLight,
|
||||
highlightColor: StackTheme.instance.color.highlight,
|
||||
brightness: Brightness.light,
|
||||
fontFamily: GoogleFonts.inter().fontFamily,
|
||||
unselectedWidgetColor:
|
||||
StackTheme.instance.color.radioButtonBorderDisabled,
|
||||
textTheme: GoogleFonts.interTextTheme().copyWith(
|
||||
button: STextStyles.button,
|
||||
subtitle1: STextStyles.field.copyWith(
|
||||
color: StackTheme.instance.color.textDark,
|
||||
),
|
||||
),
|
||||
radioTheme: const RadioThemeData(
|
||||
splashRadius: 0,
|
||||
|
|
@ -523,16 +527,18 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
|
|||
),
|
||||
// splashFactory: NoSplash.splashFactory,
|
||||
splashColor: Colors.transparent,
|
||||
buttonTheme: const ButtonThemeData(
|
||||
splashColor: CFColors.splashMed,
|
||||
buttonTheme: ButtonThemeData(
|
||||
splashColor: StackTheme.instance.color.splash,
|
||||
),
|
||||
textButtonTheme: TextButtonThemeData(
|
||||
style: ButtonStyle(
|
||||
// splashFactory: NoSplash.splashFactory,
|
||||
overlayColor: MaterialStateProperty.all(CFColors.splashMed),
|
||||
overlayColor:
|
||||
MaterialStateProperty.all(StackTheme.instance.color.splash),
|
||||
minimumSize: MaterialStateProperty.all<Size>(const Size(46, 46)),
|
||||
textStyle: MaterialStateProperty.all<TextStyle>(STextStyles.button),
|
||||
foregroundColor: MaterialStateProperty.all(CFColors.white),
|
||||
foregroundColor: MaterialStateProperty.all(
|
||||
StackTheme.instance.color.buttonTextSecondary),
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
StackTheme.instance.color.buttonBackSecondary),
|
||||
shape: MaterialStateProperty.all<OutlinedBorder>(
|
||||
|
|
@ -543,8 +549,9 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
|
|||
),
|
||||
),
|
||||
),
|
||||
primaryColor: CFColors.stackAccent,
|
||||
primarySwatch: CFColors.createMaterialColor(CFColors.stackAccent),
|
||||
primaryColor: StackTheme.instance.color.accentColorDark,
|
||||
primarySwatch:
|
||||
Util.createMaterialColor(StackTheme.instance.color.accentColorDark),
|
||||
checkboxTheme: CheckboxThemeData(
|
||||
splashRadius: 0,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/models/notification_model.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/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/rounded_container.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
||||
|
|
@ -43,7 +42,7 @@ class NotificationCard extends StatelessWidget {
|
|||
),
|
||||
child: SvgPicture.asset(
|
||||
notification.iconAssetName,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 24,
|
||||
height: 24,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@ import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/sub_widgets/n
|
|||
import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.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/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.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/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
|
||||
|
|
@ -117,8 +116,8 @@ class _AddWalletViewState extends State<AddWalletView> {
|
|||
Assets.svg.search,
|
||||
width: 24,
|
||||
height: 24,
|
||||
color:
|
||||
CFColors.textFieldDefaultSearchIconLeft,
|
||||
color: StackTheme.instance.color
|
||||
.textFieldDefaultSearchIconLeft,
|
||||
),
|
||||
),
|
||||
suffixIcon: _searchFieldController.text.isNotEmpty
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -35,7 +34,7 @@ class CoinSelectItem extends ConsumerWidget {
|
|||
BorderRadius.circular(Constants.size.circularBorderRadius),
|
||||
),
|
||||
child: MaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
key: Key("coinSelectItemButtonKey_${coin.name}"),
|
||||
padding: isDesktop
|
||||
? const EdgeInsets.only(left: 24)
|
||||
|
|
@ -79,7 +78,7 @@ class CoinSelectItem extends ConsumerWidget {
|
|||
height: 24,
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.check,
|
||||
color: CFColors.borderNormal,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@ 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_or_restore_wallet_title.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/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/utilities/util.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
|
||||
|
|
@ -82,7 +81,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
|
|||
),
|
||||
),
|
||||
body: Container(
|
||||
color: CFColors.background,
|
||||
color: StackTheme.instance.color.background,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Column(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:stackwallet/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/add_wallet_type_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -71,8 +70,7 @@ class CreateWalletButtonGroup extends StatelessWidget {
|
|||
style: isDesktop
|
||||
? STextStyles.desktopButtonSecondaryEnabled
|
||||
: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
|
|||
"Roll the dice to pick a random name.",
|
||||
style: isDesktop
|
||||
? STextStyles.desktopTextExtraSmall.copyWith(
|
||||
color: CFColors.textSubtitle1,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
)
|
||||
: STextStyles.itemSubtitle,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class _NewWalletRecoveryPhraseViewState
|
|||
],
|
||||
),
|
||||
body: Container(
|
||||
color: CFColors.background,
|
||||
color: StackTheme.instance.color.background,
|
||||
width: isDesktop ? 600 : null,
|
||||
child: Padding(
|
||||
padding: isDesktop
|
||||
|
|
@ -195,8 +195,8 @@ class _NewWalletRecoveryPhraseViewState
|
|||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: isDesktop
|
||||
? CFColors.background
|
||||
: CFColors.popupBackground,
|
||||
? StackTheme.instance.color.background
|
||||
: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius),
|
||||
),
|
||||
|
|
@ -210,8 +210,8 @@ class _NewWalletRecoveryPhraseViewState
|
|||
style: isDesktop
|
||||
? STextStyles.desktopSubtitleH2
|
||||
: STextStyles.label.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.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/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
||||
class MnemonicTableItem extends StatelessWidget {
|
||||
|
|
@ -30,10 +29,10 @@ class MnemonicTableItem extends StatelessWidget {
|
|||
number.toString(),
|
||||
style: isDesktop
|
||||
? STextStyles.desktopTextExtraSmall.copyWith(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
)
|
||||
: STextStyles.baseXS.copyWith(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
fontSize: 10,
|
||||
),
|
||||
),
|
||||
|
|
@ -44,7 +43,7 @@ class MnemonicTableItem extends StatelessWidget {
|
|||
word,
|
||||
style: isDesktop
|
||||
? STextStyles.desktopTextExtraSmall.copyWith(
|
||||
color: CFColors.textDark,
|
||||
color: StackTheme.instance.color.textDark,
|
||||
)
|
||||
: STextStyles.baseXS,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import 'package:stackwallet/pages/add_wallet_views/restore_wallet_view/restore_w
|
|||
import 'package:stackwallet/pages/add_wallet_views/restore_wallet_view/sub_widgets/mnemonic_word_count_select_sheet.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/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/format.dart';
|
||||
|
|
@ -72,7 +71,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
|
|||
}
|
||||
|
||||
final _datePickerTextStyleBase = GoogleFonts.inter(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w400,
|
||||
letterSpacing: 0.5,
|
||||
|
|
@ -80,34 +79,34 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
|
|||
MaterialRoundedDatePickerStyle _buildDatePickerStyle() {
|
||||
return MaterialRoundedDatePickerStyle(
|
||||
paddingMonthHeader: const EdgeInsets.only(top: 11),
|
||||
colorArrowNext: CFColors.neutral60,
|
||||
colorArrowPrevious: CFColors.neutral60,
|
||||
colorArrowNext: StackTheme.instance.color.textSubtitle1,
|
||||
colorArrowPrevious: StackTheme.instance.color.textSubtitle1,
|
||||
textStyleButtonNegative: _datePickerTextStyleBase.copyWith(
|
||||
fontSize: 16, fontWeight: FontWeight.w600),
|
||||
textStyleButtonPositive: _datePickerTextStyleBase.copyWith(
|
||||
fontSize: 16, fontWeight: FontWeight.w600),
|
||||
textStyleCurrentDayOnCalendar: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
textStyleDayHeader: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
textStyleDayOnCalendar: _datePickerTextStyleBase,
|
||||
textStyleDayOnCalendarDisabled: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.neutral80,
|
||||
color: StackTheme.instance.color.textSubtitle3,
|
||||
),
|
||||
textStyleDayOnCalendarSelected: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
),
|
||||
textStyleMonthYearHeader: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.neutral60,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
textStyleYearButton: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.textWhite,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
|
|
@ -118,12 +117,12 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
|
|||
MaterialRoundedYearPickerStyle _buildYearPickerStyle() {
|
||||
return MaterialRoundedYearPickerStyle(
|
||||
textStyleYear: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 16,
|
||||
),
|
||||
textStyleYearSelected: _datePickerTextStyleBase.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 18,
|
||||
),
|
||||
|
|
@ -165,7 +164,8 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
|
|||
initialDate: DateTime.now(),
|
||||
height: height * 0.5,
|
||||
theme: ThemeData(
|
||||
primarySwatch: CFColors.createMaterialColor(CFColors.stackAccent),
|
||||
primarySwatch:
|
||||
Util.createMaterialColor(StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
//TODO pick a better initial date
|
||||
// 2007 chosen as that is just before bitcoin launched
|
||||
|
|
@ -292,7 +292,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
|
|||
"Choose the date you made the wallet (approximate is fine)",
|
||||
style: isDesktop
|
||||
? STextStyles.desktopTextExtraSmall.copyWith(
|
||||
color: CFColors.textSubtitle1,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
)
|
||||
: STextStyles.smallMed12.copyWith(
|
||||
fontSize: 10,
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.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/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
||||
class MobileMnemonicLengthSelector extends ConsumerWidget {
|
||||
const MobileMnemonicLengthSelector({
|
||||
|
|
@ -30,7 +29,7 @@ class MobileMnemonicLengthSelector extends ConsumerWidget {
|
|||
horizontal: 12,
|
||||
),
|
||||
child: RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -48,7 +47,7 @@ class MobileMnemonicLengthSelector extends ConsumerWidget {
|
|||
Assets.svg.chevronDown,
|
||||
width: 8,
|
||||
height: 4,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/theme/stack_theme.dart';
|
||||
|
||||
class RestoreFromDatePicker extends StatefulWidget {
|
||||
const RestoreFromDatePicker({Key? key, required this.onTap})
|
||||
|
|
@ -51,7 +50,7 @@ class _RestoreFromDatePickerState extends State<RestoreFromDatePicker> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.calendar,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
||||
class RestoreOptionsPlatformLayout extends StatelessWidget {
|
||||
|
|
@ -18,7 +17,7 @@ class RestoreOptionsPlatformLayout extends StatelessWidget {
|
|||
return child;
|
||||
} else {
|
||||
return Container(
|
||||
color: CFColors.background,
|
||||
color: StackTheme.instance.color.background,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: LayoutBuilder(
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import 'package:stackwallet/services/transaction_notification_tracker.dart';
|
|||
import 'package:stackwallet/utilities/address_utils.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/custom_text_selection_controls.dart';
|
||||
|
|
@ -356,7 +355,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
|
|||
switch (status) {
|
||||
case FormInputStatus.empty:
|
||||
color = StackTheme.instance.color.textFieldDefaultBG;
|
||||
prefixColor = CFColors.gray3;
|
||||
prefixColor = StackTheme.instance.color.textSubtitle2;
|
||||
break;
|
||||
case FormInputStatus.invalid:
|
||||
color = StackTheme.instance.color.textFieldErrorBG;
|
||||
|
|
@ -549,10 +548,10 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
|
|||
size: 36,
|
||||
shadows: const [],
|
||||
color: StackTheme.instance.color.background,
|
||||
icon: const QrCodeIcon(
|
||||
icon: QrCodeIcon(
|
||||
width: 20,
|
||||
height: 20,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
onPressed: scanMnemonicQr,
|
||||
),
|
||||
|
|
@ -571,10 +570,10 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
|
|||
size: 36,
|
||||
shadows: const [],
|
||||
color: StackTheme.instance.color.background,
|
||||
icon: const ClipboardIcon(
|
||||
icon: ClipboardIcon(
|
||||
width: 20,
|
||||
height: 20,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
onPressed: pasteMnemonic,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/ui/verify_recovery_phrase/mnemonic_word_count_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -23,9 +22,9 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
|
|||
return false;
|
||||
},
|
||||
child: Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
|
@ -60,12 +59,10 @@ class _RestoringDialogState extends State<RestoringDialog>
|
|||
message: "This may take a while. Please do not exit this screen.",
|
||||
icon: RotationTransition(
|
||||
turns: _spinAnimation,
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.arrowRotate3,
|
||||
width: 24,
|
||||
height: 24,
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
child: SvgPicture.asset(Assets.svg.arrowRotate3,
|
||||
width: 24,
|
||||
height: 24,
|
||||
color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
rightButton: TextButton(
|
||||
style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/providers.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/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
||||
class WordTableItem extends ConsumerWidget {
|
||||
const WordTableItem({
|
||||
|
|
@ -25,13 +24,15 @@ class WordTableItem extends ConsumerWidget {
|
|||
ref.watch(verifyMnemonicSelectedWordStateProvider.state).state;
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: selectedWord == word ? CFColors.selection : CFColors.white,
|
||||
color: selectedWord == word
|
||||
? StackTheme.instance.color.snackBarBackInfo
|
||||
: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
),
|
||||
child: MaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
key: Key("coinSelectItemButtonKey_$word"),
|
||||
padding: isDesktop
|
||||
? const EdgeInsets.symmetric(
|
||||
|
|
@ -55,7 +56,7 @@ class WordTableItem extends ConsumerWidget {
|
|||
textAlign: TextAlign.center,
|
||||
style: isDesktop
|
||||
? STextStyles.desktopTextExtraSmall.copyWith(
|
||||
color: CFColors.textDark,
|
||||
color: StackTheme.instance.color.textDark,
|
||||
)
|
||||
: STextStyles.baseXS,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -9,11 +9,10 @@ import 'package:stackwallet/providers/global/address_book_service_provider.dart'
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/address_book_card.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
|
||||
|
|
@ -130,7 +129,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.filter,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
@ -157,7 +156,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.plus,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import 'package:stackwallet/providers/ui/address_book_providers/contact_name_is_
|
|||
import 'package:stackwallet/providers/ui/address_book_providers/valid_contact_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -223,20 +222,22 @@ class _AddAddressBookEntryViewState
|
|||
height: 14,
|
||||
width: 14,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
child: Center(
|
||||
child: _selectedEmoji == null
|
||||
? SvgPicture.asset(
|
||||
Assets.svg.plus,
|
||||
color: CFColors.white,
|
||||
color: StackTheme
|
||||
.instance.color.textWhite,
|
||||
width: 12,
|
||||
height: 12,
|
||||
)
|
||||
: SvgPicture.asset(
|
||||
Assets.svg.thickX,
|
||||
color: CFColors.white,
|
||||
color: StackTheme
|
||||
.instance.color.textWhite,
|
||||
width: 8,
|
||||
height: 8,
|
||||
),
|
||||
|
|
@ -345,8 +346,8 @@ class _AddAddressBookEntryViewState
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
if (FocusScope.of(context).hasFocus) {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import 'package:stackwallet/providers/ui/address_book_providers/address_entry_da
|
|||
import 'package:stackwallet/providers/ui/address_book_providers/valid_contact_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -151,8 +150,8 @@ class _AddNewContactAddressViewState
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
if (FocusScope.of(context).hasFocus) {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/providers/global/prefs_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -18,9 +17,9 @@ class CoinSelectSheet extends StatelessWidget {
|
|||
var coins_ = [...Coin.values];
|
||||
coins_.remove(Coin.firoTestNet);
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
@ -78,7 +77,7 @@ class CoinSelectSheet extends StatelessWidget {
|
|||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 4),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop(coin);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import 'package:stackwallet/providers/providers.dart';
|
|||
import 'package:stackwallet/providers/ui/address_book_providers/address_entry_data_provider.dart';
|
||||
import 'package:stackwallet/services/coins/manager.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -164,7 +163,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.trash,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
@ -279,12 +278,11 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
|
|||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
Assets.svg.pencil,
|
||||
width: 10,
|
||||
height: 10,
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
SvgPicture.asset(Assets.svg.pencil,
|
||||
width: 10,
|
||||
height: 10,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
|
|
@ -382,12 +380,11 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
|
|||
color: StackTheme
|
||||
.instance.color.textFieldDefaultBG,
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.pencil,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
child: SvgPicture.asset(Assets.svg.pencil,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -409,12 +406,11 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
|
|||
color: StackTheme
|
||||
.instance.color.textFieldDefaultBG,
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.copy,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
child: SvgPicture.asset(Assets.svg.copy,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import 'package:stackwallet/providers/exchange/exchange_flow_is_active_state_pro
|
|||
import 'package:stackwallet/providers/global/address_book_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -72,7 +71,7 @@ class ContactPopUp extends ConsumerWidget {
|
|||
),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
20,
|
||||
),
|
||||
|
|
@ -259,11 +258,11 @@ class ContactPopUp extends ConsumerWidget {
|
|||
.textFieldDefaultBG,
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.copy,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
Assets.svg.copy,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: StackTheme.instance
|
||||
.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
@ -311,11 +310,12 @@ class ContactPopUp extends ConsumerWidget {
|
|||
padding:
|
||||
const EdgeInsets.all(4),
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.circleArrowUpRight,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
Assets
|
||||
.svg.circleArrowUpRight,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: StackTheme.instance
|
||||
.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import 'package:stackwallet/providers/ui/address_book_providers/address_entry_da
|
|||
import 'package:stackwallet/providers/ui/address_book_providers/valid_contact_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -186,8 +185,8 @@ class _EditContactAddressViewState
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
if (FocusScope.of(context).hasFocus) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/providers/global/address_book_service_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -162,20 +161,22 @@ class _EditContactNameEmojiViewState
|
|||
height: 14,
|
||||
width: 14,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
child: Center(
|
||||
child: _selectedEmoji == null
|
||||
? SvgPicture.asset(
|
||||
Assets.svg.plus,
|
||||
color: CFColors.white,
|
||||
color: StackTheme
|
||||
.instance.color.textWhite,
|
||||
width: 12,
|
||||
height: 12,
|
||||
)
|
||||
: SvgPicture.asset(
|
||||
Assets.svg.thickX,
|
||||
color: CFColors.white,
|
||||
color: StackTheme
|
||||
.instance.color.textWhite,
|
||||
width: 8,
|
||||
height: 8,
|
||||
),
|
||||
|
|
@ -237,8 +238,8 @@ class _EditContactNameEmojiViewState
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
if (FocusScope.of(context).hasFocus) {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import 'package:stackwallet/utilities/address_utils.dart';
|
|||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.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/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
|
|
@ -82,7 +81,7 @@ class _NewContactAddressEntryFormState
|
|||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -136,7 +135,7 @@ class _NewContactAddressEntryFormState
|
|||
Assets.svg.chevronDown,
|
||||
width: 8,
|
||||
height: 4,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/models/exchange/change_now/exchange_transaction.dart';
|
||||
|
|
@ -8,7 +10,6 @@ import 'package:stackwallet/pages/wallet_view/wallet_view.dart';
|
|||
import 'package:stackwallet/providers/exchange/trade_sent_from_stack_lookup_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/format.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -48,14 +49,14 @@ class _ConfirmChangeNowSendViewState
|
|||
late final ExchangeTransaction trade;
|
||||
|
||||
Future<void> _attemptSend(BuildContext context) async {
|
||||
showDialog<void>(
|
||||
unawaited(showDialog<void>(
|
||||
context: context,
|
||||
useSafeArea: false,
|
||||
barrierDismissible: false,
|
||||
builder: (context) {
|
||||
return const SendingTransactionDialog();
|
||||
},
|
||||
);
|
||||
));
|
||||
|
||||
final String note = transactionInfo["note"] as String? ?? "";
|
||||
final manager =
|
||||
|
|
@ -63,10 +64,10 @@ class _ConfirmChangeNowSendViewState
|
|||
|
||||
try {
|
||||
final txid = await manager.confirmSend(txData: transactionInfo);
|
||||
manager.refresh();
|
||||
unawaited(manager.refresh());
|
||||
|
||||
// save note
|
||||
ref
|
||||
await ref
|
||||
.read(notesServiceChangeNotifierProvider(walletId))
|
||||
.editOrAddNote(txid: txid, note: note);
|
||||
|
||||
|
|
@ -101,7 +102,7 @@ class _ConfirmChangeNowSendViewState
|
|||
child: Text(
|
||||
"Ok",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
@ -346,13 +347,8 @@ class _ConfirmChangeNowSendViewState
|
|||
),
|
||||
const Spacer(),
|
||||
TextButton(
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
onPressed: () async {
|
||||
final unlocked = await Navigator.push(
|
||||
context,
|
||||
|
|
@ -376,7 +372,7 @@ class _ConfirmChangeNowSendViewState
|
|||
);
|
||||
|
||||
if (unlocked is bool && unlocked && mounted) {
|
||||
_attemptSend(context);
|
||||
await _attemptSend(context);
|
||||
}
|
||||
},
|
||||
child: Text(
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/exchange/trade_note_service_provider.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/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/icon_widgets/x_icon.dart';
|
||||
import 'package:stackwallet/widgets/stack_text_field.dart';
|
||||
|
|
@ -127,13 +126,8 @@ class _EditNoteViewState extends ConsumerState<EditTradeNoteView> {
|
|||
Navigator.of(context).pop();
|
||||
}
|
||||
},
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Save",
|
||||
style: STextStyles.button,
|
||||
|
|
|
|||
|
|
@ -4,11 +4,10 @@ import 'package:flutter_svg/svg.dart';
|
|||
import 'package:stackwallet/models/exchange/change_now/currency.dart';
|
||||
import 'package:stackwallet/models/exchange/change_now/fixed_rate_market.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/enums/coin_enum.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/icon_widgets/x_icon.dart';
|
||||
import 'package:stackwallet/widgets/loading_indicator.dart';
|
||||
|
|
@ -233,12 +232,12 @@ class _FixedRateMarketPairCoinSelectionViewState
|
|||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: SvgPicture.network(
|
||||
tuple.item1,
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
placeholderBuilder: (_) =>
|
||||
const LoadingIndicator(),
|
||||
),
|
||||
|
|
@ -246,9 +245,26 @@ class _FixedRateMarketPairCoinSelectionViewState
|
|||
const SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
Text(
|
||||
"${tuple.item2} / ${ticker.toUpperCase()}",
|
||||
style: STextStyles.titleBold12,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
tuple.item2,
|
||||
style: STextStyles.largeMedium14,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 2,
|
||||
),
|
||||
Text(
|
||||
ticker.toUpperCase(),
|
||||
style: STextStyles.smallMed12.copyWith(
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -290,12 +306,12 @@ class _FixedRateMarketPairCoinSelectionViewState
|
|||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: SvgPicture.network(
|
||||
tuple.item1,
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
placeholderBuilder: (_) =>
|
||||
const LoadingIndicator(),
|
||||
),
|
||||
|
|
@ -303,9 +319,26 @@ class _FixedRateMarketPairCoinSelectionViewState
|
|||
const SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
Text(
|
||||
"${tuple.item2} / ${ticker.toUpperCase()}",
|
||||
style: STextStyles.titleBold12,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
tuple.item2,
|
||||
style: STextStyles.largeMedium14,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 2,
|
||||
),
|
||||
Text(
|
||||
ticker.toUpperCase(),
|
||||
style: STextStyles.smallMed12.copyWith(
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/models/exchange/change_now/currency.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/enums/coin_enum.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/icon_widgets/x_icon.dart';
|
||||
import 'package:stackwallet/widgets/loading_indicator.dart';
|
||||
|
|
@ -140,6 +139,7 @@ class _FloatingRateCurrencySelectionViewState
|
|||
setState(() {
|
||||
_searchController.text = "";
|
||||
});
|
||||
filter("");
|
||||
},
|
||||
),
|
||||
],
|
||||
|
|
@ -184,12 +184,12 @@ class _FloatingRateCurrencySelectionViewState
|
|||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: SvgPicture.network(
|
||||
items[index].image,
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
placeholderBuilder: (_) =>
|
||||
const LoadingIndicator(),
|
||||
),
|
||||
|
|
@ -197,9 +197,26 @@ class _FloatingRateCurrencySelectionViewState
|
|||
const SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
Text(
|
||||
"${items[index].name} / ${items[index].ticker.toUpperCase()}",
|
||||
style: STextStyles.titleBold12,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
items[index].name,
|
||||
style: STextStyles.largeMedium14,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 2,
|
||||
),
|
||||
Text(
|
||||
items[index].ticker.toUpperCase(),
|
||||
style: STextStyles.smallMed12.copyWith(
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -237,12 +254,12 @@ class _FloatingRateCurrencySelectionViewState
|
|||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: SvgPicture.network(
|
||||
_currencies[index].image,
|
||||
width: 20,
|
||||
height: 20,
|
||||
width: 24,
|
||||
height: 24,
|
||||
placeholderBuilder: (_) =>
|
||||
const LoadingIndicator(),
|
||||
),
|
||||
|
|
@ -250,9 +267,26 @@ class _FloatingRateCurrencySelectionViewState
|
|||
const SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
Text(
|
||||
"${_currencies[index].name} / ${_currencies[index].ticker.toUpperCase()}",
|
||||
style: STextStyles.titleBold12,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
_currencies[index].name,
|
||||
style: STextStyles.largeMedium14,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 2,
|
||||
),
|
||||
Text(
|
||||
_currencies[index].ticker.toUpperCase(),
|
||||
style: STextStyles.smallMed12.copyWith(
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/exchange/changenow_initial_load_status.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/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/custom_loading_overlay.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
||||
|
|
@ -66,7 +65,7 @@ class _ExchangeLoadingOverlayViewState
|
|||
if (_statusEst == ChangeNowLoadStatus.loading ||
|
||||
(_statusFixed == ChangeNowLoadStatus.loading && userReloaded))
|
||||
Container(
|
||||
color: CFColors.stackAccent.withOpacity(0.7),
|
||||
color: StackTheme.instance.color.overlay.withOpacity(0.7),
|
||||
child: const CustomLoadingOverlay(
|
||||
message: "Loading ChangeNOW data", eventBus: null),
|
||||
),
|
||||
|
|
@ -75,7 +74,7 @@ class _ExchangeLoadingOverlayViewState
|
|||
_statusEst != ChangeNowLoadStatus.loading &&
|
||||
_statusFixed != ChangeNowLoadStatus.loading)
|
||||
Container(
|
||||
color: CFColors.stackAccent.withOpacity(0.7),
|
||||
color: StackTheme.instance.color.overlay.withOpacity(0.7),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
|
|
@ -84,10 +83,13 @@ class _ExchangeLoadingOverlayViewState
|
|||
message:
|
||||
"ChangeNOW requires a working internet connection. Tap OK to try fetching again.",
|
||||
rightButton: TextButton(
|
||||
style: StackTheme.instance
|
||||
.getSecondaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"OK",
|
||||
style: STextStyles.button
|
||||
.copyWith(color: CFColors.stackAccent),
|
||||
style: STextStyles.button.copyWith(
|
||||
color: StackTheme.instance.color.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
userReloaded = true;
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ import 'package:stackwallet/models/exchange/incomplete_exchange.dart';
|
|||
import 'package:stackwallet/pages/exchange_view/exchange_step_views/step_2_view.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/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.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/rounded_white_container.dart';
|
||||
|
||||
|
|
@ -103,11 +102,15 @@ class _Step1ViewState extends State<Step1View> {
|
|||
children: [
|
||||
Text(
|
||||
"You send",
|
||||
style: STextStyles.itemSubtitle,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color:
|
||||
StackTheme.instance.color.infoItemText),
|
||||
),
|
||||
Text(
|
||||
"${model.sendAmount.toStringAsFixed(8)} ${model.sendTicker}",
|
||||
style: STextStyles.itemSubtitle12,
|
||||
"${model.sendAmount.toStringAsFixed(8)} ${model.sendTicker.toUpperCase()}",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color:
|
||||
StackTheme.instance.color.infoItemText),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -121,11 +124,15 @@ class _Step1ViewState extends State<Step1View> {
|
|||
children: [
|
||||
Text(
|
||||
"You receive",
|
||||
style: STextStyles.itemSubtitle,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color:
|
||||
StackTheme.instance.color.infoItemText),
|
||||
),
|
||||
Text(
|
||||
"~${model.receiveAmount.toStringAsFixed(8)} ${model.receiveTicker}",
|
||||
style: STextStyles.itemSubtitle12,
|
||||
"~${model.receiveAmount.toStringAsFixed(8)} ${model.receiveTicker.toUpperCase()}",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color:
|
||||
StackTheme.instance.color.infoItemText),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -141,11 +148,16 @@ class _Step1ViewState extends State<Step1View> {
|
|||
model.rateType == ExchangeRateType.estimated
|
||||
? "Estimated rate"
|
||||
: "Fixed rate",
|
||||
style: STextStyles.itemSubtitle,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color:
|
||||
StackTheme.instance.color.infoItemLabel,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
model.rateInfo,
|
||||
style: STextStyles.itemSubtitle12,
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color:
|
||||
StackTheme.instance.color.infoItemText),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -159,13 +171,8 @@ class _Step1ViewState extends State<Step1View> {
|
|||
Navigator.of(context).pushNamed(Step2View.routeName,
|
||||
arguments: model);
|
||||
},
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Next",
|
||||
style: STextStyles.button,
|
||||
|
|
|
|||
|
|
@ -10,13 +10,12 @@ import 'package:stackwallet/providers/exchange/exchange_send_from_wallet_id_prov
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/address_utils.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.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/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/logger.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/icon_widgets/addressbook_icon.dart';
|
||||
import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart';
|
||||
|
|
@ -157,9 +156,7 @@ class _Step2ViewState extends ConsumerState<Step2View> {
|
|||
children: [
|
||||
Text(
|
||||
"Recipient Wallet",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
),
|
||||
style: STextStyles.smallMed12,
|
||||
),
|
||||
// GestureDetector(
|
||||
// onTap: () {
|
||||
|
|
@ -199,7 +196,7 @@ class _Step2ViewState extends ConsumerState<Step2View> {
|
|||
focusNode: _toFocusNode,
|
||||
style: STextStyles.field,
|
||||
decoration: standardInputDecoration(
|
||||
"Enter the ${model.receiveTicker} payout address",
|
||||
"Enter the ${model.receiveTicker.toUpperCase()} payout address",
|
||||
_toFocusNode,
|
||||
).copyWith(
|
||||
contentPadding: const EdgeInsets.only(
|
||||
|
|
@ -336,7 +333,7 @@ class _Step2ViewState extends ConsumerState<Step2View> {
|
|||
),
|
||||
RoundedWhiteContainer(
|
||||
child: Text(
|
||||
"This is the wallet where your ${model.receiveTicker} will be sent to.",
|
||||
"This is the wallet where your ${model.receiveTicker.toUpperCase()} will be sent to.",
|
||||
style: STextStyles.label,
|
||||
),
|
||||
),
|
||||
|
|
@ -387,7 +384,7 @@ class _Step2ViewState extends ConsumerState<Step2View> {
|
|||
focusNode: _refundFocusNode,
|
||||
style: STextStyles.field,
|
||||
decoration: standardInputDecoration(
|
||||
"Enter ${model.sendTicker} refund address",
|
||||
"Enter ${model.sendTicker.toUpperCase()} refund address",
|
||||
_refundFocusNode,
|
||||
).copyWith(
|
||||
contentPadding: const EdgeInsets.only(
|
||||
|
|
@ -538,10 +535,13 @@ class _Step2ViewState extends ConsumerState<Step2View> {
|
|||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
style: StackTheme.instance
|
||||
.getSecondaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Back",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance.color.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -559,15 +559,8 @@ class _Step2ViewState extends ConsumerState<Step2View> {
|
|||
Step3View.routeName,
|
||||
arguments: model);
|
||||
},
|
||||
style: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Next",
|
||||
style: STextStyles.button,
|
||||
|
|
|
|||
|
|
@ -12,10 +12,9 @@ import 'package:stackwallet/providers/exchange/change_now_provider.dart';
|
|||
import 'package:stackwallet/providers/global/trades_service_provider.dart';
|
||||
import 'package:stackwallet/services/notifications_api.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/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/rounded_white_container.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
|
@ -109,7 +108,7 @@ class _Step3ViewState extends ConsumerState<Step3View> {
|
|||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
"${model.sendAmount.toString()} ${model.sendTicker}",
|
||||
"${model.sendAmount.toString()} ${model.sendTicker.toUpperCase()}",
|
||||
style: STextStyles.itemSubtitle12,
|
||||
)
|
||||
],
|
||||
|
|
@ -127,7 +126,7 @@ class _Step3ViewState extends ConsumerState<Step3View> {
|
|||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
"${model.receiveAmount.toString()} ${model.receiveTicker}",
|
||||
"${model.receiveAmount.toString()} ${model.receiveTicker.toUpperCase()}",
|
||||
style: STextStyles.itemSubtitle12,
|
||||
)
|
||||
],
|
||||
|
|
@ -159,7 +158,7 @@ class _Step3ViewState extends ConsumerState<Step3View> {
|
|||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Recipient ${model.receiveTicker} address",
|
||||
"Recipient ${model.receiveTicker.toUpperCase()} address",
|
||||
style: STextStyles.itemSubtitle,
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -180,7 +179,7 @@ class _Step3ViewState extends ConsumerState<Step3View> {
|
|||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Refund ${model.sendTicker} address",
|
||||
"Refund ${model.sendTicker.toUpperCase()} address",
|
||||
style: STextStyles.itemSubtitle,
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -204,10 +203,13 @@ class _Step3ViewState extends ConsumerState<Step3View> {
|
|||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
style: StackTheme.instance
|
||||
.getSecondaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Back",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance.color.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -304,15 +306,8 @@ class _Step3ViewState extends ConsumerState<Step3View> {
|
|||
));
|
||||
}
|
||||
},
|
||||
style: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Next",
|
||||
style: STextStyles.button,
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import 'package:stackwallet/providers/exchange/exchange_send_from_wallet_id_prov
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
|
||||
|
|
@ -158,27 +157,27 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
height: 14,
|
||||
),
|
||||
Text(
|
||||
"Send ${model.sendTicker} to the address below",
|
||||
"Send ${model.sendTicker.toUpperCase()} to the address below",
|
||||
style: STextStyles.pageTitleH1,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
Text(
|
||||
"Send ${model.sendTicker} to the address below. Once it is received, ChangeNOW will send the ${model.receiveTicker} to the recipient address you provided. You can find this trade details and check its status in the list of trades.",
|
||||
"Send ${model.sendTicker.toUpperCase()} to the address below. Once it is received, ChangeNOW will send the ${model.receiveTicker.toUpperCase()} to the recipient address you provided. You can find this trade details and check its status in the list of trades.",
|
||||
style: STextStyles.itemSubtitle,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 12,
|
||||
),
|
||||
RoundedContainer(
|
||||
color: CFColors.warningBackground,
|
||||
color: StackTheme.instance.color.warningBackground,
|
||||
child: RichText(
|
||||
text: TextSpan(
|
||||
text:
|
||||
"You must send at least ${model.sendAmount.toString()} ${model.sendTicker}. ",
|
||||
style: STextStyles.label.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.textDark,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
children: [
|
||||
|
|
@ -186,7 +185,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
text:
|
||||
"If you send less than ${model.sendAmount.toString()} ${model.sendTicker}, your transaction may not be converted and it may not be refunded.",
|
||||
style: STextStyles.label.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.textDark,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
|
|
@ -207,9 +206,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
children: [
|
||||
Text(
|
||||
"Amount",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
),
|
||||
style: STextStyles.itemSubtitle,
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: () async {
|
||||
|
|
@ -246,7 +243,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
height: 4,
|
||||
),
|
||||
Text(
|
||||
"${model.sendAmount.toString()} ${model.sendTicker}",
|
||||
"${model.sendAmount.toString()} ${model.sendTicker.toUpperCase()}",
|
||||
style: STextStyles.itemSubtitle12,
|
||||
),
|
||||
],
|
||||
|
|
@ -264,10 +261,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Send ${model.sendTicker} to this address",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
),
|
||||
"Send ${model.sendTicker.toUpperCase()} to this address",
|
||||
style: STextStyles.itemSubtitle,
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: () async {
|
||||
|
|
@ -362,14 +357,13 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
children: [
|
||||
Text(
|
||||
"Status",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
),
|
||||
style: STextStyles.itemSubtitle,
|
||||
),
|
||||
Text(
|
||||
_statusString,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.status.forStatus(_status),
|
||||
color: StackTheme.instance
|
||||
.colorForStatus(_status),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
@ -409,7 +403,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
.size
|
||||
.width /
|
||||
2,
|
||||
foregroundColor: CFColors.stackAccent,
|
||||
foregroundColor: StackTheme
|
||||
.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -422,11 +417,17 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
child: TextButton(
|
||||
onPressed: () =>
|
||||
Navigator.of(context).pop(),
|
||||
style: StackTheme.instance
|
||||
.getSecondaryEnabledButtonColor(
|
||||
context),
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style:
|
||||
STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -439,13 +440,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
},
|
||||
);
|
||||
},
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Show QR Code",
|
||||
style: STextStyles.button,
|
||||
|
|
@ -573,8 +569,10 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
"Ok",
|
||||
style: STextStyles.button
|
||||
.copyWith(
|
||||
color:
|
||||
CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
@ -611,10 +609,13 @@ class _Step4ViewState extends ConsumerState<Step4View> {
|
|||
),
|
||||
);
|
||||
},
|
||||
style: StackTheme.instance
|
||||
.getSecondaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
buttonTitle,
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance.color.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ import 'package:stackwallet/providers/exchange/trade_sent_from_stack_lookup_prov
|
|||
import 'package:stackwallet/providers/global/trades_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -67,7 +66,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
builder: (_) => WillPopScope(
|
||||
onWillPop: () async => false,
|
||||
child: Container(
|
||||
color: CFColors.stackAccent.withOpacity(0.8),
|
||||
color: StackTheme.instance.color.overlay.withOpacity(0.8),
|
||||
child: const CustomLoadingOverlay(
|
||||
message: "Updating exchange rate",
|
||||
eventBus: null,
|
||||
|
|
@ -368,7 +367,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Text(
|
||||
"You will send",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -562,7 +561,10 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.textFieldDefaultBG,
|
||||
borderRadius:
|
||||
BorderRadius.circular(
|
||||
18,
|
||||
|
|
@ -584,7 +586,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
borderRadius:
|
||||
BorderRadius.circular(18),
|
||||
),
|
||||
|
|
@ -592,7 +594,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Assets.svg.circleQuestion,
|
||||
width: 18,
|
||||
height: 18,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance
|
||||
.color.textFieldDefaultBG,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
@ -617,7 +620,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
.toUpperCase())) ??
|
||||
"-",
|
||||
style: STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance.color.textDark,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -627,7 +631,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.textDark,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -648,7 +653,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
child: Text(
|
||||
"You will receive",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -664,6 +669,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Assets.svg.swap,
|
||||
width: 20,
|
||||
height: 20,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -875,7 +882,10 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.textFieldDefaultBG,
|
||||
borderRadius:
|
||||
BorderRadius.circular(
|
||||
18),
|
||||
|
|
@ -896,7 +906,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
borderRadius:
|
||||
BorderRadius.circular(18),
|
||||
),
|
||||
|
|
@ -904,7 +914,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Assets.svg.circleQuestion,
|
||||
width: 18,
|
||||
height: 18,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance
|
||||
.color.textFieldDefaultBG,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
@ -929,7 +940,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
.toUpperCase())) ??
|
||||
"-",
|
||||
style: STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme
|
||||
.instance.color.textDark,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -939,7 +951,8 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.textDark,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -1118,29 +1131,18 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
height: 12,
|
||||
),
|
||||
TextButton(
|
||||
style: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
((ref
|
||||
.read(
|
||||
prefsChangeNotifierProvider)
|
||||
.exchangeRateType ==
|
||||
ExchangeRateType.estimated)
|
||||
? ref.watch(
|
||||
estimatedRateExchangeFormProvider
|
||||
.select((value) =>
|
||||
value.canExchange))
|
||||
: ref.watch(
|
||||
fixedRateExchangeFormProvider
|
||||
.select((value) =>
|
||||
value.canExchange)))
|
||||
? CFColors.stackAccent
|
||||
: StackTheme
|
||||
.instance.color.buttonBackSecondary,
|
||||
),
|
||||
),
|
||||
style: ((ref
|
||||
.read(prefsChangeNotifierProvider)
|
||||
.exchangeRateType ==
|
||||
ExchangeRateType.estimated)
|
||||
? ref.watch(estimatedRateExchangeFormProvider
|
||||
.select((value) => value.canExchange))
|
||||
: ref.watch(fixedRateExchangeFormProvider
|
||||
.select((value) => value.canExchange)))
|
||||
? StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context)
|
||||
: StackTheme.instance
|
||||
.getPrimaryDisabledButtonColor(context),
|
||||
onPressed: ((ref
|
||||
.read(prefsChangeNotifierProvider)
|
||||
.exchangeRateType ==
|
||||
|
|
@ -1318,16 +1320,9 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
},
|
||||
),
|
||||
rightButton: TextButton(
|
||||
style: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<
|
||||
Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(
|
||||
context),
|
||||
child: Text(
|
||||
"Attempt",
|
||||
style: STextStyles.button,
|
||||
|
|
@ -1346,7 +1341,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
}
|
||||
|
||||
String rate =
|
||||
"1 $fromTicker ~${ref.read(fixedRateExchangeFormProvider).rate!.toStringAsFixed(8)} $toTicker";
|
||||
"1 ${fromTicker.toUpperCase()} ~${ref.read(fixedRateExchangeFormProvider).rate!.toStringAsFixed(8)} ${toTicker.toUpperCase()}";
|
||||
|
||||
final model = IncompleteExchangeModel(
|
||||
sendTicker: fromTicker,
|
||||
|
|
@ -1383,7 +1378,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
// Text(
|
||||
// "Trades",
|
||||
// style: STextStyles.itemSubtitle.copyWith(
|
||||
// color: CFColors.neutral50,
|
||||
// color: StackTheme.instance.color.textDark3,
|
||||
// ),
|
||||
// ),
|
||||
// SizedBox(
|
||||
|
|
@ -1423,7 +1418,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
Text(
|
||||
"Trades",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -1495,7 +1490,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
|
|||
padding: const EdgeInsets.symmetric(horizontal: 4),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
|
|
@ -1537,7 +1532,7 @@ class RateInfo extends ConsumerWidget {
|
|||
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
|
|
@ -1625,7 +1620,7 @@ class RateInfo extends ConsumerWidget {
|
|||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: CFColors.neutral60,
|
||||
color: StackTheme.instance.color.infoItemLabel,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:decimal/decimal.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
|
@ -9,7 +11,6 @@ import 'package:stackwallet/pages/send_view/sub_widgets/building_transaction_dia
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
|
||||
|
|
@ -160,7 +161,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
return RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: MaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
key: Key("walletsSheetItemButtonKey_$walletId"),
|
||||
padding: const EdgeInsets.all(5),
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
|
|
@ -175,7 +176,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
try {
|
||||
bool wasCancelled = false;
|
||||
|
||||
showDialog<dynamic>(
|
||||
unawaited(showDialog<dynamic>(
|
||||
context: context,
|
||||
useSafeArea: false,
|
||||
barrierDismissible: false,
|
||||
|
|
@ -188,7 +189,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
));
|
||||
|
||||
final txData = await manager.prepareSend(
|
||||
address: address,
|
||||
|
|
@ -211,7 +212,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
txData["address"] = address;
|
||||
|
||||
if (mounted) {
|
||||
Navigator.of(context).push(
|
||||
await Navigator.of(context).push(
|
||||
RouteGenerator.getRoute(
|
||||
shouldUseMaterialRoute: RouteGenerator.useMaterialPageRoute,
|
||||
builder: (_) => ConfirmChangeNowSendView(
|
||||
|
|
@ -232,7 +233,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
// pop building dialog
|
||||
Navigator.of(context).pop();
|
||||
|
||||
showDialog<dynamic>(
|
||||
await showDialog<dynamic>(
|
||||
context: context,
|
||||
useSafeArea: false,
|
||||
barrierDismissible: true,
|
||||
|
|
@ -246,7 +247,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
child: Text(
|
||||
"Ok",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
@ -263,7 +264,9 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
|
|||
children: [
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.coin.forCoin(manager.coin).withOpacity(0.5),
|
||||
color: StackTheme.instance
|
||||
.colorForCoin(manager.coin)
|
||||
.withOpacity(0.5),
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -16,9 +15,9 @@ class ExchangeRateSheet extends ConsumerWidget {
|
|||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
@ -36,7 +35,7 @@ class ExchangeRateSheet extends ConsumerWidget {
|
|||
Center(
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.textFieldDefaultBG,
|
||||
color: StackTheme.instance.color.textSubtitle4,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
|
|
@ -104,9 +103,7 @@ class ExchangeRateSheet extends ConsumerWidget {
|
|||
children: [
|
||||
Text(
|
||||
"Estimated rate",
|
||||
style: STextStyles.titleBold12.copyWith(
|
||||
color: const Color(0xFF44464E),
|
||||
),
|
||||
style: STextStyles.titleBold12,
|
||||
textAlign: TextAlign.left,
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -114,7 +111,9 @@ class ExchangeRateSheet extends ConsumerWidget {
|
|||
),
|
||||
Text(
|
||||
"ChangeNOW will pick the best rate for you during the moment of the exchange.",
|
||||
style: STextStyles.itemSubtitle,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
),
|
||||
textAlign: TextAlign.left,
|
||||
),
|
||||
],
|
||||
|
|
@ -172,9 +171,7 @@ class ExchangeRateSheet extends ConsumerWidget {
|
|||
children: [
|
||||
Text(
|
||||
"Fixed rate",
|
||||
style: STextStyles.titleBold12.copyWith(
|
||||
color: const Color(0xFF44464E),
|
||||
),
|
||||
style: STextStyles.titleBold12,
|
||||
textAlign: TextAlign.left,
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -182,7 +179,9 @@ class ExchangeRateSheet extends ConsumerWidget {
|
|||
),
|
||||
Text(
|
||||
"You will get the exact exchange amount displayed - ChangeNOW takes all the rate risks.",
|
||||
style: STextStyles.itemSubtitle,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
),
|
||||
textAlign: TextAlign.left,
|
||||
)
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
||||
enum StepIndicatorStatus { current, completed, incomplete }
|
||||
|
|
@ -23,11 +22,11 @@ class StepIndicator extends StatelessWidget {
|
|||
Color get background {
|
||||
switch (status) {
|
||||
case StepIndicatorStatus.current:
|
||||
return CFColors.selection;
|
||||
return StackTheme.instance.color.stepIndicatorBGNumber;
|
||||
case StepIndicatorStatus.completed:
|
||||
return CFColors.selection;
|
||||
return StackTheme.instance.color.stepIndicatorBGCheck;
|
||||
case StepIndicatorStatus.incomplete:
|
||||
return CFColors.stackAccent.withOpacity(0.2);
|
||||
return StackTheme.instance.color.stepIndicatorBGInactive;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:stackwallet/pages/exchange_view/sub_widgets/step_indicator.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
||||
class StepRow extends StatelessWidget {
|
||||
|
|
@ -21,7 +20,7 @@ class StepRow extends StatelessWidget {
|
|||
|
||||
Color getColor(int index) {
|
||||
if (current >= count - 1) {
|
||||
return CFColors.stackAccent;
|
||||
return StackTheme.instance.color.accentColorDark;
|
||||
}
|
||||
|
||||
if (current <= index) {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import 'package:stackwallet/providers/exchange/trade_note_service_provider.dart'
|
|||
import 'package:stackwallet/providers/global/trades_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -222,9 +221,9 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
|
|||
trade.statusObject?.status.name ?? trade.statusString,
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: trade.statusObject != null
|
||||
? CFColors.status
|
||||
.forStatus(trade.statusObject!.status)
|
||||
: CFColors.stackAccent,
|
||||
? StackTheme.instance
|
||||
.colorForStatus(trade.statusObject!.status)
|
||||
: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
// ),
|
||||
|
|
@ -238,7 +237,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
|
|||
),
|
||||
if (!sentFromStack && !hasTx)
|
||||
RoundedContainer(
|
||||
color: CFColors.warningBackground,
|
||||
color: StackTheme.instance.color.warningBackground,
|
||||
child: RichText(
|
||||
text: TextSpan(
|
||||
text:
|
||||
|
|
@ -246,7 +245,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
|
|||
trade.fromCurrency.toLowerCase() == "xmr" ? 12 : 8,
|
||||
)} ${trade.fromCurrency.toUpperCase()}. ",
|
||||
style: STextStyles.label.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
children: [
|
||||
|
|
@ -258,7 +257,8 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
|
|||
: 8,
|
||||
)} ${trade.fromCurrency.toUpperCase()}, your transaction may not be converted and it may not be refunded.",
|
||||
style: STextStyles.label.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
|
|
@ -383,12 +383,14 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
|
|||
width: width + 20,
|
||||
height: width + 20,
|
||||
child: QrImage(
|
||||
data: trade.payinAddress,
|
||||
size: width,
|
||||
backgroundColor: CFColors.white,
|
||||
foregroundColor:
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
data: trade.payinAddress,
|
||||
size: width,
|
||||
backgroundColor: StackTheme
|
||||
.instance.color.popupBG,
|
||||
foregroundColor: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -408,10 +410,12 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
|
|||
context),
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style:
|
||||
STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ import 'package:stackwallet/providers/exchange/fixed_rate_exchange_form_provider
|
|||
import 'package:stackwallet/providers/exchange/fixed_rate_market_pairs_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -82,7 +81,7 @@ class _WalletInitiatedExchangeViewState
|
|||
builder: (_) => WillPopScope(
|
||||
onWillPop: () async => false,
|
||||
child: Container(
|
||||
color: CFColors.stackAccent.withOpacity(0.8),
|
||||
color: StackTheme.instance.color.accentColorDark.withOpacity(0.8),
|
||||
child: const CustomLoadingOverlay(
|
||||
message: "Updating exchange rate",
|
||||
eventBus: null,
|
||||
|
|
@ -413,7 +412,7 @@ class _WalletInitiatedExchangeViewState
|
|||
Text(
|
||||
"You will send",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -622,7 +621,10 @@ class _WalletInitiatedExchangeViewState
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.textSubtitle2,
|
||||
borderRadius:
|
||||
BorderRadius
|
||||
.circular(
|
||||
|
|
@ -646,7 +648,7 @@ class _WalletInitiatedExchangeViewState
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
borderRadius:
|
||||
BorderRadius.circular(
|
||||
18),
|
||||
|
|
@ -655,7 +657,8 @@ class _WalletInitiatedExchangeViewState
|
|||
Assets.svg.circleQuestion,
|
||||
width: 18,
|
||||
height: 18,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance
|
||||
.color.textSubtitle2,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
@ -679,10 +682,10 @@ class _WalletInitiatedExchangeViewState
|
|||
.market?.from
|
||||
.toUpperCase())) ??
|
||||
"-",
|
||||
style:
|
||||
STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.smallMed14
|
||||
.copyWith(
|
||||
color: StackTheme.instance
|
||||
.color.accentColorDark),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 6,
|
||||
|
|
@ -706,11 +709,11 @@ class _WalletInitiatedExchangeViewState
|
|||
return Container();
|
||||
}
|
||||
return SvgPicture.asset(
|
||||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: CFColors.stackAccent,
|
||||
);
|
||||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: StackTheme.instance.color
|
||||
.accentColorDark);
|
||||
}),
|
||||
],
|
||||
),
|
||||
|
|
@ -731,7 +734,7 @@ class _WalletInitiatedExchangeViewState
|
|||
child: Text(
|
||||
"You will receive",
|
||||
style: STextStyles.itemSubtitle.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -981,7 +984,10 @@ class _WalletInitiatedExchangeViewState
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.textSubtitle2,
|
||||
borderRadius:
|
||||
BorderRadius
|
||||
.circular(18),
|
||||
|
|
@ -1003,7 +1009,7 @@ class _WalletInitiatedExchangeViewState
|
|||
width: 18,
|
||||
height: 18,
|
||||
decoration: BoxDecoration(
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
borderRadius:
|
||||
BorderRadius.circular(
|
||||
18),
|
||||
|
|
@ -1012,7 +1018,8 @@ class _WalletInitiatedExchangeViewState
|
|||
Assets.svg.circleQuestion,
|
||||
width: 18,
|
||||
height: 18,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme.instance
|
||||
.color.textSubtitle2,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
@ -1036,10 +1043,10 @@ class _WalletInitiatedExchangeViewState
|
|||
.market?.to
|
||||
.toUpperCase())) ??
|
||||
"-",
|
||||
style:
|
||||
STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.smallMed14
|
||||
.copyWith(
|
||||
color: StackTheme.instance
|
||||
.color.accentColorDark),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 6,
|
||||
|
|
@ -1063,11 +1070,11 @@ class _WalletInitiatedExchangeViewState
|
|||
return Container();
|
||||
}
|
||||
return SvgPicture.asset(
|
||||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: CFColors.stackAccent,
|
||||
);
|
||||
Assets.svg.chevronDown,
|
||||
width: 5,
|
||||
height: 2.5,
|
||||
color: StackTheme.instance.color
|
||||
.accentColorDark);
|
||||
}),
|
||||
],
|
||||
),
|
||||
|
|
@ -1216,28 +1223,18 @@ class _WalletInitiatedExchangeViewState
|
|||
),
|
||||
const Spacer(),
|
||||
TextButton(
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
((ref
|
||||
.read(
|
||||
prefsChangeNotifierProvider)
|
||||
.exchangeRateType ==
|
||||
ExchangeRateType.estimated)
|
||||
? ref.watch(
|
||||
estimatedRateExchangeFormProvider
|
||||
.select((value) =>
|
||||
value.canExchange))
|
||||
: ref.watch(
|
||||
fixedRateExchangeFormProvider
|
||||
.select((value) =>
|
||||
value.canExchange)))
|
||||
? CFColors.stackAccent
|
||||
: StackTheme.instance.color
|
||||
.buttonBackSecondary,
|
||||
),
|
||||
),
|
||||
style: ((ref
|
||||
.read(prefsChangeNotifierProvider)
|
||||
.exchangeRateType ==
|
||||
ExchangeRateType.estimated)
|
||||
? ref.watch(estimatedRateExchangeFormProvider
|
||||
.select((value) => value.canExchange))
|
||||
: ref.watch(fixedRateExchangeFormProvider
|
||||
.select((value) => value.canExchange)))
|
||||
? StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context)
|
||||
: StackTheme.instance
|
||||
.getSecondaryEnabledButtonColor(context),
|
||||
onPressed: ((ref
|
||||
.read(prefsChangeNotifierProvider)
|
||||
.exchangeRateType ==
|
||||
|
|
@ -1491,10 +1488,11 @@ class _WalletInitiatedExchangeViewState
|
|||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<
|
||||
Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
MaterialStateProperty
|
||||
.all<Color>(StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
child: Text(
|
||||
"Attempt",
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
|
|||
onTap: _hiddenOptions,
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.stackIcon,
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
width: 24,
|
||||
height: 24,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ class _HomeViewButtonBarState extends ConsumerState<HomeViewButtonBar> {
|
|||
// style: STextStyles.button.copyWith(
|
||||
// fontSize: 14,
|
||||
// color:
|
||||
// selectedIndex == 2 ? CFColors.light1 : CFColors.stackAccent,
|
||||
// selectedIndex == 2 ? CFColors.light1 : StackTheme.instance.color.accentColorDark
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/services/coins/manager.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/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/managed_favorite.dart';
|
||||
|
||||
|
|
@ -44,7 +42,7 @@ class ManageFavoritesView extends StatelessWidget {
|
|||
padding: const EdgeInsets.symmetric(horizontal: 4),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
|
|
@ -69,10 +67,7 @@ class ManageFavoritesView extends StatelessWidget {
|
|||
key: key,
|
||||
itemCount: favorites.length,
|
||||
itemBuilder: (builderContext, index) {
|
||||
final walletId = ref
|
||||
.read(favorites[index]
|
||||
as ChangeNotifierProvider<Manager>)
|
||||
.walletId;
|
||||
final walletId = ref.read(favorites[index]).walletId;
|
||||
return Padding(
|
||||
key: Key(
|
||||
"manageFavoriteWalletsItem_$walletId",
|
||||
|
|
@ -122,7 +117,7 @@ class ManageFavoritesView extends StatelessWidget {
|
|||
child: Text(
|
||||
"Add to favorites",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -136,10 +131,7 @@ class ManageFavoritesView extends StatelessWidget {
|
|||
itemBuilder: (buildContext, index) {
|
||||
// final walletId = ref.watch(
|
||||
// nonFavorites[index].select((value) => value.walletId));
|
||||
final walletId = ref
|
||||
.read(nonFavorites[index]
|
||||
as ChangeNotifierProvider<Manager>)
|
||||
.walletId;
|
||||
final walletId = ref.read(nonFavorites[index]).walletId;
|
||||
return Padding(
|
||||
key: Key(
|
||||
"manageNonFavoriteWalletsItem_$walletId",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import 'package:stackwallet/providers/global/wallets_provider.dart';
|
|||
// import 'package:stackwallet/providers/global/should_show_lockscreen_on_resume_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/biometrics.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
|
||||
|
|
@ -152,8 +151,9 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
|
|||
|
||||
BoxDecoration get _pinPutDecoration {
|
||||
return BoxDecoration(
|
||||
color: CFColors.gray3,
|
||||
border: Border.all(width: 1, color: CFColors.gray3),
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
border:
|
||||
Border.all(width: 1, color: StackTheme.instance.color.textSubtitle2),
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import 'package:qr_flutter/qr_flutter.dart';
|
|||
import 'package:share_plus/share_plus.dart';
|
||||
import 'package:stackwallet/notifications/show_flush_bar.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
|
|
@ -245,13 +244,8 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
|
|||
height: 8,
|
||||
),
|
||||
TextButton(
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context),
|
||||
onPressed: () {
|
||||
final amountString = amountController.text;
|
||||
final noteString = noteController.text;
|
||||
|
|
@ -319,12 +313,14 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
|
|||
width: width + 20,
|
||||
height: width + 20,
|
||||
child: QrImage(
|
||||
data: uriString,
|
||||
size: width,
|
||||
backgroundColor: CFColors.white,
|
||||
foregroundColor:
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
data: uriString,
|
||||
size: width,
|
||||
backgroundColor: StackTheme
|
||||
.instance.color.popupBG,
|
||||
foregroundColor: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -364,11 +360,7 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
|
|||
"Share",
|
||||
textAlign:
|
||||
TextAlign.center,
|
||||
style: STextStyles.button
|
||||
.copyWith(
|
||||
color: CFColors
|
||||
.stackAccent,
|
||||
),
|
||||
style: STextStyles.button,
|
||||
),
|
||||
const SizedBox(
|
||||
height: 2,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import 'package:stackwallet/pages/receive_view/generate_receiving_uri_qr_code_vi
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -202,8 +201,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
|
|||
child: Text(
|
||||
"Generate new address",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -216,10 +214,10 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
|
|||
child: Column(
|
||||
children: [
|
||||
QrImage(
|
||||
data: "${coin.uriScheme}:$receivingAddress",
|
||||
size: MediaQuery.of(context).size.width / 2,
|
||||
foregroundColor: CFColors.stackAccent,
|
||||
),
|
||||
data: "${coin.uriScheme}:$receivingAddress",
|
||||
size: MediaQuery.of(context).size.width / 2,
|
||||
foregroundColor:
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
const SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import 'package:stackwallet/providers/wallet/public_private_balance_state_provid
|
|||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/services/coins/epiccash/epiccash_wallet.dart';
|
||||
import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/format.dart';
|
||||
|
|
@ -116,9 +115,8 @@ class _ConfirmTransactionViewState
|
|||
StackTheme.instance.getSecondaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
"Ok",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
|
|
@ -315,13 +313,14 @@ class _ConfirmTransactionViewState
|
|||
height: 16,
|
||||
),
|
||||
TextButton(
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
final unlocked = await Navigator.push(
|
||||
context,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import 'package:stackwallet/services/coins/manager.dart';
|
|||
import 'package:stackwallet/utilities/address_utils.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
|
|
@ -401,7 +400,7 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
children: [
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
|
|
@ -876,7 +875,8 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
horizontal: 12,
|
||||
),
|
||||
child: RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor:
|
||||
StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -977,7 +977,8 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
Assets.svg.chevronDown,
|
||||
width: 8,
|
||||
height: 4,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle2,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -1068,8 +1069,8 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
child: Text(
|
||||
coin.ticker,
|
||||
style: STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -1170,8 +1171,8 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
ref.watch(prefsChangeNotifierProvider
|
||||
.select((value) => value.currency)),
|
||||
style: STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -1246,7 +1247,8 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
horizontal: 12,
|
||||
),
|
||||
child: RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor:
|
||||
StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -1368,7 +1370,8 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
Assets.svg.chevronDown,
|
||||
width: 8,
|
||||
height: 4,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle2,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -1413,10 +1416,12 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
context),
|
||||
child: Text(
|
||||
"Ok",
|
||||
style:
|
||||
STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
|
|
@ -1475,10 +1480,12 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
context),
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style:
|
||||
STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop(false);
|
||||
|
|
@ -1490,10 +1497,11 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<
|
||||
Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
MaterialStateProperty
|
||||
.all<Color>(StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
child: Text(
|
||||
"Yes",
|
||||
|
|
@ -1604,10 +1612,12 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
context),
|
||||
child: Text(
|
||||
"Ok",
|
||||
style:
|
||||
STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(
|
||||
color: StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
|
|
@ -1623,26 +1633,10 @@ class _SendViewState extends ConsumerState<SendView> {
|
|||
style: ref
|
||||
.watch(previewTxButtonStateProvider.state)
|
||||
.state
|
||||
? Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
)
|
||||
: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent.withOpacity(
|
||||
0.25,
|
||||
),
|
||||
),
|
||||
),
|
||||
? StackTheme.instance
|
||||
.getPrimaryEnabledButtonColor(context)
|
||||
: StackTheme.instance
|
||||
.getPrimaryDisabledButtonColor(context),
|
||||
child: Text(
|
||||
"Preview",
|
||||
style: STextStyles.button,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
|
@ -63,7 +62,7 @@ class _RestoringDialogState extends State<BuildingTransactionDialog>
|
|||
turns: _spinAnimation,
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.arrowRotate,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 24,
|
||||
height: 24,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/providers/wallet/public_private_balance_state_provider.dart';
|
||||
import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -50,9 +49,9 @@ class _FiroBalanceSelectionSheetState
|
|||
final firoWallet = manager.wallet as FiroWallet;
|
||||
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
||||
|
|
@ -56,7 +55,7 @@ class _RestoringDialogState extends State<SendingTransactionDialog>
|
|||
turns: _spinAnimation,
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.arrowRotate,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 24,
|
||||
height: 24,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import 'package:stackwallet/providers/providers.dart';
|
|||
import 'package:stackwallet/providers/ui/fee_rate_type_state_provider.dart';
|
||||
import 'package:stackwallet/providers/wallet/public_private_balance_state_provider.dart';
|
||||
import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
|
||||
|
|
@ -163,9 +162,9 @@ class _TransactionFeeSelectionSheetState
|
|||
.select((value) => value.getManager(walletId)));
|
||||
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter_riverpod/flutter_riverpod.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/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/utilities/constants.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/draggable_switch_button.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
|
@ -42,7 +41,7 @@ class AdvancedSettingsView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -76,7 +75,7 @@ class AdvancedSettingsView extends StatelessWidget {
|
|||
child: Consumer(
|
||||
builder: (_, ref, __) {
|
||||
return RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:event_bus/event_bus.dart';
|
||||
|
|
@ -10,7 +11,6 @@ import 'package:stackwallet/models/isar/models/log.dart';
|
|||
import 'package:stackwallet/notifications/show_flush_bar.dart';
|
||||
import 'package:stackwallet/providers/global/debug_service_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
|
|
@ -117,12 +117,12 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.trash,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
onPressed: () async {
|
||||
showDialog<void>(
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
builder: (_) => StackDialog(
|
||||
title: "Delete logs?",
|
||||
|
|
@ -145,8 +145,7 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
.style
|
||||
?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
child: Text(
|
||||
"Delete logs",
|
||||
|
|
@ -156,7 +155,7 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
Navigator.of(context).pop();
|
||||
|
||||
bool shouldPop = false;
|
||||
showDialog<dynamic>(
|
||||
unawaited(showDialog<dynamic>(
|
||||
barrierDismissible: false,
|
||||
context: context,
|
||||
builder: (_) => WillPopScope(
|
||||
|
|
@ -164,11 +163,11 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
return shouldPop;
|
||||
},
|
||||
child: const CustomLoadingOverlay(
|
||||
message: "Generating Stack logs file",
|
||||
message: "Deleting logs...",
|
||||
eventBus: null,
|
||||
),
|
||||
),
|
||||
);
|
||||
));
|
||||
|
||||
await ref
|
||||
.read(debugServiceProvider)
|
||||
|
|
@ -178,10 +177,10 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
|
||||
if (mounted) {
|
||||
Navigator.pop(context);
|
||||
showFloatingFlushBar(
|
||||
unawaited(showFloatingFlushBar(
|
||||
type: FlushBarType.info,
|
||||
context: context,
|
||||
message: 'Logs cleared!');
|
||||
message: 'Logs cleared!'));
|
||||
}
|
||||
},
|
||||
),
|
||||
|
|
@ -312,7 +311,7 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
if (path != null) {
|
||||
final eventBus = EventBus();
|
||||
bool shouldPop = false;
|
||||
showDialog<dynamic>(
|
||||
unawaited(showDialog<dynamic>(
|
||||
barrierDismissible: false,
|
||||
context: context,
|
||||
builder: (_) => WillPopScope(
|
||||
|
|
@ -324,7 +323,7 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
eventBus: eventBus,
|
||||
),
|
||||
),
|
||||
);
|
||||
));
|
||||
|
||||
await ref
|
||||
.read(debugServiceProvider)
|
||||
|
|
@ -334,10 +333,10 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
|
||||
if (mounted) {
|
||||
Navigator.pop(context);
|
||||
showFloatingFlushBar(
|
||||
unawaited(showFloatingFlushBar(
|
||||
type: FlushBarType.info,
|
||||
context: context,
|
||||
message: 'Logs file saved');
|
||||
message: 'Logs file saved'));
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -378,14 +377,14 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
return Container(
|
||||
key: Key("log_${log.id}_${log.timestampInMillisUTC}"),
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: _borderRadius(index, logs.length),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: RoundedContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
|
|
@ -415,7 +414,8 @@ class _DebugViewState extends ConsumerState<DebugView> {
|
|||
"[${DateTime.fromMillisecondsSinceEpoch(log.timestampInMillisUTC, isUtc: true)}]: ",
|
||||
style: STextStyles.baseXS.copyWith(
|
||||
fontSize: 8,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme
|
||||
.instance.color.textDark3,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/providers.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/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/draggable_switch_button.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
|
@ -46,7 +45,7 @@ class AppearanceSettingsView extends ConsumerWidget {
|
|||
child: Consumer(
|
||||
builder: (_, ref, __) {
|
||||
return RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import 'package:flutter_svg/svg.dart';
|
|||
import 'package:stackwallet/providers/global/base_currencies_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -204,7 +203,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
|
|||
(context, index) {
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: _borderRadius(index),
|
||||
),
|
||||
child: Padding(
|
||||
|
|
@ -214,8 +213,8 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
|
|||
child: RoundedContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
color: currenciesWithoutSelected[index] == current
|
||||
? CFColors.selected
|
||||
: CFColors.white,
|
||||
? StackTheme.instance.color.currencyListItemBG
|
||||
: StackTheme.instance.color.popupBG,
|
||||
child: RawMaterialButton(
|
||||
onPressed: () async {
|
||||
onTap(index);
|
||||
|
|
|
|||
|
|
@ -15,9 +15,8 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/syncing_pr
|
|||
import 'package:stackwallet/pages/settings_views/sub_widgets/settings_list_button.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
||||
|
|
@ -232,7 +231,7 @@ class GlobalSettingsView extends StatelessWidget {
|
|||
// ?.copyWith(
|
||||
// backgroundColor:
|
||||
// MaterialStateProperty.all<Color>(
|
||||
// CFColors.stackAccent,
|
||||
// StackTheme.instance.color.accentColorDark
|
||||
// ),
|
||||
// ),
|
||||
// child: Text(
|
||||
|
|
|
|||
|
|
@ -5,10 +5,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:stackwallet/notifications/show_flush_bar.dart';
|
||||
import 'package:stackwallet/providers/global/debug_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.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/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
||||
class HiddenSettings extends StatelessWidget {
|
||||
|
|
@ -65,8 +64,8 @@ class HiddenSettings extends StatelessWidget {
|
|||
child: Text(
|
||||
"Delete notifications",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
@ -93,7 +92,7 @@ class HiddenSettings extends StatelessWidget {
|
|||
// child: Text(
|
||||
// "Delete trade history",
|
||||
// style: STextStyles.button.copyWith(
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
|
|
@ -119,8 +118,8 @@ class HiddenSettings extends StatelessWidget {
|
|||
child: Text(
|
||||
"Delete Debug Logs",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
@ -148,7 +147,7 @@ class HiddenSettings extends StatelessWidget {
|
|||
// child: Text(
|
||||
// "Lottie test",
|
||||
// style: STextStyles.button.copyWith(
|
||||
// color: CFColors.stackAccent,
|
||||
// color: StackTheme.instance.color.accentColorDark
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/languages_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -202,7 +201,7 @@ class _LanguageViewState extends ConsumerState<LanguageSettingsView> {
|
|||
(context, index) {
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: _borderRadius(index),
|
||||
),
|
||||
child: Padding(
|
||||
|
|
@ -212,8 +211,8 @@ class _LanguageViewState extends ConsumerState<LanguageSettingsView> {
|
|||
child: RoundedContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
color: index == 0
|
||||
? CFColors.selected
|
||||
: CFColors.white,
|
||||
? StackTheme.instance.color.currencyListItemBG
|
||||
: StackTheme.instance.color.popupBG,
|
||||
child: RawMaterialButton(
|
||||
onPressed: () async {
|
||||
onTap(index);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import 'package:stackwallet/notifications/show_flush_bar.dart';
|
|||
import 'package:stackwallet/providers/global/node_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -119,6 +118,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
case Coin.firo:
|
||||
case Coin.namecoin:
|
||||
case Coin.bitcoinTestNet:
|
||||
case Coin.bitcoincashTestnet:
|
||||
case Coin.firoTestNet:
|
||||
case Coin.dogecoinTestNet:
|
||||
final client = ElectrumX(
|
||||
|
|
@ -140,17 +140,17 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
|
||||
if (showFlushBar) {
|
||||
if (testPassed) {
|
||||
showFloatingFlushBar(
|
||||
unawaited(showFloatingFlushBar(
|
||||
type: FlushBarType.success,
|
||||
message: "Server ping success",
|
||||
context: context,
|
||||
);
|
||||
));
|
||||
} else {
|
||||
showFloatingFlushBar(
|
||||
unawaited(showFloatingFlushBar(
|
||||
type: FlushBarType.warning,
|
||||
message: "Server unreachable",
|
||||
context: context,
|
||||
);
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -226,7 +226,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.trash,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
@ -299,8 +299,8 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
"Test connection",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: testConnectionEnabled
|
||||
? CFColors.stackAccent
|
||||
: CFColors.white,
|
||||
? StackTheme.instance.color.textDark
|
||||
: StackTheme.instance.color.textWhite,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -334,8 +334,8 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme.instance.color
|
||||
.accentColorDark),
|
||||
),
|
||||
),
|
||||
rightButton: TextButton(
|
||||
|
|
@ -347,10 +347,11 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<
|
||||
Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
MaterialStateProperty
|
||||
.all<Color>(StackTheme
|
||||
.instance
|
||||
.color
|
||||
.accentColorDark),
|
||||
),
|
||||
child: Text(
|
||||
"Save",
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ import 'package:flutter_svg/svg.dart';
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart';
|
||||
import 'package:stackwallet/pages/settings_views/sub_widgets/nodes_list.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:tuple/tuple.dart';
|
||||
|
||||
|
|
@ -66,7 +65,7 @@ class _CoinNodesViewState extends ConsumerState<CoinNodesView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.plus,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -4,11 +4,10 @@ import 'package:flutter_svg/svg.dart';
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/manage_nodes_views/coin_nodes_view.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/enums/coin_enum.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/rounded_white_container.dart';
|
||||
|
||||
|
|
@ -83,7 +82,7 @@ class _ManageNodesViewState extends ConsumerState<ManageNodesView> {
|
|||
child: RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
|
|||
|
|
@ -7,10 +7,8 @@ import 'package:flutter_svg/svg.dart';
|
|||
import 'package:stackwallet/electrumx_rpc/electrumx.dart';
|
||||
import 'package:stackwallet/notifications/show_flush_bar.dart';
|
||||
import 'package:stackwallet/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart';
|
||||
import 'package:stackwallet/providers/global/node_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
|
||||
|
|
@ -104,6 +102,9 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
|
|||
case Coin.bitcoinTestNet:
|
||||
case Coin.firoTestNet:
|
||||
case Coin.dogecoinTestNet:
|
||||
case Coin.bitcoincash:
|
||||
case Coin.namecoin:
|
||||
case Coin.bitcoincashTestnet:
|
||||
final client = ElectrumX(
|
||||
host: node!.host,
|
||||
port: node.port,
|
||||
|
|
@ -173,7 +174,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.pencil,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
@ -230,8 +231,8 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
|
|||
child: Text(
|
||||
"Test connection",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import 'package:google_fonts/google_fonts.dart';
|
|||
import 'package:stackwallet/notifications/show_flush_bar.dart';
|
||||
import 'package:stackwallet/pages/settings_views/global_settings_view/security_views/security_view.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
|
||||
|
|
@ -32,8 +31,9 @@ class ChangePinView extends StatefulWidget {
|
|||
class _ChangePinViewState extends State<ChangePinView> {
|
||||
BoxDecoration get _pinPutDecoration {
|
||||
return BoxDecoration(
|
||||
color: CFColors.gray3,
|
||||
border: Border.all(width: 1, color: CFColors.gray3),
|
||||
color: StackTheme.instance.color.textSubtitle2,
|
||||
border:
|
||||
Border.all(width: 1, color: StackTheme.instance.color.textSubtitle2),
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ import 'package:stackwallet/pages/pinpad_views/lock_screen_view.dart';
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart';
|
||||
import 'package:stackwallet/providers/global/prefs_provider.dart';
|
||||
import 'package:stackwallet/route_generator.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/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/draggable_switch_button.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
|
@ -44,7 +43,7 @@ class SecurityView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -93,7 +92,7 @@ class SecurityView extends StatelessWidget {
|
|||
child: Consumer(
|
||||
builder: (_, ref, __) {
|
||||
return RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart';
|
||||
import 'package:stackwallet/providers/global/auto_swb_service_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
|
||||
import 'package:stackwallet/utilities/format.dart';
|
||||
|
|
@ -86,7 +85,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
child: Text(
|
||||
"Back",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
@ -96,7 +95,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
rightButton: TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
|
|
@ -142,7 +141,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
child: Text(
|
||||
"Back",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
@ -152,7 +151,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
rightButton: TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
|
|
@ -243,7 +242,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -356,7 +355,8 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
controller: fileLocationController,
|
||||
enabled: false,
|
||||
style: STextStyles.field.copyWith(
|
||||
color: CFColors.stackAccent.withOpacity(0.5),
|
||||
color:
|
||||
StackTheme.instance.color.textDark.withOpacity(0.5),
|
||||
),
|
||||
readOnly: true,
|
||||
enableSuggestions: false,
|
||||
|
|
@ -386,7 +386,8 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
controller: passwordController,
|
||||
enabled: false,
|
||||
style: STextStyles.field.copyWith(
|
||||
color: CFColors.stackAccent.withOpacity(0.5),
|
||||
color:
|
||||
StackTheme.instance.color.textDark.withOpacity(0.5),
|
||||
),
|
||||
obscureText: true,
|
||||
enableSuggestions: false,
|
||||
|
|
@ -418,7 +419,8 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
|
|||
controller: frequencyController,
|
||||
enabled: false,
|
||||
style: STextStyles.field.copyWith(
|
||||
color: CFColors.stackAccent.withOpacity(0.5),
|
||||
color:
|
||||
StackTheme.instance.color.textDark.withOpacity(0.5),
|
||||
),
|
||||
toolbarOptions: const ToolbarOptions(
|
||||
copy: true,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/sub_views/backup_frequency_type_select_sheet.dart';
|
||||
import 'package:stackwallet/providers/global/prefs_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
|
||||
|
|
@ -165,7 +164,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.folder,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -224,7 +223,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -350,7 +349,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -386,7 +385,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
|
|||
),
|
||||
Positioned.fill(
|
||||
child: RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -423,7 +422,8 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
|
|||
padding: const EdgeInsets.only(right: 4.0),
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.chevronDown,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle2,
|
||||
width: 12,
|
||||
height: 6,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
import 'package:flutter/material.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/theme/stack_theme.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/rounded_white_container.dart';
|
||||
|
||||
|
|
@ -69,8 +68,7 @@ class CreateBackupInfoView extends StatelessWidget {
|
|||
.style
|
||||
?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import 'package:stackwallet/notifications/show_flush_bar.dart';
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart';
|
||||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/helpers/stack_file_system.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
|
|
@ -165,7 +164,8 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.folder,
|
||||
color: CFColors.neutral50,
|
||||
color:
|
||||
StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -228,7 +228,8 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color:
|
||||
StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -357,7 +358,8 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color:
|
||||
StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
|
@ -34,7 +33,7 @@ class CancelStackRestoreDialog extends StatelessWidget {
|
|||
child: Text(
|
||||
"Yes, cancel",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.buttonTextPrimary,
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/sub_views/backup_frequency_type_select_sheet.dart';
|
||||
import 'package:stackwallet/providers/global/prefs_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
|
||||
|
|
@ -167,7 +166,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.folder,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -226,7 +225,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -352,7 +351,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -388,7 +387,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
|
|||
),
|
||||
Positioned.fill(
|
||||
child: RawMaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -425,7 +424,8 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
|
|||
padding: const EdgeInsets.only(right: 4.0),
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.chevronDown,
|
||||
color: CFColors.gray3,
|
||||
color: StackTheme
|
||||
.instance.color.textSubtitle2,
|
||||
width: 12,
|
||||
height: 6,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -129,7 +128,8 @@ class _RestoreFromEncryptedStringViewState
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color:
|
||||
StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -189,7 +189,8 @@ class _RestoreFromEncryptedStringViewState
|
|||
"Decrypting Stack backup file",
|
||||
style: STextStyles.pageTitleH2
|
||||
.copyWith(
|
||||
color: CFColors.white,
|
||||
color: StackTheme
|
||||
.instance.color.textWhite,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
|
|
@ -139,7 +138,7 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.folder,
|
||||
color: CFColors.neutral50,
|
||||
color: StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -197,7 +196,8 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
|
|||
hidePassword
|
||||
? Assets.svg.eye
|
||||
: Assets.svg.eyeSlash,
|
||||
color: CFColors.neutral50,
|
||||
color:
|
||||
StackTheme.instance.color.textDark3,
|
||||
width: 16,
|
||||
height: 16,
|
||||
),
|
||||
|
|
@ -270,7 +270,8 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
|
|||
"Decrypting Stack backup file",
|
||||
style: STextStyles.pageTitleH2
|
||||
.copyWith(
|
||||
color: CFColors.white,
|
||||
color: StackTheme
|
||||
.instance.color.textWhite,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
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/restore_from_file_view.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/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/rounded_white_container.dart';
|
||||
|
||||
|
|
@ -43,7 +42,7 @@ class StackBackupView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -84,7 +83,7 @@ class StackBackupView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -126,7 +125,7 @@ class StackBackupView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.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/enums/backup_frequency_type.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -32,9 +31,9 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
|
|||
return false;
|
||||
},
|
||||
child: Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
|
|
@ -11,7 +13,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/providers/stack_restore/stack_restoring_ui_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/stack_restoring_status.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -40,7 +41,7 @@ class _StackRestoreProgressViewState
|
|||
extends ConsumerState<StackRestoreProgressView> {
|
||||
Future<void> _cancel() async {
|
||||
bool shouldPop = false;
|
||||
showDialog<void>(
|
||||
unawaited(showDialog<void>(
|
||||
barrierDismissible: false,
|
||||
context: context,
|
||||
builder: (_) => WillPopScope(
|
||||
|
|
@ -57,7 +58,7 @@ class _StackRestoreProgressViewState
|
|||
child: Text(
|
||||
"Cancelling restore. Please wait.",
|
||||
style: STextStyles.pageTitleH2.copyWith(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.textWhite,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -73,7 +74,7 @@ class _StackRestoreProgressViewState
|
|||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
));
|
||||
|
||||
await SWB.cancelRestore();
|
||||
shouldPop = true;
|
||||
|
|
@ -245,7 +246,8 @@ class _StackRestoreProgressViewState
|
|||
Assets.svg.gear,
|
||||
width: 16,
|
||||
height: 16,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -280,11 +282,12 @@ class _StackRestoreProgressViewState
|
|||
padding: const EdgeInsets.all(0),
|
||||
color:
|
||||
StackTheme.instance.color.buttonBackSecondary,
|
||||
child: const Center(
|
||||
child: Center(
|
||||
child: AddressBookIcon(
|
||||
width: 16,
|
||||
height: 16,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -324,7 +327,8 @@ class _StackRestoreProgressViewState
|
|||
Assets.svg.node,
|
||||
width: 16,
|
||||
height: 16,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -364,7 +368,8 @@ class _StackRestoreProgressViewState
|
|||
Assets.svg.arrowRotate2,
|
||||
width: 16,
|
||||
height: 16,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -428,10 +433,11 @@ class _StackRestoreProgressViewState
|
|||
}
|
||||
}
|
||||
},
|
||||
style: StackTheme.instance.getSecondaryEnabledButtonColor(context),
|
||||
child: Text(
|
||||
_success ? "OK" : "Cancel restore process",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.buttonTextPrimary,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/stack_back
|
|||
import 'package:stackwallet/providers/stack_restore/stack_restoring_ui_state_provider.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/stack_restoring_status.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -36,7 +35,7 @@ class _RestoringWalletCardState extends ConsumerState<RestoringWalletCard> {
|
|||
case StackRestoringStatus.waiting:
|
||||
return SvgPicture.asset(
|
||||
Assets.svg.loader,
|
||||
color:StackTheme.instance.color.buttonBackSecondary,
|
||||
color: StackTheme.instance.color.buttonBackSecondary,
|
||||
);
|
||||
case StackRestoringStatus.restoring:
|
||||
return const LoadingIndicator();
|
||||
|
|
@ -74,7 +73,7 @@ class _RestoringWalletCardState extends ConsumerState<RestoringWalletCard> {
|
|||
height: 32,
|
||||
child: RoundedContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
color: CFColors.coin.forCoin(coin),
|
||||
color: StackTheme.instance.colorForCoin(coin),
|
||||
child: Center(
|
||||
child: SvgPicture.asset(
|
||||
Assets.svg.iconFor(
|
||||
|
|
@ -163,7 +162,7 @@ class _RestoringWalletCardState extends ConsumerState<RestoringWalletCard> {
|
|||
),
|
||||
child: RawMaterialButton(
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
1000,
|
||||
|
|
@ -188,8 +187,7 @@ class _RestoringWalletCardState extends ConsumerState<RestoringWalletCard> {
|
|||
child: Text(
|
||||
"Show recovery phrase",
|
||||
style: STextStyles.infoSmall.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class _StartupPreferencesViewState
|
|||
Padding(
|
||||
padding: const EdgeInsets.all(4.0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
@ -129,7 +129,7 @@ class _StartupPreferencesViewState
|
|||
Padding(
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
@ -224,7 +224,7 @@ class _StartupPreferencesViewState
|
|||
),
|
||||
Flexible(
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -91,8 +90,8 @@ class _StartupWalletSelectionViewState
|
|||
children: [
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.coin
|
||||
.forCoin(manager.coin)
|
||||
color: StackTheme.instance
|
||||
.colorForCoin(manager.coin)
|
||||
.withOpacity(0.5),
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/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/rounded_white_container.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
|
@ -51,7 +50,7 @@ class SupportView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -95,7 +94,7 @@ class SupportView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -139,7 +138,7 @@ class SupportView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -183,7 +182,7 @@ class SupportView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
@ -227,7 +226,7 @@ class SupportView extends StatelessWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class SyncingOptionsView extends ConsumerWidget {
|
|||
Padding(
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
@ -139,7 +139,7 @@ class SyncingOptionsView extends ConsumerWidget {
|
|||
Padding(
|
||||
padding: const EdgeInsets.all(4.0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
@ -227,7 +227,7 @@ class SyncingOptionsView extends ConsumerWidget {
|
|||
Padding(
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
@ -343,7 +343,7 @@ class SyncingOptionsView extends ConsumerWidget {
|
|||
),
|
||||
Flexible(
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
|
|||
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/providers/providers.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/enums/sync_type_enum.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/draggable_switch_button.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
|
@ -58,7 +57,7 @@ class SyncingPreferencesView extends ConsumerWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
padding: const EdgeInsets.all(0),
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
|
|
@ -105,7 +104,7 @@ class SyncingPreferencesView extends ConsumerWidget {
|
|||
child: Consumer(
|
||||
builder: (_, ref, __) {
|
||||
return RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
materialTapTargetSize:
|
||||
MaterialTapTargetSize.shrinkWrap,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
|
|
|||
|
|
@ -4,13 +4,12 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/sync_type_enum.dart';
|
||||
import 'package:stackwallet/utilities/format.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/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/draggable_switch_button.dart';
|
||||
|
|
@ -83,8 +82,8 @@ class WalletSyncingOptionsView extends ConsumerWidget {
|
|||
children: [
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.coin
|
||||
.forCoin(manager.coin)
|
||||
color: StackTheme.instance
|
||||
.colorForCoin(manager.coin)
|
||||
.withOpacity(0.5),
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -22,7 +21,7 @@ class SettingsListButton extends StatelessWidget {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
constraints: const BoxConstraints(
|
||||
minHeight: 32,
|
||||
minWidth: 32,
|
||||
|
|
@ -52,7 +51,7 @@ class SettingsListButton extends StatelessWidget {
|
|||
child: Center(
|
||||
child: SvgPicture.asset(
|
||||
iconAssetName,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: iconSize,
|
||||
height: iconSize,
|
||||
),
|
||||
|
|
@ -67,7 +66,7 @@ class SettingsListButton extends StatelessWidget {
|
|||
child: Text(
|
||||
title,
|
||||
style: STextStyles.smallMed14.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import 'package:stackwallet/pages/add_wallet_views/new_wallet_recovery_phrase_vi
|
|||
import 'package:stackwallet/providers/global/wallets_provider.dart';
|
||||
import 'package:stackwallet/utilities/address_utils.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -105,7 +104,7 @@ class WalletBackupView extends ConsumerWidget {
|
|||
),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius:
|
||||
BorderRadius.circular(Constants.size.circularBorderRadius),
|
||||
),
|
||||
|
|
@ -134,8 +133,7 @@ class WalletBackupView extends ConsumerWidget {
|
|||
TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
String data = AddressUtils.encodeQRSeedData(mnemonic);
|
||||
|
|
@ -166,11 +164,12 @@ class WalletBackupView extends ConsumerWidget {
|
|||
width: width + 20,
|
||||
height: width + 20,
|
||||
child: QrImage(
|
||||
data: data,
|
||||
size: width,
|
||||
backgroundColor: CFColors.white,
|
||||
foregroundColor: CFColors.stackAccent,
|
||||
),
|
||||
data: data,
|
||||
size: width,
|
||||
backgroundColor:
|
||||
StackTheme.instance.color.popupBG,
|
||||
foregroundColor: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -190,8 +189,8 @@ class WalletBackupView extends ConsumerWidget {
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/stack_dialog.dart';
|
||||
|
||||
|
|
@ -63,7 +62,7 @@ class _RescanningDialogState extends State<RescanningDialog>
|
|||
Assets.svg.arrowRotate3,
|
||||
width: 24,
|
||||
height: 24,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
// rightButton: TextButton(
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import 'package:stackwallet/services/event_bus/events/global/refresh_percent_cha
|
|||
import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
|
||||
import 'package:stackwallet/services/event_bus/global_event_bus.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -309,7 +308,7 @@ class _WalletNetworkSettingsViewState
|
|||
color: StackTheme.instance.color.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.verticalEllipsis,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
|
|
@ -326,7 +325,7 @@ class _WalletNetworkSettingsViewState
|
|||
right: 10,
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius),
|
||||
// boxShadow: [CFColors.standardBoxShadow],
|
||||
|
|
@ -631,7 +630,7 @@ class _WalletNetworkSettingsViewState
|
|||
top: 12,
|
||||
),
|
||||
child: RoundedContainer(
|
||||
color: CFColors.warningBackground,
|
||||
color: StackTheme.instance.color.warningBackground,
|
||||
child: Text(
|
||||
"Please check your internet connection and make sure your current node is not having issues.",
|
||||
style: STextStyles.baseXS,
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import 'package:stackwallet/services/event_bus/events/global/node_connection_sta
|
|||
import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
|
||||
import 'package:stackwallet/services/event_bus/global_event_bus.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
|
|
@ -303,8 +302,8 @@ class _WalletSettingsViewState extends State<WalletSettingsView> {
|
|||
child: Text(
|
||||
"Log out",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
);
|
||||
},
|
||||
|
|
@ -406,9 +405,8 @@ class _EpiBoxInfoFormState extends ConsumerState<EpicBoxInfoForm> {
|
|||
},
|
||||
child: Text(
|
||||
"Save",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import 'package:stackwallet/pages/home_view/home_view.dart';
|
|||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/services/coins/manager.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/clipboard_interface.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
|
||||
|
|
@ -120,7 +119,7 @@ class _DeleteWalletRecoveryPhraseViewState
|
|||
),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius:
|
||||
BorderRadius.circular(Constants.size.circularBorderRadius),
|
||||
),
|
||||
|
|
@ -129,8 +128,7 @@ class _DeleteWalletRecoveryPhraseViewState
|
|||
child: Text(
|
||||
"Please write down your recovery phrase in the correct order and save it to keep your funds secure. You will also be asked to verify the words on the next screen.",
|
||||
style: STextStyles.label.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -151,8 +149,7 @@ class _DeleteWalletRecoveryPhraseViewState
|
|||
TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
showDialog<dynamic>(
|
||||
|
|
@ -169,15 +166,13 @@ class _DeleteWalletRecoveryPhraseViewState
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
rightButton: TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
final walletId = _manager.walletId;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.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';
|
||||
|
|
@ -52,7 +51,7 @@ class DeleteWalletWarningView extends ConsumerWidget {
|
|||
height: 16,
|
||||
),
|
||||
RoundedContainer(
|
||||
color: CFColors.warningBackground,
|
||||
color: StackTheme.instance.color.warningBackground,
|
||||
child: Text(
|
||||
"You are going to permanently delete you wallet.\n\nIf you delete your wallet, the only way you can have access to your funds is by using your backup key.\n\nStack Wallet does not keep nor is able to restore your backup key or your wallet.\n\nPLEASE SAVE YOUR BACKUP KEY.",
|
||||
style: STextStyles.baseXS,
|
||||
|
|
@ -67,9 +66,8 @@ class DeleteWalletWarningView extends ConsumerWidget {
|
|||
},
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
style: STextStyles.button
|
||||
.copyWith(color: StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
|
|
@ -78,8 +76,7 @@ class DeleteWalletWarningView extends ConsumerWidget {
|
|||
TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
final manager = ref
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/notifications/show_flush_bar.dart';
|
||||
import 'package:stackwallet/providers/providers.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/enums/flush_bar_type.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/icon_widgets/x_icon.dart';
|
||||
import 'package:stackwallet/widgets/stack_text_field.dart';
|
||||
|
|
@ -109,8 +108,7 @@ class _RenameWalletViewState extends ConsumerState<RenameWalletView> {
|
|||
TextButton(
|
||||
style: Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor: MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () async {
|
||||
final newName = _controller.text;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_set
|
|||
import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/route_generator.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
|
|
@ -51,7 +50,7 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -86,7 +85,7 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget {
|
|||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(0),
|
||||
child: RawMaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
@ -110,18 +109,19 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget {
|
|||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button.copyWith(
|
||||
color: CFColors.stackAccent,
|
||||
),
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark),
|
||||
),
|
||||
),
|
||||
rightButton: TextButton(
|
||||
style:
|
||||
Theme.of(context).textButtonTheme.style?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(
|
||||
CFColors.stackAccent,
|
||||
),
|
||||
),
|
||||
style: Theme.of(context)
|
||||
.textButtonTheme
|
||||
.style
|
||||
?.copyWith(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all<Color>(StackTheme
|
||||
.instance.color.accentColorDark),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.pop(context);
|
||||
Navigator.push(
|
||||
|
|
|
|||
|
|
@ -6,9 +6,8 @@ import 'package:stackwallet/models/paymint/transactions_model.dart';
|
|||
import 'package:stackwallet/pages/wallet_view/sub_widgets/no_transactions_found.dart';
|
||||
import 'package:stackwallet/providers/global/wallets_provider.dart';
|
||||
import 'package:stackwallet/services/coins/manager.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/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/loading_indicator.dart';
|
||||
import 'package:stackwallet/widgets/transaction_card.dart';
|
||||
|
||||
|
|
@ -128,7 +127,7 @@ class _TransactionsListState extends ConsumerState<TransactionsList> {
|
|||
final tx = list[index];
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: radius,
|
||||
),
|
||||
child: TransactionCard(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/providers/wallet/wallet_balance_toggle_state_provider.dart';
|
||||
import 'package:stackwallet/utilities/cfcolors.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/wallet_balance_toggle_state.dart';
|
||||
|
|
@ -25,9 +24,9 @@ class WalletBalanceToggleSheet extends ConsumerWidget {
|
|||
.select((value) => value.getManager(walletId).coin));
|
||||
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
color: CFColors.white,
|
||||
borderRadius: BorderRadius.vertical(
|
||||
decoration: BoxDecoration(
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
|
|
@ -126,7 +125,7 @@ class WalletBalanceToggleSheet extends ConsumerWidget {
|
|||
Text(
|
||||
"Current spendable (unlocked) balance",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color: CFColors.neutral60,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
@ -145,7 +144,7 @@ class WalletBalanceToggleSheet extends ConsumerWidget {
|
|||
Text(
|
||||
"Current private spendable (unlocked) balance",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color: CFColors.neutral60,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
@ -213,7 +212,7 @@ class WalletBalanceToggleSheet extends ConsumerWidget {
|
|||
Text(
|
||||
"Total wallet balance",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color: CFColors.neutral60,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
@ -232,7 +231,7 @@ class WalletBalanceToggleSheet extends ConsumerWidget {
|
|||
Text(
|
||||
"Current public spendable (unlocked) balance",
|
||||
style: STextStyles.itemSubtitle12.copyWith(
|
||||
color: CFColors.neutral60,
|
||||
color: StackTheme.instance.color.textSubtitle1,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/theme/stack_theme.dart';
|
||||
|
||||
class WalletNavigationBar extends StatelessWidget {
|
||||
const WalletNavigationBar({
|
||||
|
|
@ -28,8 +27,8 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
return Container(
|
||||
height: height,
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.white,
|
||||
boxShadow: const [CFColors.standardBoxShadow],
|
||||
color: StackTheme.instance.color.popupBG,
|
||||
boxShadow: [StackTheme.instance.standardBoxShadow],
|
||||
borderRadius: BorderRadius.circular(
|
||||
height / 2.0,
|
||||
),
|
||||
|
|
@ -50,7 +49,7 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
minWidth: 66,
|
||||
),
|
||||
onPressed: onReceivePressed,
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
height / 2.0,
|
||||
|
|
@ -66,7 +65,8 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
const Spacer(),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.stackAccent.withOpacity(0.4),
|
||||
color: StackTheme.instance.color.accentColorDark
|
||||
.withOpacity(0.4),
|
||||
borderRadius: BorderRadius.circular(
|
||||
24,
|
||||
),
|
||||
|
|
@ -77,7 +77,7 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
Assets.svg.arrowDownLeft,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -99,7 +99,7 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
minWidth: 66,
|
||||
),
|
||||
onPressed: onSendPressed,
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
height / 2.0,
|
||||
|
|
@ -115,7 +115,8 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
const Spacer(),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.stackAccent.withOpacity(0.4),
|
||||
color: StackTheme.instance.color.accentColorDark
|
||||
.withOpacity(0.4),
|
||||
borderRadius: BorderRadius.circular(
|
||||
24,
|
||||
),
|
||||
|
|
@ -126,7 +127,7 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
Assets.svg.arrowUpRight,
|
||||
width: 12,
|
||||
height: 12,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -149,7 +150,7 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
minWidth: 66,
|
||||
),
|
||||
onPressed: onExchangePressed,
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
height / 2.0,
|
||||
|
|
@ -237,7 +238,7 @@ class WalletNavigationBar extends StatelessWidget {
|
|||
// Widget build(BuildContext context) {
|
||||
// return Container(
|
||||
// child: MaterialButton(
|
||||
// splashColor: CFColors.splashLight,
|
||||
// splashColor: StackTheme.instance.color.highlight,
|
||||
// padding: const EdgeInsets.all(0),
|
||||
// minWidth: 45,
|
||||
// shape: RoundedRectangleBorder(
|
||||
|
|
|
|||
|
|
@ -8,9 +8,8 @@ import 'package:stackwallet/providers/global/wallets_provider.dart';
|
|||
import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
|
||||
import 'package:stackwallet/services/event_bus/global_event_bus.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/theme/stack_theme.dart';
|
||||
|
||||
/// [eventBus] should only be set during testing
|
||||
class WalletRefreshButton extends ConsumerStatefulWidget {
|
||||
|
|
@ -97,7 +96,7 @@ class _RefreshButtonState extends ConsumerState<WalletRefreshButton>
|
|||
height: 36,
|
||||
width: 36,
|
||||
child: MaterialButton(
|
||||
splashColor: CFColors.splashLight,
|
||||
splashColor: StackTheme.instance.color.highlight,
|
||||
onPressed: () {
|
||||
final managerProvider = ref
|
||||
.read(walletsChangeNotifierProvider)
|
||||
|
|
@ -124,7 +123,7 @@ class _RefreshButtonState extends ConsumerState<WalletRefreshButton>
|
|||
Assets.svg.arrowRotate,
|
||||
width: 24,
|
||||
height: 24,
|
||||
color: CFColors.stackAccent,
|
||||
color: StackTheme.instance.color.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@ import 'package:stackwallet/pages/wallet_view/sub_widgets/wallet_summary_info.da
|
|||
import 'package:stackwallet/services/coins/manager.dart';
|
||||
import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/theme/stack_theme.dart';
|
||||
|
||||
class WalletSummary extends StatelessWidget {
|
||||
const WalletSummary({
|
||||
|
|
@ -49,7 +48,7 @@ class WalletSummary extends StatelessWidget {
|
|||
builder: (_, ref, __) {
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: CFColors.coin.forCoin(ref
|
||||
color: StackTheme.instance.colorForCoin(ref
|
||||
.watch(managerProvider.select((value) => value.coin))),
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
|
|
|
|||
|
|
@ -10,12 +10,11 @@ import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
|
|||
import 'package:stackwallet/services/coins/manager.dart';
|
||||
import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
|
||||
import 'package:stackwallet/utilities/assets.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/wallet_balance_toggle_state.dart';
|
||||
import 'package:stackwallet/utilities/format.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_theme.dart';
|
||||
import 'package:stackwallet/widgets/animated_text.dart';
|
||||
|
||||
class WalletSummaryInfo extends StatefulWidget {
|
||||
|
|
@ -145,7 +144,8 @@ class _WalletSummaryInfoState extends State<WalletSummaryInfo> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.chevronDown,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
width: 8,
|
||||
height: 4,
|
||||
),
|
||||
|
|
@ -205,7 +205,8 @@ class _WalletSummaryInfoState extends State<WalletSummaryInfo> {
|
|||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.chevronDown,
|
||||
color: CFColors.stackAccent,
|
||||
color:
|
||||
StackTheme.instance.color.accentColorDark,
|
||||
width: 8,
|
||||
height: 4,
|
||||
),
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue