Skip to content

Commit 5818eab

Browse files
i5hii5hi
authored
Merge pull request #1723 from SatoshiPortal/theme-fixes-3
More Theme Fixes + Keystone enable
2 parents c76d940 + fcaecc1 commit 5818eab

10 files changed

Lines changed: 273 additions & 55 deletions

File tree

‎lib/features/ark/ui/receive_page.dart‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ class _ReceivePageState extends State<ReceivePage> {
5656
),
5757
const Gap(16),
5858
ReceiveQR(
59-
qrData:
60-
_selectedOption! == context.loc.arkReceiveSegmentBoarding
61-
? btcAddress
62-
: arkAddress,
59+
qrData: _selectedOption! == context.loc.arkReceiveSegmentBoarding
60+
? btcAddress
61+
: arkAddress,
6362
),
6463
const Gap(16),
6564
ArkCopyAddressSection(
@@ -87,13 +86,16 @@ class ReceiveQR extends StatelessWidget {
8786
padding: const EdgeInsets.all(16),
8887
constraints: const BoxConstraints(maxHeight: 300, maxWidth: 300),
8988
decoration: BoxDecoration(
90-
color: context.appColors.onPrimary,
89+
color: context.appColors.background,
9190
borderRadius: BorderRadius.circular(12),
9291
),
93-
child:
94-
qrData.isNotEmpty
95-
? QrImageView(data: qrData)
96-
: const LoadingBoxContent(height: 200),
92+
child: qrData.isNotEmpty
93+
? QrImageView(
94+
data: qrData,
95+
// ignore: deprecated_member_use
96+
foregroundColor: context.appColors.secondary,
97+
)
98+
: const LoadingBoxContent(height: 200),
9799
),
98100
);
99101
}
@@ -120,12 +122,12 @@ class _ArkCopyAddressSectionState extends State<ArkCopyAddressSection> {
120122
Widget build(BuildContext context) {
121123
final currentAddress =
122124
widget.selectedOption == context.loc.arkReceiveSegmentBoarding
123-
? widget.btcAddress
124-
: widget.arkAddress;
125+
? widget.btcAddress
126+
: widget.arkAddress;
125127
final addressLabel =
126128
widget.selectedOption == context.loc.arkReceiveSegmentBoarding
127-
? context.loc.arkReceiveBoardingAddress
128-
: context.loc.arkArkAddress;
129+
? context.loc.arkReceiveBoardingAddress
130+
: context.loc.arkArkAddress;
129131

130132
return Padding(
131133
padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -140,13 +142,12 @@ class _ArkCopyAddressSectionState extends State<ArkCopyAddressSection> {
140142
overflow: .ellipsis,
141143
canShowValueModal: true,
142144
modalTitle: addressLabel,
143-
modalContent:
144-
currentAddress
145-
.replaceAllMapped(
146-
RegExp('.{1,4}'),
147-
(match) => '${match.group(0)} ',
148-
)
149-
.trim(),
145+
modalContent: currentAddress
146+
.replaceAllMapped(
147+
RegExp('.{1,4}'),
148+
(match) => '${match.group(0)} ',
149+
)
150+
.trim(),
150151
),
151152
],
152153
),

‎lib/features/fund_exchange/ui/screens/fund_exchange_canada_post_screen.dart‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:bb_mobile/core/exchange/domain/entity/funding_details.dart';
2+
import 'package:bb_mobile/core/themes/app_theme.dart';
23
import 'package:bb_mobile/core/utils/build_context_x.dart';
34
import 'package:bb_mobile/core/widgets/loading/loading_box_content.dart';
45
import 'package:bb_mobile/core/widgets/text/text.dart';
@@ -75,7 +76,19 @@ class FundExchangeCanadaPostScreen extends StatelessWidget {
7576
if (details?.code == null)
7677
const LoadingBoxContent(height: 250.0, width: 250.0)
7778
else
78-
QrImageView(size: 250, data: details!.code),
79+
Container(
80+
padding: const EdgeInsets.all(16),
81+
decoration: BoxDecoration(
82+
color: context.appColors.background,
83+
borderRadius: BorderRadius.circular(12),
84+
),
85+
child: QrImageView(
86+
size: 250,
87+
data: details!.code,
88+
// ignore: deprecated_member_use
89+
foregroundColor: context.appColors.secondary,
90+
),
91+
),
7992
const Gap(24.0),
8093
],
8194
),

‎lib/features/import_coldcard_q/import_coldcard_q_page.dart‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@ class ImportColdcardQPage extends StatelessWidget {
3636
Assets.misc.qRPlaceholder.path,
3737
height: 200,
3838
width: 200,
39-
color: context.appColors.text,
4039
),
4140
Gap(Device.screen.height * 0.05),
4241
Column(
4342
children: [
4443
BBButton.small(
4544
label: context.loc.importColdcardButtonOpenCamera,
46-
onPressed:
47-
() => context.pushNamed(
48-
ImportWatchOnlyWalletRoutes.scan.name,
49-
extra: SignerDeviceEntity.coldcardQ,
50-
),
45+
onPressed: () => context.pushNamed(
46+
ImportWatchOnlyWalletRoutes.scan.name,
47+
extra: SignerDeviceEntity.coldcardQ,
48+
),
5149
bgColor: context.appColors.surface,
5250
textColor: context.appColors.text,
5351
outlined: true,
@@ -56,21 +54,18 @@ class ImportColdcardQPage extends StatelessWidget {
5654
Gap(Device.screen.height * 0.02),
5755
BBButton.small(
5856
label: context.loc.importColdcardButtonInstructions,
59-
onPressed:
60-
() => ColdcardQInstructionsBottomSheet.show(context),
57+
onPressed: () =>
58+
ColdcardQInstructionsBottomSheet.show(context),
6159
bgColor: context.appColors.surface,
6260
textColor: context.appColors.text,
6361
outlined: true,
6462
),
6563
Gap(Device.screen.height * 0.02),
6664
BBButton.small(
6765
label: context.loc.importColdcardButtonPurchase,
68-
onPressed:
69-
() => launchUrl(
70-
Uri.parse(
71-
'https://store.coinkite.com/promo/BULLBITCOIN',
72-
),
73-
),
66+
onPressed: () => launchUrl(
67+
Uri.parse('https://store.coinkite.com/promo/BULLBITCOIN'),
68+
),
7469
bgColor: context.appColors.surface,
7570
textColor: context.appColors.text,
7671
outlined: true,

‎lib/features/import_qr_device/import_qr_device_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class ImportQrDevicePage extends StatelessWidget {
5656
Assets.misc.qRPlaceholder.path,
5757
height: 200,
5858
width: 200,
59-
color: context.appColors.text,
6059
),
6160
Gap(Device.screen.height * 0.05),
6261
Column(

‎lib/features/import_wallet/import_wallet_page.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,18 @@ class ImportWalletPage extends StatelessWidget {
9494
context.pushNamed(ImportQrDeviceRoute.importPassport.name),
9595
),
9696
const Gap(16),
97+
TabMenuVerticalButton(
98+
title: context.loc.importWalletKeystone,
99+
onTap: () =>
100+
context.pushNamed(ImportQrDeviceRoute.importKeystone.name),
101+
),
102+
const Gap(16),
97103
if (context.read<SettingsCubit>().state.isSuperuser ?? false) ...[
98104
TabMenuVerticalButton(
99105
title: context.loc.importWalletLedger,
100106
onTap: () => context.pushNamed(LedgerRoute.importLedger.name),
101107
),
102108
const Gap(16),
103-
TabMenuVerticalButton(
104-
title: context.loc.importWalletKeystone,
105-
onTap: () => context.pushNamed(
106-
ImportQrDeviceRoute.importKeystone.name,
107-
),
108-
),
109-
const Gap(16),
110109
TabMenuVerticalButton(
111110
title: 'BitBox',
112111
onTap: () => Platform.isAndroid

‎lib/features/pay/ui/widgets/pay_qr_bottom_sheet.dart‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class PayQrBottomSheet extends StatelessWidget {
6060
child: Container(
6161
padding: const EdgeInsets.all(24),
6262
decoration: BoxDecoration(
63-
color: context.appColors.surfaceFixed,
63+
color: context.appColors.background,
6464
borderRadius: BorderRadius.circular(16),
6565
boxShadow: [
6666
BoxShadow(
@@ -73,7 +73,12 @@ class PayQrBottomSheet extends StatelessWidget {
7373
child: SizedBox(
7474
width: 280,
7575
height: 280,
76-
child: QrImageView(data: bip21InvoiceData, size: 280),
76+
child: QrImageView(
77+
data: bip21InvoiceData,
78+
size: 280,
79+
// ignore: deprecated_member_use
80+
foregroundColor: context.appColors.secondary,
81+
),
7782
),
7883
),
7984
),

‎lib/features/psbt_flow/show_animated_qr/show_animated_qr_widget.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,17 @@ class _ShowAnimatedQrViewState extends State<_ShowAnimatedQrView> {
113113

114114
return Container(
115115
decoration: BoxDecoration(
116-
color: context.appColors.surfaceFixed,
116+
color: context.appColors.background,
117117
borderRadius: BorderRadius.circular(16),
118118
),
119119
child: Column(
120120
mainAxisAlignment: .start,
121121
children: [
122-
QrImageView(data: state.parts[state.currentIndex]),
122+
QrImageView(
123+
data: state.parts[state.currentIndex],
124+
// ignore: deprecated_member_use
125+
foregroundColor: context.appColors.secondary,
126+
),
123127
const Gap(16),
124128
if (widget.showSlider) ...[
125129
Padding(

‎lib/features/receive/ui/screens/receive_qr_screen.dart‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,15 @@ class ReceiveQRDetails extends StatelessWidget {
145145
padding: const EdgeInsets.all(16),
146146
constraints: const BoxConstraints(maxHeight: 300, maxWidth: 300),
147147
decoration: BoxDecoration(
148-
color: context.appColors.onPrimary,
148+
color: context.appColors.background,
149149
borderRadius: BorderRadius.circular(12),
150150
),
151151
child: qrData.isNotEmpty
152-
? QrImageView(data: qrData)
152+
? QrImageView(
153+
data: qrData,
154+
// ignore: deprecated_member_use
155+
foregroundColor: context.appColors.secondary,
156+
)
153157
: const LoadingBoxContent(height: 200),
154158
),
155159
),
@@ -371,7 +375,7 @@ class ReceiveLnInfoDetails extends StatelessWidget {
371375
margin: const EdgeInsets.symmetric(horizontal: 16),
372376
padding: const EdgeInsets.symmetric(horizontal: 16),
373377
decoration: BoxDecoration(
374-
color: context.appColors.onPrimary,
378+
color: context.appColors.cardBackground,
375379
borderRadius: BorderRadius.circular(2),
376380
border: Border.all(color: context.appColors.surface),
377381
boxShadow: [
@@ -407,6 +411,7 @@ class ReceiveLnInfoDetails extends StatelessWidget {
407411
amountSat ?? 0,
408412
showFiat: false,
409413
style: context.font.bodyMedium,
414+
color: context.appColors.secondary,
410415
),
411416
BBText(
412417
'~$amountEquivalent',
@@ -435,6 +440,7 @@ class ReceiveLnInfoDetails extends StatelessWidget {
435440
swap!.receieveAmount!,
436441
showFiat: false,
437442
style: context.font.bodyMedium,
443+
color: context.appColors.secondary,
438444
),
439445
],
440446
),
@@ -456,6 +462,7 @@ class ReceiveLnInfoDetails extends StatelessWidget {
456462
child: BBText(
457463
note.isNotEmpty ? note : '',
458464
style: context.font.bodyMedium,
465+
color: context.appColors.secondary,
459466
maxLines: 5,
460467
textAlign: .end,
461468
),
@@ -488,7 +495,12 @@ class ReceiveLnSwapID extends StatelessWidget {
488495
color: context.appColors.onSurfaceVariant,
489496
),
490497
const Spacer(),
491-
BBText(swap.id, style: context.font.bodyLarge, textAlign: .end),
498+
BBText(
499+
swap.id,
500+
style: context.font.bodyLarge,
501+
color: context.appColors.secondary,
502+
textAlign: .end,
503+
),
492504
const Gap(4),
493505
InkWell(
494506
child: Icon(Icons.copy, color: context.appColors.primary, size: 16),
@@ -527,7 +539,7 @@ class _ReceiveLnFeesDetailsState extends State<ReceiveLnFeesDetails> {
527539
amt,
528540
showFiat: false,
529541
style: context.font.bodySmall,
530-
color: context.appColors.onSurfaceVariant,
542+
color: context.appColors.secondary,
531543
),
532544
],
533545
),
@@ -564,7 +576,7 @@ class _ReceiveLnFeesDetailsState extends State<ReceiveLnFeesDetails> {
564576
swap.fees?.totalFees(null) ?? 0,
565577
showFiat: false,
566578
style: context.font.bodyLarge,
567-
color: context.appColors.onSurfaceVariant,
579+
color: context.appColors.secondary,
568580
),
569581
const Gap(4),
570582
Icon(

‎lib/features/sell/ui/widgets/sell_qr_bottom_sheet.dart‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class SellQrBottomSheet extends StatelessWidget {
6060
child: Container(
6161
padding: const EdgeInsets.all(24),
6262
decoration: BoxDecoration(
63-
color: context.appColors.surfaceFixed,
63+
color: context.appColors.background,
6464
borderRadius: BorderRadius.circular(16),
6565
boxShadow: [
6666
BoxShadow(
@@ -73,7 +73,12 @@ class SellQrBottomSheet extends StatelessWidget {
7373
child: SizedBox(
7474
width: 280,
7575
height: 280,
76-
child: QrImageView(data: bip21InvoiceData, size: 280),
76+
child: QrImageView(
77+
data: bip21InvoiceData,
78+
size: 280,
79+
// ignore: deprecated_member_use
80+
foregroundColor: context.appColors.secondary,
81+
),
7782
),
7883
),
7984
),

0 commit comments

Comments
 (0)