@samitouri / QOSAMI-cakewallet-1 / commits / a4ead9c2b

Another beautiful day fixes

M committed Jan 12, 2021 at 13:14 UTC a4ead9c2ba49f4618c28b6888cd9095bbc56c1ef
8 files changed +66 -60
ios/Runner.xcodeproj/project.pbxproj
+3 -3
@@ -354,7 +354,7 @@
354 buildSettings = {
355 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
356 CLANG_ENABLE_MODULES = YES;
357 - CURRENT_PROJECT_VERSION = 14;
357 + CURRENT_PROJECT_VERSION = 16;
358 DEVELOPMENT_TEAM = 32J6BB6VUS;
359 ENABLE_BITCODE = NO;
360 FRAMEWORK_SEARCH_PATHS = (
@@ -494,7 +494,7 @@
494 buildSettings = {
495 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
496 CLANG_ENABLE_MODULES = YES;
497 - CURRENT_PROJECT_VERSION = 14;
497 + CURRENT_PROJECT_VERSION = 16;
498 DEVELOPMENT_TEAM = 32J6BB6VUS;
499 ENABLE_BITCODE = NO;
500 FRAMEWORK_SEARCH_PATHS = (
@@ -528,7 +528,7 @@
528 buildSettings = {
529 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
530 CLANG_ENABLE_MODULES = YES;
531 - CURRENT_PROJECT_VERSION = 14;
531 + CURRENT_PROJECT_VERSION = 16;
532 DEVELOPMENT_TEAM = 32J6BB6VUS;
533 ENABLE_BITCODE = NO;
534 FRAMEWORK_SEARCH_PATHS = (
lib/bitcoin/bitcoin_wallet.dart
+1 -1
@@ -169,7 +169,7 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
169 Future<void> init() async {
170 if (addresses.isEmpty || addresses.length < 33) {
171 final addressesCount = 33 - addresses.length;
172 - await generateNewAddresses(addressesCount, startIndex: _accountIndex);
172 + await generateNewAddresses(addressesCount, startIndex: addresses.length);
173 }
174
175 address = addresses[_accountIndex].address;
lib/src/screens/dashboard/widgets/address_page.dart
+56 -51
@@ -45,58 +45,63 @@ class AddressPage extends StatelessWidget {
45 amountTextFieldFocusNode: _cryptoAmountFocus,
46 isAmountFieldShow: !addressListViewModel.hasAccounts),
47 )),
48 - addressListViewModel.hasAddressList
49 - ? GestureDetector(
50 - onTap: () =>
51 - Navigator.of(context).pushNamed(Routes.receive),
52 - child: Container(
53 - height: 50,
54 - padding: EdgeInsets.only(left: 24, right: 12),
55 - alignment: Alignment.center,
56 - decoration: BoxDecoration(
57 - borderRadius: BorderRadius.all(Radius.circular(25)),
58 - border: Border.all(
59 - color:
60 - Theme.of(context).textTheme.subhead.color,
61 - width: 1),
62 - color: Theme.of(context).buttonColor),
63 - child: Row(
64 - mainAxisSize: MainAxisSize.max,
65 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
66 - children: <Widget>[
67 - Observer(
68 - builder: (_) => Text(
69 - addressListViewModel.hasAccounts
70 - ? S.of(context).accounts_subaddresses
71 - : S.of(context).addresses,
72 - style: TextStyle(
73 - fontSize: 14,
74 - fontWeight: FontWeight.w500,
75 - color: Theme.of(context)
76 - .accentTextTheme
77 - .display3
78 - .backgroundColor),
79 - )),
80 - Icon(
81 - Icons.arrow_forward_ios,
82 - size: 14,
83 - color: Theme.of(context)
84 - .accentTextTheme
85 - .display3
86 - .backgroundColor,
87 - )
88 - ],
48 + Observer(builder: (_) {
49 + return addressListViewModel.hasAddressList
50 + ? GestureDetector(
51 + onTap: () =>
52 + Navigator.of(context).pushNamed(Routes.receive),
53 + child: Container(
54 + height: 50,
55 + padding: EdgeInsets.only(left: 24, right: 12),
56 + alignment: Alignment.center,
57 + decoration: BoxDecoration(
58 + borderRadius:
59 + BorderRadius.all(Radius.circular(25)),
60 + border: Border.all(
61 + color:
62 + Theme.of(context).textTheme.subhead.color,
63 + width: 1),
64 + color: Theme.of(context).buttonColor),
65 + child: Row(
66 + mainAxisSize: MainAxisSize.max,
67 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
68 + children: <Widget>[
69 + Observer(
70 + builder: (_) => Text(
71 + addressListViewModel.hasAccounts
72 + ? S
73 + .of(context)
74 + .accounts_subaddresses
75 + : S.of(context).addresses,
76 + style: TextStyle(
77 + fontSize: 14,
78 + fontWeight: FontWeight.w500,
79 + color: Theme.of(context)
80 + .accentTextTheme
81 + .display3
82 + .backgroundColor),
83 + )),
84 + Icon(
85 + Icons.arrow_forward_ios,
86 + size: 14,
87 + color: Theme.of(context)
88 + .accentTextTheme
89 + .display3
90 + .backgroundColor,
91 + )
92 + ],
93 + ),
94 ),
90 - ),
91 - )
92 - : PrimaryButton(
93 - onPressed: () => addressListViewModel.nextAddress(),
94 - text: 'Next address',
95 - color: Theme.of(context).buttonColor,
96 - textColor: Theme.of(context)
97 - .accentTextTheme
98 - .display3
99 - .backgroundColor)
95 + )
96 + : PrimaryButton(
97 + onPressed: () => addressListViewModel.nextAddress(),
98 + text: 'Next address',
99 + color: Theme.of(context).buttonColor,
100 + textColor: Theme.of(context)
101 + .accentTextTheme
102 + .display3
103 + .backgroundColor);
104 + })
105 ],
106 ),
107 ));
lib/src/screens/receive/widgets/qr_widget.dart
+1 -1
@@ -109,7 +109,7 @@ class QRWidget extends StatelessWidget {
109 maxLines: 1,
110 overflow: TextOverflow.ellipsis,
111 style: TextStyle(
112 - fontSize: 16,
112 + fontSize: 15,
113 fontWeight: FontWeight.w500,
114 color: Theme.of(context).accentTextTheme.
115 display3.backgroundColor),
lib/src/screens/send/widgets/confirm_sending_alert.dart
+2 -2
@@ -148,12 +148,12 @@ class ConfirmSendingAlert extends BaseAlertDialog {
148 )
149 ),
150 Padding(
151 - padding: EdgeInsets.fromLTRB(8, 16, 8, 0),
151 + padding: EdgeInsets.fromLTRB(0, 16, 0, 0),
152 child: Column(
153 crossAxisAlignment: CrossAxisAlignment.center,
154 children: [
155 Text(
156 - recipientTitle,
156 + '$recipientTitle:',
157 style: TextStyle(
158 fontSize: 16,
159 fontWeight: FontWeight.normal,
lib/src/widgets/base_alert_dialog.dart
+1 -1
@@ -132,7 +132,7 @@ class BaseAlertDialog extends StatelessWidget {
132 crossAxisAlignment: CrossAxisAlignment.center,
133 children: <Widget>[
134 Padding(
135 - padding: EdgeInsets.fromLTRB(24, 32, 24, 0),
135 + padding: EdgeInsets.fromLTRB(24, 20, 24, 0),
136 child: title(context),
137 ),
138 isDividerExists
lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
+1
@@ -143,6 +143,7 @@ abstract class WalletAddressListViewModelBase with Store {
143 return null;
144 }
145
146 + @computed
147 bool get hasAddressList => _wallet.type == WalletType.monero;
148
149 @observable
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.1.0+30
14 +version: 4.1.0+32
15
16 environment:
17 sdk: ">=2.7.0 <3.0.0"