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

CAKE-304 | upgraded project to flutter 2.x.x, upgraded packages and resolved problems

Browse source
This commit is contained in:
OleksandrSobol 2021-04-02 20:43:06 +03:00
parent c0a12c6026
commit 0cd4bd46f7
10 changed files with 127 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/core/fiat_conversion_service.dart
View file

@ -16,7 +16,8 @@ Future<double> _fetchPrice(Map<String, dynamic> args) async {
try {
final fiatStringified = fiat.toString();
final uri =
Uri.https(fiatApiAuthority, fiatApiPath, {'convert': fiatStringified});
Uri.https(fiatApiAuthority, fiatApiPath,
<String, String> {'convert': fiatStringified});
final response = await get(uri.toString());
if (response.statusCode != 200) {

2
lib/entities/transaction_history.dart
View file

@ -1,4 +1,4 @@
import 'package:rxdart/rxdart.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/entities/transaction_info.dart';
abstract class TransactionHistory {

2
lib/entities/wallet.dart
View file

@ -1,4 +1,4 @@
import 'package:rxdart/rxdart.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/entities/sync_status.dart';
import 'package:cake_wallet/entities/transaction_history.dart';
import 'package:cake_wallet/entities/wallet_type.dart';

2
lib/src/screens/auth/auth_page.dart
View file

@ -142,7 +142,7 @@ class AuthPageState extends State<AuthPage> {
: Container(),
backgroundColor: Theme.of(context).backgroundColor,
border: null),
resizeToAvoidBottomPadding: false,
resizeToAvoidBottomInset: false,
body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),
(_) => null, widget.authViewModel.pinLength, false, _pinCodeKey));
}

4
lib/src/screens/base_page.dart
View file

@ -28,7 +28,7 @@ abstract class BasePage extends StatelessWidget {
Color get titleColor => null;
bool get resizeToAvoidBottomPadding => true;
bool get resizeToAvoidBottomInset => true;
bool get extendBodyBehindAppBar => false;
@ -138,7 +138,7 @@ abstract class BasePage extends StatelessWidget {
final root = Scaffold(
key: _scaffoldKey,
backgroundColor: _backgroundColor,
resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
resizeToAvoidBottomInset: resizeToAvoidBottomInset,
extendBodyBehindAppBar: extendBodyBehindAppBar,
endDrawer: endDrawer,
appBar: appBar(context),

2
lib/src/screens/pin_code/pin_code_widget.dart
View file

@ -101,7 +101,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
@override
Widget build(BuildContext context) => Scaffold(
key: _key, body: body(context), resizeToAvoidBottomPadding: false);
key: _key, body: body(context), resizeToAvoidBottomInset: false);
Widget body(BuildContext context) {
final deleteIconImage = Image.asset(

2
lib/src/screens/welcome/welcome_page.dart
View file

@ -16,7 +16,7 @@ class WelcomePage extends BasePage {
backgroundColor: Theme
.of(context)
.backgroundColor,
resizeToAvoidBottomPadding: false,
resizeToAvoidBottomInset: false,
body: body(context));
}

6
lib/utils/show_pop_up.dart
View file

@ -7,8 +7,7 @@ Future<T> showPopUp<T>({
Color barrierColor,
bool useSafeArea = false,
bool useRootNavigator = true,
RouteSettings routeSettings,
Widget child,
RouteSettings routeSettings
}) {
return showDialog<T>(
context: context,
@ -17,6 +16,5 @@ Future<T> showPopUp<T>({
barrierColor: barrierColor,
useSafeArea: useSafeArea,
useRootNavigator: useRootNavigator,
routeSettings: routeSettings,
child: child);
routeSettings: routeSettings);
}

199
pubspec.lock
View file

@ -7,14 +7,14 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "12.0.0"
version: "14.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "0.40.6"
version: "0.41.2"
archive:
dependency: "direct main"
description:
@ -42,7 +42,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.0-nullsafety.1"
version: "2.5.0"
auto_size_text:
dependency: "direct main"
description:
@ -63,7 +63,7 @@ packages:
name: basic_utils
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
version: "2.0.3"
bech32:
dependency: transitive
description:
@ -91,14 +91,14 @@ packages:
name: bitcoin_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.2"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0-nullsafety.1"
version: "2.1.0"
bs58check:
dependency: transitive
description:
@ -112,42 +112,42 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.0"
version: "1.6.2"
build_config:
dependency: transitive
description:
name: build_config
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.2"
version: "0.4.6"
build_daemon:
dependency: transitive
description:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.4"
version: "2.1.10"
build_resolvers:
dependency: "direct dev"
description:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.3"
version: "1.5.3"
build_runner:
dependency: "direct dev"
description:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.4"
version: "1.11.5"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.3"
version: "6.1.10"
built_collection:
dependency: transitive
description:
@ -168,77 +168,77 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0-nullsafety.3"
version: "1.1.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0-nullsafety.1"
version: "1.2.0"
checked_yaml:
dependency: transitive
description:
name: checked_yaml
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.4"
cli_util:
dependency: transitive
description:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
version: "0.3.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0-nullsafety.1"
version: "1.1.0"
code_builder:
dependency: transitive
description:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted
version: "3.5.0"
version: "3.7.0"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0-nullsafety.3"
version: "1.15.0"
connectivity:
dependency: "direct main"
description:
name: connectivity
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.9+5"
version: "3.0.3"
connectivity_for_web:
dependency: transitive
description:
name: connectivity_for_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.1+4"
version: "0.4.0"
connectivity_macos:
dependency: transitive
description:
name: connectivity_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.0+7"
version: "0.2.0"
connectivity_platform_interface:
dependency: transitive
description:
name: connectivity_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.6"
version: "2.0.0"
convert:
dependency: transitive
description:
@ -266,7 +266,7 @@ packages:
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "1.0.2"
cw_monero:
dependency: "direct main"
description:
@ -280,7 +280,7 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.9"
version: "1.3.12"
dartx:
dependency: transitive
description:
@ -294,28 +294,28 @@ packages:
name: date_range_picker
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.6"
version: "1.0.7"
devicelocale:
dependency: "direct main"
description:
name: devicelocale
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.3"
version: "0.4.1"
dio:
dependency: "direct main"
description:
name: dio
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.7"
version: "3.0.10"
dotted_border:
dependency: "direct main"
description:
name: dotted_border
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.6"
version: "1.0.7"
encrypt:
dependency: "direct main"
description:
@ -336,7 +336,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0-nullsafety.1"
version: "1.2.0"
ffi:
dependency: transitive
description:
@ -350,14 +350,14 @@ packages:
name: file
url: "https://pub.dartlang.org"
source: hosted
version: "5.2.1"
version: "6.1.0"
file_picker:
dependency: "direct main"
description:
name: file_picker
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.4"
version: "3.0.0-nullsafety.2"
fixnum:
dependency: transitive
description:
@ -390,7 +390,7 @@ packages:
name: flutter_launcher_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.7.5"
version: "0.8.1"
flutter_localizations:
dependency: "direct main"
description: flutter
@ -409,7 +409,7 @@ packages:
name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.11"
version: "2.0.1"
flutter_secure_storage:
dependency: "direct main"
description:
@ -432,7 +432,7 @@ packages:
name: flutter_spinkit
url: "https://pub.dartlang.org"
source: hosted
version: "4.1.2+1"
version: "5.0.0"
flutter_test:
dependency: "direct dev"
description: flutter
@ -449,14 +449,14 @@ packages:
name: get_it
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.4"
version: "6.0.0"
glob:
dependency: transitive
description:
name: glob
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "2.0.1"
graphs:
dependency: transitive
description:
@ -526,42 +526,42 @@ packages:
name: intl
url: "https://pub.dartlang.org"
source: hosted
version: "0.16.1"
version: "0.17.0"
io:
dependency: transitive
description:
name: io
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.4"
version: "0.3.5"
js:
dependency: transitive
description:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.2"
version: "0.6.3"
json_annotation:
dependency: transitive
description:
name: json_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "3.1.1"
keyboard_actions:
dependency: "direct main"
description:
name: keyboard_actions
url: "https://pub.dartlang.org"
source: hosted
version: "3.3.1+1"
version: "3.4.0"
local_auth:
dependency: "direct main"
description:
name: local_auth
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3+4"
version: "1.1.1"
logging:
dependency: transitive
description:
@ -575,21 +575,21 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10-nullsafety.1"
version: "0.12.10"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0"
mime:
dependency: transitive
description:
name: mime
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.7"
version: "1.0.0"
mobx:
dependency: "direct main"
description:
@ -604,20 +604,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.2"
node_interop:
nested:
dependency: transitive
description:
name: node_interop
name: nested
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
node_io:
dependency: transitive
description:
name: node_io
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "1.0.0"
package_config:
dependency: transitive
description:
@ -631,7 +624,7 @@ packages:
name: package_info
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3+2"
version: "2.0.0"
password:
dependency: "direct main"
description:
@ -645,7 +638,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0-nullsafety.1"
version: "1.8.0"
path_drawing:
dependency: transitive
description:
@ -666,7 +659,7 @@ packages:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.24"
version: "1.6.28"
path_provider_linux:
dependency: transitive
description:
@ -680,7 +673,7 @@ packages:
name: path_provider_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.4+6"
version: "0.0.4+8"
path_provider_platform_interface:
dependency: transitive
description:
@ -701,21 +694,21 @@ packages:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.2"
version: "1.11.0"
permission_handler:
dependency: "direct main"
description:
name: permission_handler
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.1+1"
version: "5.1.0+2"
permission_handler_platform_interface:
dependency: transitive
description:
name: permission_handler_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.2"
petitparser:
dependency: transitive
description:
@ -729,14 +722,14 @@ packages:
name: platform
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "3.0.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "1.1.0-nullsafety.2"
pointycastle:
dependency: transitive
description:
@ -750,49 +743,49 @@ packages:
name: pool
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.0"
version: "1.5.0"
process:
dependency: transitive
description:
name: process
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.13"
version: "4.2.1"
protobuf:
dependency: transitive
description:
name: protobuf
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.3"
provider:
dependency: "direct main"
description:
name: provider
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.0"
version: "5.0.0"
pub_semver:
dependency: transitive
description:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.4"
version: "2.0.0"
pubspec_parse:
dependency: transitive
description:
name: pubspec_parse
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5"
version: "0.1.8"
qr:
dependency: "direct main"
description:
name: qr
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "2.0.0"
quiver:
dependency: transitive
description:
@ -806,14 +799,14 @@ packages:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.22.6"
version: "0.26.0"
share:
dependency: "direct main"
description:
name: share
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.5+4"
version: "2.0.1"
shared_preferences:
dependency: "direct main"
description:
@ -855,7 +848,7 @@ packages:
name: shared_preferences_windows
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+3"
version: "0.0.2+3"
shelf:
dependency: transitive
description:
@ -869,7 +862,7 @@ packages:
name: shelf_web_socket
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.3"
version: "0.2.4+1"
sky_engine:
dependency: transitive
description: flutter
@ -881,175 +874,175 @@ packages:
name: smooth_page_indicator
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
version: "0.2.3"
source_gen:
dependency: transitive
description:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.8"
version: "0.9.10+3"
source_span:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0-nullsafety.2"
version: "1.8.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.1"
version: "1.10.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0-nullsafety.1"
version: "2.1.0"
stream_transform:
dependency: transitive
description:
name: stream_transform
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "2.0.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0-nullsafety.1"
version: "1.1.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0-nullsafety.1"
version: "1.2.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19-nullsafety.2"
version: "0.2.19"
time:
dependency: transitive
description:
name: time
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.4.1"
timing:
dependency: transitive
description:
name: timing
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.1+2"
version: "0.1.1+3"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0"
unorm_dart:
dependency: "direct main"
description:
name: unorm_dart
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
version: "0.2.0"
url_launcher:
dependency: "direct main"
description:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "5.7.10"
version: "6.0.3"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+4"
version: "2.0.0"
url_launcher_macos:
dependency: transitive
description:
name: url_launcher_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+9"
version: "2.0.0"
url_launcher_platform_interface:
dependency: transitive
description:
name: url_launcher_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.9"
version: "2.0.1"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5+1"
version: "2.0.0"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+3"
version: "2.0.0"
uuid:
dependency: "direct main"
description:
name: uuid
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.2.2"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0-nullsafety.3"
version: "2.1.0"
watcher:
dependency: transitive
description:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.7+15"
version: "1.0.0"
web_socket_channel:
dependency: transitive
description:
name: web_socket_channel
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
webview_flutter:
dependency: "direct main"
description:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.7"
version: "2.0.2"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.4"
version: "1.7.4+1"
xdg_directories:
dependency: transitive
description:
@ -1072,5 +1065,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.10.0 <2.11.0"
flutter: ">=1.22.0 <2.0.0"
dart: ">=2.12.0 <3.0.0"
flutter: ">=2.0.0"

40
pubspec.yaml
View file

@ -22,18 +22,18 @@ dependencies:
flutter_localizations:
sdk: flutter
flutter_cupertino_localizations: ^1.0.1
intl: ^0.16.0
url_launcher: ^5.1.2
qr: ^1.2.0
uuid: 2.0.1
intl: ^0.17.0
url_launcher: ^6.0.3
qr: ^2.0.0
uuid: ^2.2.2
shared_preferences: ^0.5.3+4
flutter_secure_storage:
git:
url: https://github.com/cake-tech/flutter_secure_storage.git
ref: cake
version: 3.3.57
provider: ^3.1.0
rxdart: ^0.22.2
provider: ^5.0.0
rxdart: ^0.26.0
yaml: ^2.1.16
barcode_scan: any
http: ^0.12.0+2
@ -41,39 +41,39 @@ dependencies:
mobx: ^1.2.1+2
flutter_mobx: ^1.1.0+2
flutter_slidable: ^0.5.3
share: ^0.6.2+1
share: ^2.0.1
esys_flutter_share: ^1.0.2
date_range_picker: ^1.0.6
dio: 3.0.7
dio: ^3.0.10
cw_monero:
path: ./cw_monero
hive: ^1.4.4+1
hive_flutter: ^0.3.1
local_auth: ^0.6.1
package_info: ^0.4.0+13
devicelocale: ^0.2.1
local_auth: ^1.1.1
package_info: ^2.0.0
devicelocale: ^0.4.1
auto_size_text: ^2.1.0
dotted_border: ^1.0.5
smooth_page_indicator: ^0.2.0
webview_flutter: ^1.0.7
flutter_spinkit: ^4.1.2
webview_flutter: ^2.0.2
flutter_spinkit: ^5.0.0
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^0.1.2
cupertino_icons: ^1.0.2
encrypt: ^4.0.0
crypto: ^2.1.5
password: ^1.0.0
basic_utils: ^1.0.8
basic_utils: ^2.0.3
bitcoin_flutter: ^2.0.0
get_it: ^4.0.2
connectivity: ^0.4.9+2
get_it: ^6.0.0
connectivity: ^3.0.3
keyboard_actions: ^3.3.0
flushbar: ^1.10.4
archive: ^2.0.13
cryptography: ^1.4.0
file_picker: ^2.1.4
unorm_dart: ^0.1.2
file_picker: ^3.0.0-nullsafety.2
unorm_dart: ^0.2.0
permission_handler: ^5.0.1+1
dev_dependencies:
@ -83,7 +83,7 @@ dev_dependencies:
build_resolvers: ^1.3.10
mobx_codegen: ^1.1.0+1
hive_generator: ^0.8.1
flutter_launcher_icons: ^0.7.4
flutter_launcher_icons: ^0.8.1
pedantic: ^1.8.0
flutter_icons: