added background for qr image for bright theme.
M committed
Jun 4, 2021 at 20:48 UTC
8b0dcceb7b835f9a377355e66a71add33975d25c
5 files changed
+16
-11
ios/Runner.xcodeproj/project.pbxproj
+6
-6
@@ -366,7 +366,7 @@
366
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
367
CLANG_ENABLE_MODULES = YES;
368
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
369
- CURRENT_PROJECT_VERSION = 41;
369
+ CURRENT_PROJECT_VERSION = 42;
370
DEVELOPMENT_TEAM = 32J6BB6VUS;
371
ENABLE_BITCODE = NO;
372
EXCLUDED_SOURCE_FILE_NAMES = "\"$(SRCROOT)/Runner/GoogleService-Info.plist\"";
@@ -384,7 +384,7 @@
384
"$(inherited)",
385
"$(PROJECT_DIR)/Flutter",
386
);
387
- MARKETING_VERSION = 4.2.1;
387
+ MARKETING_VERSION = 4.2.2;
388
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
389
PRODUCT_NAME = "$(TARGET_NAME)";
390
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -510,7 +510,7 @@
510
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
511
CLANG_ENABLE_MODULES = YES;
512
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
513
- CURRENT_PROJECT_VERSION = 41;
513
+ CURRENT_PROJECT_VERSION = 42;
514
DEVELOPMENT_TEAM = 32J6BB6VUS;
515
ENABLE_BITCODE = NO;
516
EXCLUDED_SOURCE_FILE_NAMES = "\"$(SRCROOT)/Runner/GoogleService-Info.plist\"";
@@ -528,7 +528,7 @@
528
"$(inherited)",
529
"$(PROJECT_DIR)/Flutter",
530
);
531
- MARKETING_VERSION = 4.2.1;
531
+ MARKETING_VERSION = 4.2.2;
532
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
533
PRODUCT_NAME = "$(TARGET_NAME)";
534
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -546,7 +546,7 @@
546
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
547
CLANG_ENABLE_MODULES = YES;
548
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
549
- CURRENT_PROJECT_VERSION = 41;
549
+ CURRENT_PROJECT_VERSION = 42;
550
DEVELOPMENT_TEAM = 32J6BB6VUS;
551
ENABLE_BITCODE = NO;
552
EXCLUDED_SOURCE_FILE_NAMES = "\"$(SRCROOT)/Runner/GoogleService-Info.plist\"";
@@ -564,7 +564,7 @@
564
"$(inherited)",
565
"$(PROJECT_DIR)/Flutter",
566
);
567
- MARKETING_VERSION = 4.2.1;
567
+ MARKETING_VERSION = 4.2.2;
568
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
569
PRODUCT_NAME = "$(TARGET_NAME)";
570
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
lib/src/screens/dashboard/widgets/address_page.dart
+3
-1
@@ -3,6 +3,7 @@ import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
3
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
4
import 'package:cake_wallet/src/widgets/primary_button.dart';
5
import 'package:cake_wallet/store/settings_store.dart';
6
+import 'package:cake_wallet/themes/theme_base.dart';
7
import 'package:cake_wallet/utils/show_pop_up.dart';
8
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
9
import 'package:flutter/material.dart';
@@ -73,7 +74,8 @@ class AddressPage extends StatelessWidget {
74
child: Observer(builder: (_) => QRWidget(
75
addressListViewModel: addressListViewModel,
76
amountTextFieldFocusNode: _cryptoAmountFocus,
76
- isAmountFieldShow: !addressListViewModel.hasAccounts))
77
+ isAmountFieldShow: !addressListViewModel.hasAccounts,
78
+ isBright: walletViewModel.settingsStore.currentTheme.type == ThemeType.bright))
79
),
80
Observer(builder: (_) {
81
return addressListViewModel.hasAddressList
lib/src/screens/receive/receive_page.dart
+2
-1
@@ -125,7 +125,8 @@ class ReceivePage extends BasePage {
125
child: QRWidget(
126
addressListViewModel: addressListViewModel,
127
isAmountFieldShow: true,
128
- amountTextFieldFocusNode: _cryptoAmountFocus),
128
+ amountTextFieldFocusNode: _cryptoAmountFocus,
129
+ isBright: currentTheme.type == ThemeType.bright),
130
),
131
Observer(
132
builder: (_) => ListView.separated(
lib/src/screens/receive/widgets/qr_widget.dart
+4
-2
@@ -13,7 +13,8 @@ class QRWidget extends StatelessWidget {
13
QRWidget(
14
{@required this.addressListViewModel,
15
this.isAmountFieldShow = false,
16
- this.amountTextFieldFocusNode})
16
+ this.amountTextFieldFocusNode,
17
+ this.isBright})
18
: amountController = TextEditingController(),
19
_formKey = GlobalKey<FormState>() {
20
amountController.addListener(() => addressListViewModel.amount =
@@ -25,6 +26,7 @@ class QRWidget extends StatelessWidget {
26
final TextEditingController amountController;
27
final FocusNode amountTextFieldFocusNode;
28
final GlobalKey<FormState> _formKey;
29
+ final bool isBright;
30
31
@override
32
Widget build(BuildContext context) {
@@ -55,7 +57,7 @@ class QRWidget extends StatelessWidget {
57
),
58
child: QrImage(
59
data: addressListViewModel.uri.toString(),
58
- backgroundColor: Colors.transparent,
60
+ backgroundColor: isBright ? Colors.black : Colors.white,
61
foregroundColor: Theme.of(context).accentTextTheme.
62
display3.backgroundColor,
63
),
pubspec.yaml
+1
-1
@@ -11,7 +11,7 @@ description: Cake Wallet.
11
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
12
# Read more about iOS versioning at
13
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
14
-version: 4.2.1+50
14
+version: 4.2.2+51
15
16
environment:
17
sdk: ">=2.7.0 <3.0.0"