Upgrade to flutter 3

This commit is contained in:
poka 2022-05-16 22:27:25 +02:00
parent 88b3e9fb9b
commit b1b27743a0
7 changed files with 105 additions and 102 deletions

View File

@ -33,7 +33,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
CesiumPlusProvider _cesiumPlusProvider =
Provider.of<CesiumPlusProvider>(context, listen: false);
log.i('Build pubkey : ' + pubkey!);
WidgetsBinding.instance?.addPostFrameCallback((_) {});
// WidgetsBinding.instance.addPostFrameCallback((_) {});
_historyProvider.balance = _historyProvider.transBC = null;

View File

@ -100,7 +100,7 @@ class HomeScreen extends StatelessWidget {
body: Builder(
builder: (ctx) => StatefulWrapper(
onInit: () {
WidgetsBinding.instance?.addPostFrameCallback((_) async {
WidgetsBinding.instance.addPostFrameCallback((_) async {
if (!_sub.sdkReady && !_sub.sdkLoading) await _sub.initApi();
if (_sub.sdkReady && !_sub.nodeConnected) {
await _sub.connectNode();

View File

@ -6,11 +6,9 @@ import 'package:gecko/screens/myWallets/confirm_wallet_storage.dart';
import 'package:flutter/material.dart';
import 'package:printing/printing.dart';
import 'package:provider/provider.dart';
import 'package:super_tooltip/super_tooltip.dart';
// ignore: must_be_immutable
class GenerateFastChestScreen extends StatelessWidget {
SuperTooltip? tooltip;
bool hasError = false;
String validPin = 'NO PIN';
String currentText = "";

View File

@ -422,7 +422,7 @@ class WalletOptions extends StatelessWidget {
onTap: !walletProvider.isDefaultWallet
? () async {
await walletProvider.deleteWallet(context, wallet);
WidgetsBinding.instance?.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_myWalletProvider.listWallets =
_myWalletProvider.readAllWallets(_currentChest);
_myWalletProvider.rebuildWidget();

View File

@ -7,7 +7,7 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "31.0.0"
version: "38.0.0"
aes_ecb_pkcs5_flutter:
dependency: transitive
description:
@ -21,28 +21,28 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.0"
version: "3.4.1"
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.6"
version: "3.1.11"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.0"
version: "2.3.1"
assorted_layout_widgets:
dependency: "direct main"
description:
name: assorted_layout_widgets
url: "https://pub.dartlang.org"
source: hosted
version: "5.7.1"
version: "5.8.5"
async:
dependency: transitive
description:
@ -63,7 +63,7 @@ packages:
name: barcode
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "2.2.1"
bip32_ed25519:
dependency: transitive
description:
@ -119,7 +119,7 @@ packages:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.6"
version: "2.0.8"
build_runner:
dependency: "direct dev"
description:
@ -147,7 +147,7 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.2.3"
version: "8.3.0"
carousel_slider:
dependency: "direct main"
description:
@ -176,13 +176,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
cli_util:
dependency: transitive
description:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.5"
clock:
dependency: transitive
description:
@ -203,7 +196,7 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
confirm_dialog:
dependency: "direct main"
description:
@ -266,14 +259,14 @@ packages:
name: coverage
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "1.2.0"
cross_file:
dependency: transitive
description:
name: cross_file
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.2"
version: "0.3.3"
crypto:
dependency: "direct main"
description:
@ -287,7 +280,7 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.2.3"
dbus:
dependency: transitive
description:
@ -322,7 +315,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
fast_base58:
dependency: "direct main"
description:
@ -336,7 +329,7 @@ packages:
name: ffi
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.2"
version: "1.2.1"
file:
dependency: transitive
description:
@ -350,7 +343,7 @@ packages:
name: fixnum
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "1.0.1"
flutter:
dependency: "direct main"
description: flutter
@ -367,14 +360,14 @@ packages:
name: flutter_hooks
url: "https://pub.dartlang.org"
source: hosted
version: "0.18.3"
version: "0.18.4"
flutter_inappwebview:
dependency: transitive
description:
name: flutter_inappwebview
url: "https://pub.dartlang.org"
source: hosted
version: "5.4.3+4"
version: "5.4.3+7"
flutter_lints:
dependency: "direct main"
description:
@ -395,7 +388,7 @@ packages:
name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.6"
flutter_svg:
dependency: "direct main"
description:
@ -431,7 +424,7 @@ packages:
name: get
url: "https://pub.dartlang.org"
source: hosted
version: "4.6.1"
version: "4.6.3"
get_storage:
dependency: transitive
description:
@ -501,13 +494,15 @@ packages:
name: graphql
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.1"
version: "5.1.2-beta.1"
graphql_flutter:
dependency: "direct main"
description:
name: graphql_flutter
url: "https://pub.dartlang.org"
source: hosted
path: "packages/graphql_flutter"
ref: f1ccb2d
resolved-ref: f1ccb2d775826697fa0ab4f6d27d132f8a28f444
url: "https://github.com/Quantit-Github/graphql-flutter.git"
source: git
version: "5.1.0"
graphs:
dependency: transitive
@ -578,7 +573,7 @@ packages:
name: icons_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.3"
version: "1.1.7"
image:
dependency: transitive
description:
@ -599,35 +594,35 @@ packages:
name: image_picker
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.5"
version: "0.8.5+3"
image_picker_android:
dependency: transitive
description:
name: image_picker_android
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.4+11"
version: "0.8.4+13"
image_picker_for_web:
dependency: transitive
description:
name: image_picker_for_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.6"
version: "2.1.8"
image_picker_ios:
dependency: transitive
description:
name: image_picker_ios
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.5"
version: "0.8.5+2"
image_picker_platform_interface:
dependency: transitive
description:
name: image_picker_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.4"
version: "2.5.0"
infinite_scroll_pagination:
dependency: "direct main"
description:
@ -660,7 +655,7 @@ packages:
name: jaguar
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.12"
version: "3.1.3"
jaguar_common:
dependency: transitive
description:
@ -688,7 +683,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
json_annotation:
dependency: transitive
description:
@ -730,7 +725,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
matrix4_transform:
dependency: transitive
description:
@ -758,7 +753,7 @@ packages:
name: mobx
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.7"
version: "2.0.7+2"
nested:
dependency: transitive
description:
@ -842,7 +837,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
path_drawing:
dependency: transitive
description:
@ -863,49 +858,49 @@ packages:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.9"
version: "2.0.10"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
version: "2.0.14"
path_provider_ios:
dependency: transitive
description:
name: path_provider_ios
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
version: "2.0.9"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.5"
version: "2.1.6"
path_provider_macos:
dependency: transitive
description:
name: path_provider_macos
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.6"
path_provider_platform_interface:
dependency: transitive
description:
name: path_provider_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
version: "2.0.4"
path_provider_windows:
dependency: transitive
description:
name: path_provider_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.6"
path_tree:
dependency: transitive
description:
@ -919,7 +914,7 @@ packages:
name: pdf
url: "https://pub.dartlang.org"
source: hosted
version: "3.7.4"
version: "3.8.0"
permission_handler:
dependency: "direct main"
description:
@ -940,7 +935,7 @@ packages:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "4.4.0"
version: "5.0.0"
pin_code_fields:
dependency: "direct main"
description:
@ -993,10 +988,12 @@ packages:
printing:
dependency: "direct main"
description:
name: printing
url: "https://pub.dartlang.org"
source: hosted
version: "5.8.0"
path: printing
ref: HEAD
resolved-ref: "726aab13746a4f515601febfb0824ba71dbe4f80"
url: "https://github.com/DavBfr/dart_pdf.git"
source: git
version: "5.9.1"
process:
dependency: transitive
description:
@ -1045,7 +1042,7 @@ packages:
path: "."
ref: master
resolved-ref: bd3fc334a87e0898bb0092036e74bb99cd7ad4e3
url: "git://github.com/insinfo/qr.flutter.git"
url: "https://github.com/insinfo/qr.flutter.git"
source: git
version: "4.0.0"
qrscan:
@ -1054,7 +1051,7 @@ packages:
path: "."
ref: master
resolved-ref: "1fb6b45541965190d16ac214fa6d8b632d1f711e"
url: "git://github.com/leyan95/qrcode_scanner.git"
url: "https://github.com/leyan95/qrcode_scanner.git"
source: git
version: "0.3.3"
responsive_builder:
@ -1070,7 +1067,7 @@ packages:
name: responsive_framework
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.7"
version: "0.1.8"
rxdart:
dependency: transitive
description:
@ -1084,49 +1081,49 @@ packages:
name: sentry
url: "https://pub.dartlang.org"
source: hosted
version: "6.3.0"
version: "6.5.1"
sentry_flutter:
dependency: "direct main"
description:
name: sentry_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "6.3.0"
version: "6.5.1"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
version: "2.0.15"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.11"
version: "2.0.12"
shared_preferences_ios:
dependency: transitive
description:
name: shared_preferences_ios
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
shared_preferences_macos:
dependency: transitive
description:
name: shared_preferences_macos
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
version: "2.0.4"
shared_preferences_platform_interface:
dependency: transitive
description:
@ -1140,14 +1137,14 @@ packages:
name: shared_preferences_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
version: "2.0.4"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
shelf:
dependency: transitive
description:
@ -1222,7 +1219,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@ -1251,13 +1248,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
super_tooltip:
dependency: "direct main"
description:
name: super_tooltip
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
sync_http:
dependency: "direct main"
description:
@ -1278,21 +1268,21 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.19.5"
version: "1.21.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
version: "0.4.9"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.9"
version: "0.4.13"
timing:
dependency: transitive
description:
@ -1341,14 +1331,14 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
vm_service:
dependency: transitive
description:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "7.5.0"
version: "8.2.2"
watcher:
dependency: transitive
description:
@ -1376,21 +1366,21 @@ packages:
name: webkit_inspection_protocol
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "1.0.1"
webview_flutter:
dependency: transitive
description:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.2"
version: "3.0.4"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.6"
version: "2.8.8"
webview_flutter_platform_interface:
dependency: transitive
description:
@ -1404,21 +1394,21 @@ packages:
name: webview_flutter_wkwebview
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.3"
version: "2.7.5"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.2"
version: "2.6.0"
window_size:
dependency: "direct main"
description:
path: "plugins/window_size"
ref: HEAD
resolved-ref: "5c51870ced62a00e809ba4b81a846a052d241c9f"
url: "git://github.com/google/flutter-desktop-embedding.git"
url: "https://github.com/google/flutter-desktop-embedding.git"
source: git
version: "0.1.0"
xdg_directories:
@ -1434,14 +1424,14 @@ packages:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "5.3.1"
version: "5.4.1"
yaml:
dependency: transitive
description:
name: yaml
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "3.1.1"
sdks:
dart: ">=2.16.0 <3.0.0"
flutter: ">=2.8.1"
dart: ">=2.17.0 <3.0.0"
flutter: ">=3.0.0"

View File

@ -17,7 +17,7 @@ dependencies:
sdk: flutter
window_size:
git:
url: git://github.com/google/flutter-desktop-embedding.git
url: https://github.com/google/flutter-desktop-embedding.git
path: plugins/window_size
assorted_layout_widgets: ^5.2.1
bubble: ^1.2.1
@ -28,7 +28,11 @@ dependencies:
flutter_lints: ^1.0.4
flutter_logs: ^2.1.4
flutter_svg: ^0.22.0
graphql_flutter: ^5.0.0
graphql_flutter: #^5.1.0
git:
url: https://github.com/Quantit-Github/graphql-flutter.git
path: packages/graphql_flutter
ref: f1ccb2d # commit hash
hive: ^2.0.4
hive_flutter: ^1.1.0
http: ^0.13.4
@ -42,25 +46,28 @@ dependencies:
pdf: ^3.7.1
permission_handler: ^8.3.0
pin_code_fields: ^7.3.0
printing: ^5.8.0
printing: #^5.8.0
git:
url: https://github.com/DavBfr/dart_pdf.git
path: printing
provider: ^6.0.1
# qrscan: ^0.3.2
qrscan:
git:
url: git://github.com/leyan95/qrcode_scanner.git
url: https://github.com/leyan95/qrcode_scanner.git
ref: master # branch name
# qr_code_scanner: ^0.6.1
# qr_flutter: ^4.0.0
qr_flutter:
git:
url: git://github.com/insinfo/qr.flutter.git
url: https://github.com/insinfo/qr.flutter.git
ref: master # branch name
responsive_builder: ^0.4.1
responsive_framework: ^0.1.4
sentry: 6.3.0
sentry_flutter: 6.3.0
sentry: 6.5.1
sentry_flutter: ^6.5.1
shared_preferences: ^2.0.7
super_tooltip: ^1.0.1
# super_tooltip: ^1.0.1
sync_http: ^0.3.0
test: ^1.17.10
truncate: ^3.0.1

View File

@ -10,6 +10,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
window_size
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@ -18,3 +21,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin)