Skip to content

fix(theme): stop using onPrimary as a surface or on flipping fills #2533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BullishNode wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(theme): stop using onPrimary as a surface or on flipping fills #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/core/widgets/cards/balance_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class BalanceCard extends StatelessWidget {
child: Material(
clipBehavior: .antiAlias,
elevation: 2,
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: BorderRadius.circular(2),
child: Row(
children: [
Expand Down
2 changes: 1 addition & 1 deletion lib/core/widgets/dropdown/bb_dropdown.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class BBDropdown<T> extends StatelessWidget {
borderRadius: BorderRadius.circular(4.0),
side: BorderSide(color: context.appColors.primary, width: 1.0),
),
color: context.appColors.onPrimary,
color: context.appColors.surface,
elevation: 8,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/core/widgets/nfc_scanner_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class _NfcPageState extends State<NfcScannerWidget> {
BBButton.big(
label: context.loc.scanNfcButton,
onPressed: _scan,
bgColor: context.appColors.onPrimary,
bgColor: context.appColors.surface,
textColor: context.appColors.secondary,
iconData: Icons.nfc,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/core/widgets/not_logged_in_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class NotLoggedInBottomSheet extends StatelessWidget {
context.goNamed(ExchangeRoute.exchangeHome.name);
},
bgColor: context.appColors.secondary,
textColor: context.appColors.onPrimary,
textColor: context.appColors.onSecondary,
),
],
),
Expand Down
6 changes: 3 additions & 3 deletions lib/features/ark/ui/ark_tx_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ArkTxWidget extends StatelessWidget {
margin: const EdgeInsets.only(bottom: 8.0),
padding: const EdgeInsets.all(16.0),
decoration: BoxDecoration(
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: BorderRadius.circular(2.0),
boxShadow: const [],
),
Expand All @@ -79,9 +79,9 @@ class ArkTxWidget extends StatelessWidget {
Container(
padding: const EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: BorderRadius.circular(2.0),
border: Border.all(color: context.appColors.surface),
border: Border.all(color: context.appColors.border),
),
child: Icon(icon, color: context.appColors.secondary),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/ark/ui/collaborative_redeem_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CollaborativeRedeemBottomSheet extends StatelessWidget {
maxHeight: MediaQuery.of(context).size.height * 0.4,
),
decoration: BoxDecoration(
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
),
child: BlocBuilder<ArkCubit, ArkState>(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/ark/ui/send_recipient_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class _SendRecipientPageState extends State<SendRecipientPage> {
focusNode: _focusNode,
textInputAction: .done,
decoration: InputDecoration(
fillColor: context.appColors.onPrimary,
fillColor: context.appColors.surface,
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8.0),
Expand Down
4 changes: 3 additions & 1 deletion lib/features/buy/ui/screens/buy_accelerate_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ class BuyAccelerateScreen extends StatelessWidget {
},
bgColor: context.appColors.surface,
textColor: context.appColors.secondary,
outlined: true,
borderColor: context.appColors.border,
),
const Gap(16),
BBButton.big(
Expand All @@ -126,7 +128,7 @@ class BuyAccelerateScreen extends StatelessWidget {
);
},
bgColor: context.appColors.secondary,
textColor: context.appColors.onPrimary,
textColor: context.appColors.onSecondary,
),
],
),
Expand Down
10 changes: 5 additions & 5 deletions lib/features/buy/ui/widgets/accelerate_transaction_list_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AccelerateTransactionListTile extends StatelessWidget {
final theme = Theme.of(context);
return Container(
decoration: BoxDecoration(
color: context.appColors.onPrimary, // or Colors.white
color: context.appColors.surface,
borderRadius: BorderRadius.circular(4),
border: Border.all(color: context.appColors.secondary),
boxShadow: [
Expand All @@ -43,24 +43,24 @@ class AccelerateTransactionListTile extends StatelessWidget {
backgroundColor: context.appColors.shimmerBase,
),
),
Icon(Icons.schedule, size: 16, color: context.appColors.secondary),
Icon(Icons.schedule, size: 16, color: context.appColors.onSurface),
],
),
title: Text(
context.loc.buyAccelerateTransaction,
style: theme.textTheme.headlineLarge?.copyWith(
color: context.appColors.secondary,
color: context.appColors.onSurface,
),
),
subtitle: Text(
context.loc.buyGetConfirmedFaster,
style: theme.textTheme.bodySmall?.copyWith(
color: context.appColors.secondary,
color: context.appColors.onSurface,
),
),
trailing: Icon(
Icons.fast_forward_outlined,
color: context.appColors.secondary,
color: context.appColors.onSurface,
),
onTap: onTap,
),
Expand Down
4 changes: 2 additions & 2 deletions lib/features/dca/ui/screens/dca_wallet_selection_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ class _DcaWalletSelectionScreenState extends State<DcaWalletSelectionScreen> {
style: context.font.headlineSmall?.copyWith(
color: _useDefaultLightningAddress
? context.appColors.surfaceContainer
: context.appColors.onSecondary,
: context.appColors.onSurface,
),
enabled: !_useDefaultLightningAddress,
decoration: InputDecoration(
fillColor: _useDefaultLightningAddress
? context.appColors.secondaryFixedDim
: context.appColors.onPrimary,
: context.appColors.surface,
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8.0),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/electrum_settings/frameworks/ui/widgets/privacy_notice.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class PrivacyNoticeBottomSheet extends StatelessWidget {
maxHeight: MediaQuery.of(context).size.height * 0.8,
),
decoration: BoxDecoration(
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
),
child: Column(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/labels/ui/page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Bip329LabelsPage extends StatelessWidget {
builder: (context, isLoading) => FadingLinearProgress(
height: 3,
trigger: isLoading,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/pay/ui/screens/pay_external_wallet_network_selection_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PayExternalWalletNetworkSelectionScreen extends StatelessWidget {
FadingLinearProgress(
height: 3,
trigger: isCreatingPayOrder,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
Expanded(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/pay/ui/screens/pay_send_payment_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class PaySendPaymentScreen extends StatelessWidget {
FadingLinearProgress(
height: 3,
trigger: isConfirmingPayment,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
const Gap(24.0),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/pay/ui/screens/pay_sinpe_success_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class _PaySinpeSuccessScreenState extends State<PaySinpeSuccessScreen> {
context.goNamed(ExchangeRoute.exchangeHome.name);
},
bgColor: context.appColors.secondary,
textColor: context.appColors.onPrimary,
textColor: context.appColors.onSecondary,
),
),
const Gap(24),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/pay/ui/screens/pay_wallet_selection_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class PayWalletSelectionScreen extends StatelessWidget {
FadingLinearProgress(
height: 3,
trigger: isCreatingPayOrder,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
Expanded(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/receive/ui/screens/receive_payjoin_in_progress_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ReceivePayjoinInProgressScreen extends StatelessWidget {
preferredSize: const Size.fromHeight(3.0),
child: FadingLinearProgress(
trigger: isBroadcasting,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/sell/ui/screens/sell_external_wallet_network_selection_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class SellExternalWalletNetworkSelectionScreen extends StatelessWidget {
FadingLinearProgress(
height: 3,
trigger: isCreatingSellOrder,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
Expanded(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/sell/ui/screens/sell_send_payment_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class SellSendPaymentScreen extends StatelessWidget {
FadingLinearProgress(
height: 3,
trigger: isConfirmingPayment,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
const Gap(24.0),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/sell/ui/screens/sell_wallet_selection_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SellWalletSelectionScreen extends StatelessWidget {
FadingLinearProgress(
height: 3,
trigger: isCreatingSellOrder,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
Expanded(
Expand Down
4 changes: 2 additions & 2 deletions lib/features/send/request_identifier/request_identifier_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class RequestIdentifierScreen extends StatelessWidget {
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(12),
topRight: Radius.circular(12),
Expand Down Expand Up @@ -172,7 +172,7 @@ class ContinueButtonWidget extends StatelessWidget {
onPressed: cubit.validatePaymentRequest,
disabled: !hasRequest || hasError,
bgColor: context.appColors.secondary,
textColor: context.appColors.onPrimary,
textColor: context.appColors.onSecondary,
);
}
}
2 changes: 1 addition & 1 deletion lib/features/settings/ui/widgets/failed_wallet_deletion_alert_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class FailedWalletDeletionAlertDialog extends StatelessWidget {
(WalletBloc bloc) => bloc.state.walletDeletionError,
);
return AlertDialog(
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
title: Text(context.loc.walletDeletionFailedTitle),
content: Text(
error is CannotDeleteDefaultWalletError
Expand Down
2 changes: 1 addition & 1 deletion lib/features/swap/ui/pages/swap_confirm_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class SwapConfirmPage extends StatelessWidget {
child: FadingLinearProgress(
height: 3,
trigger: isConfirming,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/swap/ui/pages/swap_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class SwapPageState extends State<SwapPage> {
builder: (context, isLoading) => FadingLinearProgress(
height: 3,
trigger: isLoading,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/transactions/ui/screens/export_transactions_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class _ExportTransactionsScreenState extends State<ExportTransactionsScreen> {
builder: (context, isLoading) => FadingLinearProgress(
height: 3,
trigger: isLoading,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/transactions/ui/screens/transaction_details_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class TransactionDetailsScreen extends StatelessWidget {
preferredSize: const Size.fromHeight(3.0),
child: FadingLinearProgress(
trigger: isBroadcastingPayjoinOriginalTx,
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/transactions/ui/screens/transactions_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class TransactionsScreen extends StatelessWidget {
onAction: () =>
context.pushNamed(TransactionsRoute.exportTransactions.name),
),
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
elevation: 0,
),
body: const _Screen(),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/withdraw/ui/screens/withdraw_confirmation_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class WithdrawConfirmationScreen extends StatelessWidget {
(bloc.state as WithdrawConfirmationState)
.isConfirmingWithdrawal,
),
backgroundColor: context.appColors.onPrimary,
backgroundColor: context.appColors.surface,
foregroundColor: context.appColors.primary,
),
Expanded(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/withdraw/ui/widgets/account_ownership_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class AccountOwnershipWidget extends StatelessWidget {
height: 56,
child: Material(
elevation: 4,
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: BorderRadius.circular(4),
child: Container(
decoration: BoxDecoration(
Expand Down