New versions (#1073)
Omar Hatem committed
Sep 8, 2023 at 17:15 UTC
94f256997f083271e3e540ef734a31c3784cf414
11 files changed
+82
-96
assets/text/Monerocom_Release_Notes.txt
+5
-2
@@ -1,2 +1,5 @@
1
-Bug fixes
2
-Fiat Onramp improvements
\ No newline at end of file
1
+Ability to Auto generate new Monero subaddress when used
2
+Coin Control for Monero
3
+In-app Live Chat support
4
+Additional themes
5
+Bug Fixes and performance enhancements
\ No newline at end of file
assets/text/Release_Notes.txt
+6
-2
@@ -1,2 +1,6 @@
1
-Bug fixes
2
-Fiat Onramp improvements
\ No newline at end of file
1
+Restore Ethereum from private key and QR
2
+Ability to Auto generate new Monero subaddress when used
3
+Coin Control for Monero
4
+In-app Live Chat support
5
+Additional themes
6
+Bug Fixes and performance enhancements
\ No newline at end of file
ios/Podfile.lock
-23
@@ -8,25 +8,6 @@ PODS:
8
- Flutter
9
- ReachabilitySwift
10
- CryptoSwift (1.7.1)
11
- - cw_haven (0.0.1):
12
- - cw_haven/Boost (= 0.0.1)
13
- - cw_haven/Haven (= 0.0.1)
14
- - cw_haven/OpenSSL (= 0.0.1)
15
- - cw_haven/Sodium (= 0.0.1)
16
- - cw_shared_external
17
- - Flutter
18
- - cw_haven/Boost (0.0.1):
19
- - cw_shared_external
20
- - Flutter
21
- - cw_haven/Haven (0.0.1):
22
- - cw_shared_external
23
- - Flutter
24
- - cw_haven/OpenSSL (0.0.1):
25
- - cw_shared_external
26
- - Flutter
27
- - cw_haven/Sodium (0.0.1):
28
- - cw_shared_external
29
- - Flutter
11
- cw_monero (0.0.2):
12
- cw_monero/Boost (= 0.0.2)
13
- cw_monero/Monero (= 0.0.2)
@@ -159,7 +140,6 @@ DEPENDENCIES:
140
- barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
141
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
142
- CryptoSwift
162
- - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
143
- cw_monero (from `.symlinks/plugins/cw_monero/ios`)
144
- cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
145
- device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
@@ -205,8 +185,6 @@ EXTERNAL SOURCES:
185
:path: ".symlinks/plugins/barcode_scan2/ios"
186
connectivity_plus:
187
:path: ".symlinks/plugins/connectivity_plus/ios"
208
- cw_haven:
209
- :path: ".symlinks/plugins/cw_haven/ios"
188
cw_monero:
189
:path: ".symlinks/plugins/cw_monero/ios"
190
cw_shared_external:
@@ -261,7 +239,6 @@ SPEC CHECKSUMS:
239
BigInt: f668a80089607f521586bbe29513d708491ef2f7
240
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
241
CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1
264
- cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
242
cw_monero: 4cf3b96f2da8e95e2ef7d6703dd4d2c509127b7d
243
cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
244
device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
ios/Runner.xcodeproj/project.pbxproj
+1
@@ -227,6 +227,7 @@
227
files = (
228
);
229
inputPaths = (
230
+ "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
231
);
232
name = "Thin Binary";
233
outputPaths = (
lib/src/screens/settings/display_settings_page.dart
+57
-55
@@ -21,64 +21,66 @@ class DisplaySettingsPage extends BasePage {
21
22
@override
23
Widget body(BuildContext context) {
24
- return Observer(builder: (_) {
25
- return Container(
26
- padding: EdgeInsets.only(top: 10),
27
- child: Column(
28
- children: [
29
- SettingsSwitcherCell(
30
- title: S.current.settings_display_balance,
31
- value: _displaySettingsViewModel.shouldDisplayBalance,
24
+ return SingleChildScrollView(
25
+ child: Observer(builder: (_) {
26
+ return Container(
27
+ padding: EdgeInsets.only(top: 10),
28
+ child: Column(
29
+ children: [
30
+ SettingsSwitcherCell(
31
+ title: S.current.settings_display_balance,
32
+ value: _displaySettingsViewModel.shouldDisplayBalance,
33
+ onValueChange: (_, bool value) {
34
+ _displaySettingsViewModel.setShouldDisplayBalance(value);
35
+ }),
36
+ SettingsSwitcherCell(
37
+ title: S.current.show_market_place,
38
+ value: _displaySettingsViewModel.shouldShowMarketPlaceInDashboard,
39
onValueChange: (_, bool value) {
33
- _displaySettingsViewModel.setShouldDisplayBalance(value);
34
- }),
35
- SettingsSwitcherCell(
36
- title: S.current.show_market_place,
37
- value: _displaySettingsViewModel.shouldShowMarketPlaceInDashboard,
38
- onValueChange: (_, bool value) {
39
- _displaySettingsViewModel.setShouldShowMarketPlaceInDashbaord(value);
40
- },
41
- ),
42
- //if (!isHaven) it does not work correctly
43
- if (!_displaySettingsViewModel.disabledFiatApiMode)
44
- SettingsPickerCell<FiatCurrency>(
45
- title: S.current.settings_currency,
46
- searchHintText: S.current.search_currency,
47
- items: FiatCurrency.all,
48
- selectedItem: _displaySettingsViewModel.fiatCurrency,
49
- onItemSelected: (FiatCurrency currency) =>
50
- _displaySettingsViewModel.setFiatCurrency(currency),
51
- images: FiatCurrency.all
52
- .map((e) => Image.asset("assets/images/flags/${e.countryCode}.png"))
40
+ _displaySettingsViewModel.setShouldShowMarketPlaceInDashbaord(value);
41
+ },
42
+ ),
43
+ //if (!isHaven) it does not work correctly
44
+ if (!_displaySettingsViewModel.disabledFiatApiMode)
45
+ SettingsPickerCell<FiatCurrency>(
46
+ title: S.current.settings_currency,
47
+ searchHintText: S.current.search_currency,
48
+ items: FiatCurrency.all,
49
+ selectedItem: _displaySettingsViewModel.fiatCurrency,
50
+ onItemSelected: (FiatCurrency currency) =>
51
+ _displaySettingsViewModel.setFiatCurrency(currency),
52
+ images: FiatCurrency.all
53
+ .map((e) => Image.asset("assets/images/flags/${e.countryCode}.png"))
54
+ .toList(),
55
+ isGridView: true,
56
+ matchingCriteria: (FiatCurrency currency, String searchText) {
57
+ return currency.title.toLowerCase().contains(searchText) ||
58
+ currency.fullName.toLowerCase().contains(searchText);
59
+ },
60
+ ),
61
+ SettingsPickerCell<String>(
62
+ title: S.current.settings_change_language,
63
+ searchHintText: S.current.search_language,
64
+ items: LanguageService.list.keys.toList(),
65
+ displayItem: (dynamic code) {
66
+ return LanguageService.list[code] ?? '';
67
+ },
68
+ selectedItem: _displaySettingsViewModel.languageCode,
69
+ onItemSelected: _displaySettingsViewModel.onLanguageSelected,
70
+ images: LanguageService.list.keys
71
+ .map((e) => Image.asset(
72
+ "assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
73
.toList(),
54
- isGridView: true,
55
- matchingCriteria: (FiatCurrency currency, String searchText) {
56
- return currency.title.toLowerCase().contains(searchText) ||
57
- currency.fullName.toLowerCase().contains(searchText);
74
+ matchingCriteria: (String code, String searchText) {
75
+ return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
76
},
77
),
60
- SettingsPickerCell<String>(
61
- title: S.current.settings_change_language,
62
- searchHintText: S.current.search_language,
63
- items: LanguageService.list.keys.toList(),
64
- displayItem: (dynamic code) {
65
- return LanguageService.list[code] ?? '';
66
- },
67
- selectedItem: _displaySettingsViewModel.languageCode,
68
- onItemSelected: _displaySettingsViewModel.onLanguageSelected,
69
- images: LanguageService.list.keys
70
- .map((e) => Image.asset(
71
- "assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
72
- .toList(),
73
- matchingCriteria: (String code, String searchText) {
74
- return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
75
- },
76
- ),
77
- if (ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile)
78
- SettingsThemeChoicesCell(_displaySettingsViewModel),
79
- ],
80
- ),
81
- );
82
- });
78
+ if (ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile)
79
+ SettingsThemeChoicesCell(_displaySettingsViewModel),
80
+ ],
81
+ ),
82
+ );
83
+ }),
84
+ );
85
}
86
}
lib/src/screens/support/widgets/support_tiles.dart
+2
-1
@@ -1,3 +1,4 @@
1
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
2
import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
3
import 'package:flutter/material.dart';
4
@@ -44,7 +45,7 @@ class SupportTile extends StatelessWidget {
45
style: TextStyle(
46
fontSize: 20,
47
fontWeight: FontWeight.w500,
47
- color: Theme.of(context).dialogTheme.backgroundColor,
48
+ color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
49
),
50
),
51
Padding(
lib/src/widgets/search_bar_widget.dart
+1
-1
@@ -17,7 +17,7 @@ class SearchBarWidget extends StatelessWidget {
17
Widget build(BuildContext context) {
18
return TextFormField(
19
controller: searchController,
20
- style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchTextColor),
20
+ style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
21
decoration: InputDecoration(
22
hintText: hintText ?? S.of(context).search_currency,
23
hintStyle: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
lib/view_model/unspent_coins/unspent_coins_list_view_model.dart
-2
@@ -3,11 +3,9 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart';
3
import 'package:cake_wallet/entities/unspent_transaction_output.dart';
4
import 'package:cake_wallet/monero/monero.dart';
5
import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_item.dart';
6
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
6
import 'package:cw_core/unspent_coins_info.dart';
7
import 'package:cw_core/wallet_base.dart';
8
import 'package:cw_core/wallet_type.dart';
10
-import 'package:cw_monero/monero_wallet.dart';
9
import 'package:hive/hive.dart';
10
import 'package:mobx/mobx.dart';
11
scripts/android/app_env.sh
+4
-4
@@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
14
APP_ANDROID_TYPE=$1
15
16
MONERO_COM_NAME="Monero.com"
17
-MONERO_COM_VERSION="1.5.1"
18
-MONERO_COM_BUILD_NUMBER=55
17
+MONERO_COM_VERSION="1.6.0"
18
+MONERO_COM_BUILD_NUMBER=56
19
MONERO_COM_BUNDLE_ID="com.monero.app"
20
MONERO_COM_PACKAGE="com.monero.app"
21
22
CAKEWALLET_NAME="Cake Wallet"
23
-CAKEWALLET_VERSION="4.8.1"
24
-CAKEWALLET_BUILD_NUMBER=168
23
+CAKEWALLET_VERSION="4.9.0"
24
+CAKEWALLET_BUILD_NUMBER=169
25
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
26
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
27
scripts/ios/app_env.sh
+4
-4
@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
13
APP_IOS_TYPE=$1
14
15
MONERO_COM_NAME="Monero.com"
16
-MONERO_COM_VERSION="1.5.1"
17
-MONERO_COM_BUILD_NUMBER=53
16
+MONERO_COM_VERSION="1.6.0"
17
+MONERO_COM_BUILD_NUMBER=54
18
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20
CAKEWALLET_NAME="Cake Wallet"
21
-CAKEWALLET_VERSION="4.8.1"
22
-CAKEWALLET_BUILD_NUMBER=176
21
+CAKEWALLET_VERSION="4.9.0"
22
+CAKEWALLET_BUILD_NUMBER=178
23
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25
HAVEN_NAME="Haven"
scripts/macos/app_env.sh
+2
-2
@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
15
fi
16
17
CAKEWALLET_NAME="Cake Wallet"
18
-CAKEWALLET_VERSION="1.1.1"
19
-CAKEWALLET_BUILD_NUMBER=30
18
+CAKEWALLET_VERSION="1.2.0"
19
+CAKEWALLET_BUILD_NUMBER=31
20
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
21
22
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then