Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-15 16:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove CFColors and some more dark color fixes

Browse source
This commit is contained in:
julian 2022-09-21 16:49:48 -06:00
parent e830286511
commit f25d9eecef
45 changed files with 86 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my
import 'package:stackwallet/providers/global/wallets_service_provider.dart';
import 'package:stackwallet/providers/ui/verify_recovery_phrase/mnemonic_word_count_state_provider.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/add_wallet_type_enum.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';

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

@ -14,7 +14,7 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my
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';
@ -148,6 +148,7 @@ class _NewWalletRecoveryPhraseViewState
Assets.svg.copy,
width: 24,
height: 24,
color: StackTheme.instance.color.topNavIconPrimary,
),
onPressed: () async {
await _copy();

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

@ -119,9 +119,7 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
),
Text(
"${lengthOptions[i]} words",
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
],

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

@ -1,7 +1,7 @@
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';

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

@ -12,7 +12,7 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my
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/constants.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/text_styles.dart';

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

@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/global/prefs_provider.dart';
import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart';
import 'package:stackwallet/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:stackwallet/widgets/rounded_white_container.dart';

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

@ -8,7 +8,7 @@ import 'package:stackwallet/providers/ui/address_book_providers/address_entry_da
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';

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

@ -1461,6 +1461,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
debugPrint("name: ${manager.walletName}");
// TODO store tx data completely locally in isar so we don't lock up ui here when querying txData
final txData = await manager.transactionData;
final tx = txData.getAllTransactions()[txid];

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

@ -1483,17 +1483,9 @@ class _WalletInitiatedExchangeViewState
},
),
rightButton: TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty
.all<Color>(StackTheme
.instance
.color
.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(
context),
child: Text(
"Attempt",
style: STextStyles.button,

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

@ -144,7 +144,6 @@ class _HomeViewState extends ConsumerState<HomeView> {
onTap: _hiddenOptions,
child: SvgPicture.asset(
Assets.svg.stackIcon,
// color: StackTheme.instance.color.accentColorDark
width: 24,
height: 24,
),

2
lib/pages/loading_view.dart
View file

@ -3,7 +3,7 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:lottie/lottie.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
class LoadingView extends StatelessWidget {

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

@ -3,9 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/notifications/notification_card.dart';
import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/providers/ui/unread_notifications_provider.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';

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

@ -313,14 +313,7 @@ class _ConfirmTransactionViewState
height: 16,
),
TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty.all<Color>(StackTheme
.instance.color.accentColorDark),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () async {
final unlocked = await Navigator.push(
context,

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

@ -1492,17 +1492,9 @@ class _SendViewState extends ConsumerState<SendView> {
},
),
rightButton: TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty
.all<Color>(StackTheme
.instance
.color
.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(
context),
child: Text(
"Yes",
style: STextStyles.button,

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

@ -144,9 +144,7 @@ class _FiroBalanceSelectionSheetState
// children: [
Text(
"Private balance",
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
const SizedBox(
@ -235,9 +233,7 @@ class _FiroBalanceSelectionSheetState
// children: [
Text(
"Public balance",
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
const SizedBox(

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

@ -263,9 +263,7 @@ class _TransactionFeeSelectionSheetState
children: [
Text(
FeeRateType.fast.prettyName,
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
const SizedBox(
@ -388,9 +386,7 @@ class _TransactionFeeSelectionSheetState
children: [
Text(
FeeRateType.average.prettyName,
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
const SizedBox(
@ -514,9 +510,7 @@ class _TransactionFeeSelectionSheetState
children: [
Text(
FeeRateType.slow.prettyName,
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
const SizedBox(

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

@ -140,13 +140,8 @@ class _DebugViewState extends ConsumerState<DebugView> {
},
),
rightButton: TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
child: Text(
"Delete logs",
style: STextStyles.button,

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

@ -342,17 +342,9 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
onPressed: () async {
Navigator.of(context).pop(true);
},
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty
.all<Color>(StackTheme
.instance
.color
.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(
context),
child: Text(
"Save",
style: STextStyles.button,

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

@ -93,11 +93,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
},
),
rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark,
),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
child: Text(
"Continue",
style: STextStyles.button,
@ -149,11 +145,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
},
),
rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark,
),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
child: Text(
"Disable",
style: STextStyles.button,

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

@ -63,13 +63,8 @@ class CreateBackupInfoView extends StatelessWidget {
),
const Spacer(),
TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
onPressed: () {
Navigator.of(context)
.pushNamed(CreateBackupView.routeName);

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

@ -94,7 +94,7 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
child: Container(
color: Colors.transparent,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 20,
@ -119,17 +119,17 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
const SizedBox(
width: 12,
),
Column(
children: [
Text(
prettyFrequencyType(
BackupFrequencyType.values[i]),
style: STextStyles.titleBold12.copyWith(
color: const Color(0xFF44464E),
Flexible(
child: Column(
children: [
Text(
prettyFrequencyType(
BackupFrequencyType.values[i]),
style: STextStyles.titleBold12,
textAlign: TextAlign.left,
),
textAlign: TextAlign.left,
),
],
],
),
),
],
),

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

@ -4,11 +4,10 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/notifications/show_flush_bar.dart';
import 'package:stackwallet/pages/add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table.dart';
import 'package:stackwallet/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/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';
class RecoverPhraseView extends StatelessWidget {

5
lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
View file

@ -131,10 +131,7 @@ class WalletBackupView extends ConsumerWidget {
height: 12,
),
TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () {
String data = AddressUtils.encodeQRSeedData(mnemonic);

11
lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart
View file

@ -147,10 +147,7 @@ class _DeleteWalletRecoveryPhraseViewState
height: 16,
),
TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () {
showDialog<dynamic>(
barrierDismissible: true,
@ -170,10 +167,8 @@ class _DeleteWalletRecoveryPhraseViewState
),
),
rightButton: TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
onPressed: () async {
final walletId = _manager.walletId;
final walletsInstance =

5
lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart
View file

@ -74,10 +74,7 @@ class DeleteWalletWarningView extends ConsumerWidget {
height: 12,
),
TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () async {
final manager = ref
.read(walletsChangeNotifierProvider)

5
lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart
View file

@ -106,10 +106,7 @@ class _RenameWalletViewState extends ConsumerState<RenameWalletView> {
),
const Spacer(),
TextButton(
style: Theme.of(context).textButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(
StackTheme.instance.color.accentColorDark),
),
style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
onPressed: () async {
final newName = _controller.text;
final success = await ref

10
lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart
View file

@ -114,14 +114,8 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget {
),
),
rightButton: TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty.all<Color>(StackTheme
.instance.color.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
onPressed: () {
Navigator.pop(context);
Navigator.push(

10
lib/pages/wallet_view/transaction_views/edit_note_view.dart
View file

@ -129,14 +129,8 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
Navigator.of(context).pop();
}
},
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty.all<Color>(StackTheme
.instance.color.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
child: Text(
"Save",
style: STextStyles.button,

11
lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
View file

@ -695,15 +695,8 @@ class _TransactionSearchViewState
child: SizedBox(
height: 48,
child: TextButton(
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty.all<Color>(
StackTheme.instance.color
.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
onPressed: () async {
_onApplyPressed();
},

11
lib/pages/wallet_view/wallet_view.dart
View file

@ -568,15 +568,8 @@ class _WalletViewState extends ConsumerState<WalletView> {
unawaited(attemptAnonymize());
},
style: Theme.of(context)
.textButtonTheme
.style
?.copyWith(
backgroundColor:
MaterialStateProperty.all<Color>(
StackTheme.instance.color
.accentColorDark),
),
style: StackTheme.instance
.getPrimaryEnabledButtonColor(context),
child: Text(
"Continue",
style: STextStyles.button,

5
lib/pages/wallets_view/sub_widgets/all_wallets.dart
View file

@ -4,6 +4,7 @@ import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/add_wallet_vi
import 'package:stackwallet/pages/wallets_view/sub_widgets/wallet_list_item.dart';
import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
class AllWallets extends StatelessWidget {
@ -19,7 +20,9 @@ class AllWallets extends StatelessWidget {
children: [
Text(
"All wallets",
style: STextStyles.itemSubtitle,
style: STextStyles.itemSubtitle.copyWith(
color: StackTheme.instance.color.textDark,
),
),
BlueTextButton(
text: "Add new",

2
lib/pages/wallets_view/sub_widgets/empty_wallets.dart
View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/add_wallet_view.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/utilities/util.dart';

6
lib/pages/wallets_view/sub_widgets/favorite_card.dart
View file

@ -134,7 +134,9 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
Text(
ref.watch(
managerProvider.select((value) => value.walletName)),
style: STextStyles.itemSubtitle12,
style: STextStyles.itemSubtitle12.copyWith(
color: StackTheme.instance.color.textFavoriteCard,
),
),
const Spacer(),
SvgPicture.asset(
@ -179,6 +181,7 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
)} ${coin.ticker}",
style: STextStyles.titleBold12.copyWith(
fontSize: 16,
color: StackTheme.instance.color.textFavoriteCard,
),
),
),
@ -199,6 +202,7 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
)}",
style: STextStyles.itemSubtitle12.copyWith(
fontSize: 10,
color: StackTheme.instance.color.textFavoriteCard,
),
),
],

6
lib/pages/wallets_view/sub_widgets/favorite_wallets.dart
View file

@ -8,7 +8,6 @@ import 'package:stackwallet/pages/wallets_view/sub_widgets/favorite_card.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/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
@ -83,7 +82,9 @@ class _FavoriteWalletsState extends ConsumerState<FavoriteWallets> {
children: [
Text(
"Favorite Wallets",
style: STextStyles.itemSubtitle,
style: STextStyles.itemSubtitle.copyWith(
color: StackTheme.instance.color.textDark3,
),
),
const Spacer(),
if (hasFavorites)
@ -96,6 +97,7 @@ class _FavoriteWalletsState extends ConsumerState<FavoriteWallets> {
Assets.svg.ellipsis,
width: 16,
height: 16,
color: StackTheme.instance.color.accentColorDark,
),
onPressed: () {
Navigator.of(context).pushNamed(

5
lib/pages/wallets_view/sub_widgets/wallet_list_item.dart
View file

@ -92,7 +92,10 @@ class WalletListItem extends ConsumerWidget {
children: [
Row(
children: [
Text(coin.prettyName),
Text(
coin.prettyName,
style: STextStyles.titleBold12,
),
const Spacer(),
Text(
"$priceString $currency/${coin.ticker}",

2
lib/pages_desktop_specific/home/my_stack_view/wallet_summary_table.dart
View file

@ -4,7 +4,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/coin_wallets_table.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/format.dart';

3
lib/utilities/assets.dart
View file

@ -1,4 +1,3 @@
import 'package:stackwallet/services/coins/namecoin/namecoin_wallet.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
@ -159,7 +158,7 @@ class _SVG {
case Coin.bitcoinTestNet:
return bitcoinTestnet;
case Coin.bitcoincashTestnet:
return bitcoinTestnet;
return bitcoincashTestnet;
case Coin.firoTestNet:
return firoTestnet;
case Coin.dogecoinTestNet:

9
lib/utilities/cfcolors.dart
View file

@ -1,9 +0,0 @@
abstract class CFColors {
// static const Color primary = Color(0xFF0052DF);
// static const Color primaryLight = Color(0xFFDAE2FF);
//
//
// // generic
// static const Color white = Color(0xFFFFFFFF);
}

1
lib/utilities/theme/color_theme.dart
View file

@ -33,6 +33,7 @@ abstract class StackColorTheme {
Color get textSubtitle5;
Color get textSubtitle6;
Color get textWhite;
Color get textFavoriteCard;
Color get textError;
// button background

5
lib/utilities/theme/dark_colors.dart
View file

@ -49,7 +49,8 @@ class DarkColors extends StackColorTheme {
Color get textSubtitle6 => const Color(0xFF414141);
@override
Color get textWhite => const Color(0xFF232323);
@override
Color get textFavoriteCard => const Color(0xFF232323);
@override
Color get textError => const Color(0xFFF37475);
@ -272,7 +273,7 @@ class DarkColors extends StackColorTheme {
// currency list
@override
Color get currencyListItemBG => const Color(0xFF35383D);
Color get currencyListItemBG => const Color(0xFF484B51);
// bottom nav
@override

3
lib/utilities/theme/light_colors.dart
View file

@ -49,7 +49,8 @@ class LightColors extends StackColorTheme {
Color get textSubtitle6 => const Color(0xFFF5F5F5);
@override
Color get textWhite => const Color(0xFFFFFFFF);
@override
Color get textFavoriteCard => const Color(0xFF232323);
@override
Color get textError => const Color(0xFF930006);

2
lib/widgets/custom_buttons/app_bar_icon_button.dart
View file

@ -1,7 +1,7 @@
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/util.dart';

1
lib/widgets/custom_buttons/favorite_toggle.dart
View file

@ -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';
class FavoriteToggle extends StatefulWidget {

3
lib/widgets/gradient_card.dart
View file

@ -1,8 +1,5 @@
// import 'package:flutter/material.dart';
// import 'package:stackwallet/utilities/cfcolors.dart';
import 'package:stackwallet/utilities/theme/stack_theme.dart';
//
// class GradientCard extends StatelessWidget {
// const GradientCard(
// {Key key,
// this.child,

2
lib/widgets/icon_widgets/addressbook_icon.dart
View file

@ -1,7 +1,7 @@
import 'package:flutter/cupertino.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';
class AddressBookIcon extends StatelessWidget {