mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-06-28 20:39:51 +00:00
v4.23.2 Release Candidate (#2039)
* v4.23.2 Release Candidate * adjust bottom nav bar height * Adjust gradient and padding * fix blur
This commit is contained in:
parent
8798c1bf9e
commit
e8fdf33a79
9 changed files with 99 additions and 190 deletions
|
@ -1,4 +1,3 @@
|
||||||
Added passphrase support
|
Ledger fixes
|
||||||
Added decentralized cross-chain exchange, Chainflip
|
|
||||||
UI enhancements
|
UI enhancements
|
||||||
Bug fixes
|
Bug fixes
|
|
@ -1,5 +1,5 @@
|
||||||
Added Zano wallet support
|
Zano enhancements
|
||||||
Added Monero/Wownero passphrase support
|
Ethereum enhancements
|
||||||
Added decentralized cross-chain exchange, Chainflip
|
Ledger fixes
|
||||||
UI enhancements
|
UI enhancements
|
||||||
Bug fixes
|
Bug fixes
|
|
@ -18,37 +18,17 @@ class NavigationDock extends StatelessWidget {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright
|
return Positioned(
|
||||||
? Positioned(
|
|
||||||
child: Observer(
|
child: Observer(
|
||||||
builder: (_) {
|
builder: (_) {
|
||||||
return Container(
|
return Container(
|
||||||
alignment: Alignment.bottomCenter,
|
|
||||||
height: 150,
|
height: 150,
|
||||||
|
alignment: Alignment.bottomCenter,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
gradient: LinearGradient(
|
gradient: LinearGradient(
|
||||||
begin: Alignment.topCenter,
|
begin: Alignment.topCenter,
|
||||||
end: Alignment.bottomCenter,
|
end: Alignment.bottomCenter,
|
||||||
colors: <Color>[
|
colors: _getColors(context),
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(10),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(75),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(150),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor,
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Container(
|
child: Container(
|
||||||
|
@ -58,136 +38,18 @@ class NavigationDock extends StatelessWidget {
|
||||||
child: BackdropFilter(
|
child: BackdropFilter(
|
||||||
filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
|
filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
|
||||||
child: Container(
|
child: Container(
|
||||||
height: 75,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
borderRadius: BorderRadius.circular(50.0),
|
|
||||||
border: Border.all(
|
|
||||||
color:
|
|
||||||
Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
|
|
||||||
width: 1,
|
|
||||||
),
|
|
||||||
color: Theme.of(context)
|
|
||||||
.extension<SyncIndicatorTheme>()!
|
|
||||||
.syncedBackgroundColor,
|
|
||||||
),
|
|
||||||
child: Container(
|
|
||||||
padding: EdgeInsets.symmetric(horizontal: 10),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: MainActions.all
|
|
||||||
.where((element) =>
|
|
||||||
element.canShow?.call(dashboardViewModel) ?? true)
|
|
||||||
.map(
|
|
||||||
(action) => Expanded(
|
|
||||||
child: Semantics(
|
|
||||||
button: true,
|
|
||||||
enabled:
|
|
||||||
(action.isEnabled?.call(dashboardViewModel) ?? true),
|
|
||||||
child: ActionButton(
|
|
||||||
key: ValueKey(
|
|
||||||
'dashboard_page_${action.name(context)}_action_button_key'),
|
|
||||||
image: Image.asset(
|
|
||||||
action.image,
|
|
||||||
height: 24,
|
|
||||||
width: 24,
|
|
||||||
color:
|
|
||||||
action.isEnabled?.call(dashboardViewModel) ?? true
|
|
||||||
? Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.mainActionsIconColor
|
|
||||||
: Theme.of(context)
|
|
||||||
.extension<BalancePageTheme>()!
|
|
||||||
.labelTextColor,
|
|
||||||
),
|
|
||||||
title: action.name(context),
|
|
||||||
onClick: () async =>
|
|
||||||
await action.onTap(context, dashboardViewModel),
|
|
||||||
textColor:
|
|
||||||
action.isEnabled?.call(dashboardViewModel) ?? true
|
|
||||||
? null
|
|
||||||
: Theme.of(context)
|
|
||||||
.extension<BalancePageTheme>()!
|
|
||||||
.labelTextColor,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.toList(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: Positioned(
|
|
||||||
child: Observer(
|
|
||||||
builder: (_) {
|
|
||||||
return Container(
|
|
||||||
alignment: Alignment.bottomCenter,
|
|
||||||
height: 150,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
gradient: LinearGradient(
|
|
||||||
begin: Alignment.topCenter,
|
|
||||||
end: Alignment.bottomCenter,
|
|
||||||
colors: <Color>[
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(5),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(50),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(125),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(150),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
.withAlpha(200),
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor,
|
|
||||||
Theme.of(context)
|
|
||||||
.extension<DashboardPageTheme>()!
|
|
||||||
.thirdGradientBackgroundColor
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: Container(
|
|
||||||
margin: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
|
|
||||||
child: Container(
|
|
||||||
height: 75,
|
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
borderRadius: BorderRadius.circular(50.0),
|
borderRadius: BorderRadius.circular(50.0),
|
||||||
border: Border.all(
|
border: Border.all(
|
||||||
color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
|
color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
|
||||||
width: 1,
|
width: 1,
|
||||||
),
|
),
|
||||||
color: Theme.of(context)
|
color:
|
||||||
.extension<SyncIndicatorTheme>()!
|
Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
|
||||||
.syncedBackgroundColor,
|
|
||||||
// boxShadow: [
|
|
||||||
// BoxShadow(
|
|
||||||
// color: Theme.of(context)
|
|
||||||
// .extension<BalancePageTheme>()!
|
|
||||||
// .cardBorderColor
|
|
||||||
// .withAlpha(50),
|
|
||||||
// spreadRadius: dashboardViewModel.getShadowSpread(),
|
|
||||||
// blurRadius: dashboardViewModel.getShadowBlur())
|
|
||||||
// ],
|
|
||||||
),
|
),
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 10),
|
padding: EdgeInsets.symmetric(horizontal: 10),
|
||||||
|
child: IntrinsicHeight(
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: MainActions.all
|
children: MainActions.all
|
||||||
|
@ -229,9 +91,57 @@ class NavigationDock extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<Color> _getColors(BuildContext context) {
|
||||||
|
final isBright = dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright;
|
||||||
|
return isBright
|
||||||
|
? <Color>[
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(10),
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(75),
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(150),
|
||||||
|
Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor,
|
||||||
|
Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor
|
||||||
|
]
|
||||||
|
: <Color>[
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(5),
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(50),
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(125),
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(150),
|
||||||
|
Theme.of(context)
|
||||||
|
.extension<DashboardPageTheme>()!
|
||||||
|
.thirdGradientBackgroundColor
|
||||||
|
.withAlpha(200),
|
||||||
|
Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor,
|
||||||
|
Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,7 @@ class ActionButton extends StatelessWidget {
|
||||||
},
|
},
|
||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.transparent,
|
color: Colors.transparent,
|
||||||
padding: EdgeInsets.only(top: 5, bottom: 5, left: 0, right: 0),
|
padding: EdgeInsets.only(top: 5, bottom: 4, left: 0, right: 0),
|
||||||
alignment: alignment,
|
alignment: alignment,
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
|
|
|
@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
|
||||||
APP_ANDROID_TYPE=$1
|
APP_ANDROID_TYPE=$1
|
||||||
|
|
||||||
MONERO_COM_NAME="Monero.com"
|
MONERO_COM_NAME="Monero.com"
|
||||||
MONERO_COM_VERSION="1.20.0"
|
MONERO_COM_VERSION="1.20.2"
|
||||||
MONERO_COM_BUILD_NUMBER=113
|
MONERO_COM_BUILD_NUMBER=114
|
||||||
MONERO_COM_BUNDLE_ID="com.monero.app"
|
MONERO_COM_BUNDLE_ID="com.monero.app"
|
||||||
MONERO_COM_PACKAGE="com.monero.app"
|
MONERO_COM_PACKAGE="com.monero.app"
|
||||||
MONERO_COM_SCHEME="monero.com"
|
MONERO_COM_SCHEME="monero.com"
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="4.23.0"
|
CAKEWALLET_VERSION="4.23.2"
|
||||||
CAKEWALLET_BUILD_NUMBER=246
|
CAKEWALLET_BUILD_NUMBER=247
|
||||||
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
|
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
|
||||||
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
|
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
|
||||||
CAKEWALLET_SCHEME="cakewallet"
|
CAKEWALLET_SCHEME="cakewallet"
|
||||||
|
|
|
@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
|
||||||
APP_IOS_TYPE=$1
|
APP_IOS_TYPE=$1
|
||||||
|
|
||||||
MONERO_COM_NAME="Monero.com"
|
MONERO_COM_NAME="Monero.com"
|
||||||
MONERO_COM_VERSION="1.20.1"
|
MONERO_COM_VERSION="1.20.2"
|
||||||
MONERO_COM_BUILD_NUMBER=111
|
MONERO_COM_BUILD_NUMBER=112
|
||||||
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="4.23.1"
|
CAKEWALLET_VERSION="4.23.2"
|
||||||
CAKEWALLET_BUILD_NUMBER=295
|
CAKEWALLET_BUILD_NUMBER=296
|
||||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||||
|
|
||||||
HAVEN_NAME="Haven"
|
HAVEN_NAME="Haven"
|
||||||
|
|
|
@ -14,8 +14,8 @@ if [ -n "$1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="1.13.0"
|
CAKEWALLET_VERSION="1.13.2"
|
||||||
CAKEWALLET_BUILD_NUMBER=46
|
CAKEWALLET_BUILD_NUMBER=47
|
||||||
|
|
||||||
if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
|
if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
|
||||||
echo "Wrong app type."
|
echo "Wrong app type."
|
||||||
|
|
|
@ -16,13 +16,13 @@ if [ -n "$1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MONERO_COM_NAME="Monero.com"
|
MONERO_COM_NAME="Monero.com"
|
||||||
MONERO_COM_VERSION="1.10.0"
|
MONERO_COM_VERSION="1.10.2"
|
||||||
MONERO_COM_BUILD_NUMBER=43
|
MONERO_COM_BUILD_NUMBER=44
|
||||||
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="1.16.0"
|
CAKEWALLET_VERSION="1.16.2"
|
||||||
CAKEWALLET_BUILD_NUMBER=104
|
CAKEWALLET_BUILD_NUMBER=105
|
||||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||||
|
|
||||||
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
|
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#define MyAppName "Cake Wallet"
|
#define MyAppName "Cake Wallet"
|
||||||
#define MyAppVersion "0.4.0"
|
#define MyAppVersion "0.4.2"
|
||||||
#define MyAppPublisher "Cake Labs LLC"
|
#define MyAppPublisher "Cake Labs LLC"
|
||||||
#define MyAppURL "https://cakewallet.com/"
|
#define MyAppURL "https://cakewallet.com/"
|
||||||
#define MyAppExeName "CakeWallet.exe"
|
#define MyAppExeName "CakeWallet.exe"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue