Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-18 16:55:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Another beautiful day fixes

Browse source
This commit is contained in:
M 2021-01-12 13:14:28 +02:00
parent 9db6e233c7
commit a4ead9c2ba
8 changed files with 66 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ios/Runner.xcodeproj/project.pbxproj
View file

@ -354,7 +354,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 14; CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 32J6BB6VUS; DEVELOPMENT_TEAM = 32J6BB6VUS;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -494,7 +494,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 14; CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 32J6BB6VUS; DEVELOPMENT_TEAM = 32J6BB6VUS;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -528,7 +528,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 14; CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 32J6BB6VUS; DEVELOPMENT_TEAM = 32J6BB6VUS;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (

2
lib/bitcoin/bitcoin_wallet.dart
View file

@ -169,7 +169,7 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
Future<void> init() async { Future<void> init() async {
if (addresses.isEmpty || addresses.length < 33) { if (addresses.isEmpty || addresses.length < 33) {
final addressesCount = 33 - addresses.length; final addressesCount = 33 - addresses.length;
await generateNewAddresses(addressesCount, startIndex: _accountIndex); await generateNewAddresses(addressesCount, startIndex: addresses.length);
} }
address = addresses[_accountIndex].address; address = addresses[_accountIndex].address;

107
lib/src/screens/dashboard/widgets/address_page.dart
View file

@ -45,58 +45,63 @@ class AddressPage extends StatelessWidget {
amountTextFieldFocusNode: _cryptoAmountFocus, amountTextFieldFocusNode: _cryptoAmountFocus,
isAmountFieldShow: !addressListViewModel.hasAccounts), isAmountFieldShow: !addressListViewModel.hasAccounts),
)), )),
addressListViewModel.hasAddressList Observer(builder: (_) {
? GestureDetector( return addressListViewModel.hasAddressList
onTap: () => ? GestureDetector(
Navigator.of(context).pushNamed(Routes.receive), onTap: () =>
child: Container( Navigator.of(context).pushNamed(Routes.receive),
height: 50, child: Container(
padding: EdgeInsets.only(left: 24, right: 12), height: 50,
alignment: Alignment.center, padding: EdgeInsets.only(left: 24, right: 12),
decoration: BoxDecoration( alignment: Alignment.center,
borderRadius: BorderRadius.all(Radius.circular(25)), decoration: BoxDecoration(
border: Border.all( borderRadius:
color: BorderRadius.all(Radius.circular(25)),
Theme.of(context).textTheme.subhead.color, border: Border.all(
width: 1), color:
color: Theme.of(context).buttonColor), Theme.of(context).textTheme.subhead.color,
child: Row( width: 1),
mainAxisSize: MainAxisSize.max, color: Theme.of(context).buttonColor),
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Row(
children: <Widget>[ mainAxisSize: MainAxisSize.max,
Observer( mainAxisAlignment: MainAxisAlignment.spaceBetween,
builder: (_) => Text( children: <Widget>[
addressListViewModel.hasAccounts Observer(
? S.of(context).accounts_subaddresses builder: (_) => Text(
: S.of(context).addresses, addressListViewModel.hasAccounts
style: TextStyle( ? S
fontSize: 14, .of(context)
fontWeight: FontWeight.w500, .accounts_subaddresses
color: Theme.of(context) : S.of(context).addresses,
.accentTextTheme style: TextStyle(
.display3 fontSize: 14,
.backgroundColor), fontWeight: FontWeight.w500,
)), color: Theme.of(context)
Icon( .accentTextTheme
Icons.arrow_forward_ios, .display3
size: 14, .backgroundColor),
color: Theme.of(context) )),
.accentTextTheme Icon(
.display3 Icons.arrow_forward_ios,
.backgroundColor, size: 14,
) color: Theme.of(context)
], .accentTextTheme
.display3
.backgroundColor,
)
],
),
), ),
), )
) : PrimaryButton(
: PrimaryButton( onPressed: () => addressListViewModel.nextAddress(),
onPressed: () => addressListViewModel.nextAddress(), text: 'Next address',
text: 'Next address', color: Theme.of(context).buttonColor,
color: Theme.of(context).buttonColor, textColor: Theme.of(context)
textColor: Theme.of(context) .accentTextTheme
.accentTextTheme .display3
.display3 .backgroundColor);
.backgroundColor) })
], ],
), ),
)); ));

2
lib/src/screens/receive/widgets/qr_widget.dart
View file

@ -109,7 +109,7 @@ class QRWidget extends StatelessWidget {
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 15,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme. color: Theme.of(context).accentTextTheme.
display3.backgroundColor), display3.backgroundColor),

4
lib/src/screens/send/widgets/confirm_sending_alert.dart
View file

@ -148,12 +148,12 @@ class ConfirmSendingAlert extends BaseAlertDialog {
) )
), ),
Padding( Padding(
padding: EdgeInsets.fromLTRB(8, 16, 8, 0), padding: EdgeInsets.fromLTRB(0, 16, 0, 0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
recipientTitle, '$recipientTitle:',
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,

2
lib/src/widgets/base_alert_dialog.dart
View file

@ -132,7 +132,7 @@ class BaseAlertDialog extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.fromLTRB(24, 32, 24, 0), padding: EdgeInsets.fromLTRB(24, 20, 24, 0),
child: title(context), child: title(context),
), ),
isDividerExists isDividerExists

1
lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
View file

@ -143,6 +143,7 @@ abstract class WalletAddressListViewModelBase with Store {
return null; return null;
} }
@computed
bool get hasAddressList => _wallet.type == WalletType.monero; bool get hasAddressList => _wallet.type == WalletType.monero;
@observable @observable

2
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: Cake Wallet.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 4.1.0+30 version: 4.1.0+32
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.7.0 <3.0.0"