Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 11:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged cake-42

Browse source
This commit is contained in:
M 2020-09-22 18:59:10 +03:00
commit 5f88c4bafd
8 changed files with 79 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
cw_monero/pubspec.lock
View file

@ -1,27 +1,13 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.0"
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.1"
version: "2.4.2"
boolean_selector:
dependency: transitive
description:
@ -29,6 +15,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
charcode:
dependency: transitive
description:
@ -36,27 +29,27 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.3"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.12"
convert:
version: "1.14.13"
fake_async:
dependency: transitive
description:
name: convert
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.4"
version: "1.1.0"
ffi:
dependency: "direct main"
description:
@ -74,20 +67,13 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.12"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.6"
version: "0.12.8"
meta:
dependency: transitive
description:
@ -101,7 +87,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.4"
version: "1.7.0"
path_provider:
dependency: "direct main"
description:
@ -109,13 +95,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.0"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
platform:
dependency: transitive
description:
@ -123,13 +102,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
sky_engine:
dependency: transitive
description: flutter
@ -148,7 +120,7 @@ packages:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
version: "1.9.5"
stream_channel:
dependency: transitive
description:
@ -176,14 +148,14 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.15"
version: "0.2.17"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.6"
version: "1.2.0"
vector_math:
dependency: transitive
description:
@ -191,13 +163,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.6.1"
sdks:
dart: ">=2.6.0 <3.0.0"
dart: ">=2.9.0-14.0.dev <3.0.0"
flutter: ">=0.1.4 <2.0.0"

1
ios/Flutter/.last_build_id Normal file
View file

@ -0,0 +1 @@
09c81fe0a3d701eb6da3bd2c6fc5ec65

1
ios/Flutter/.last_build_id~f562d69b256a041543083a667d6e400bdf35be84 Normal file
View file

@ -0,0 +1 @@
f88b397cc50258e916c86427fe071d09

2
ios/Podfile.lock
View file

@ -119,4 +119,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: ade2ba43f8c2af4060c025bfd25a553d068ab914
COCOAPODS: 1.9.3
COCOAPODS: 1.8.4

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

@ -383,7 +383,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cakewallet.cakewallet;
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@ -522,7 +522,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cakewallet.cakewallet;
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -555,7 +555,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cakewallet.cakewallet;
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;

4
ios/Runner/Info.plist
View file

@ -22,6 +22,10 @@
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>Used for scan QR code</string>
<key>NSFaceIDUsageDescription</key>
<string>Enable Face ID for fast and secure access to wallets and private keys</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>

44
lib/entities/fs_migration.dart
View file

@ -5,6 +5,8 @@ import 'package:cake_wallet/entities/crypto_currency.dart';
import 'package:cake_wallet/entities/wallet_info.dart';
import 'package:cake_wallet/entities/wallet_type.dart';
import 'package:cake_wallet/exchange/trade.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter/foundation.dart';
import 'package:hive/hive.dart';
import 'package:path_provider/path_provider.dart';
@ -20,6 +22,48 @@ Future<void> migrate_android_v1() async {
Future<void> migrate_ios_v1() async {
final appDocDir = await getApplicationDocumentsDirectory();
//get the new shared preferences instance
SharedPreferences prefs = await SharedPreferences.getInstance();
//translate the node uri
String nodeURI = prefs.getString('node_uri');
await prefs.setString('current_node_id', nodeURI);
//should we provide default btc node key?
int activeCurrency = prefs.getInt('currency');
await prefs.setInt('current_fiat_currency', activeCurrency);
//translate fee priority
int activeFeeTier = prefs.getInt('saved_fee_priority');
await prefs.setInt('current_fee_priority', activeFeeTier);
//translate current balance mode
int currentBalanceMode = prefs.getInt('display_balance_mode');
await prefs.setInt('current_balance_display_mode', currentBalanceMode);
//translate should save recipient address
bool shouldSave = prefs.getBool('should_save_recipient_address');
await prefs.setBool('save_recipient_address', shouldSave);
//translate biometric
bool biometricOn = prefs.getBool('biometric_authentication_on');
await prefs.setBool('allow_biometrical_authentication', biometricOn);
//read the current theme as integer, write it back as a bool
int currentTheme = prefs.getInt('current-theme');
bool isDark = false;
if (currentTheme == 1) {
isDark = true;
}
await prefs.setBool('dark_theme', isDark);
//assign the pin lenght
int pinLength = prefs.getInt('pin-length');
await prefs.setInt('pin-length', pinLength);
//default value for display list key?
String walletName = prefs.getString('current_wallet_name');
await prefs.setString('current_wallet_name', walletName);
}
Future<void> migrate_hives({Directory appDocDir}) async {

8
lib/src/screens/dashboard/dashboard_page.dart
View file

@ -126,14 +126,6 @@ class DashboardPage extends BasePage {
route: Routes.exchange
),
),
Flexible(
child: ActionButton(
image: receiveImage,
title: S.of(context).receive,
route: Routes.receive,
alignment: Alignment.centerRight,
),
)
],
),
)