diff --git a/android/app/build.gradle b/android/app/build.gradle
index 55d3b2d2c58784d73a4857e19909eaf2eb3dda34..095df97e4a5f7e09a2afff80313e95ce7510f955 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdkVersion 30
+ compileSdkVersion 31
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f36649048898d2ae9d1de8e92d8a732bbf4cdf95..b6701eeeec53c343f74cc74a7de4794b7f7aae76 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<application android:requestLegacyExternalStorage="true"
- android:name="io.flutter.app.FlutterApplication"
+ android:name="${applicationName}"
android:label="Ğecko">
<!-- android:icon="@mipmap/ic_launcher"> -->
<activity
@@ -28,7 +28,13 @@
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
- />
+ />
+
+ <!-- Theme to apply as soon as Flutter begins rendering frames -->
+ <meta-data
+ android:name="io.flutter.embedding.android.NormalTheme"
+ android:resource="@style/NormalTheme"
+ />
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/android/build.gradle b/android/build.gradle
index dc5cdbc9d2a63b0dcd2b88525696fa47df7348fd..d6564e8bb9acc28ef7e208cae7930017f9a89158 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.6.10'
repositories {
google()
jcenter()
diff --git a/lib/screens/myWallets/cesium_wallet_options.dart b/lib/screens/myWallets/cesium_wallet_options.dart
index 473bd980c15b4a87ac4269b32f4bb20f273fc0bb..0c01801c3e56514c0bfe773ad9ca5fb3aae3a6cf 100644
--- a/lib/screens/myWallets/cesium_wallet_options.dart
+++ b/lib/screens/myWallets/cesium_wallet_options.dart
@@ -256,7 +256,7 @@ class CesiumWalletOptions extends StatelessWidget {
);
}),
SizedBox(height: 4 * ratio),
- QrImage(
+ QrImageWidget(
data: _walletOptions.pubkey.text,
version: QrVersions.auto,
size: isTall ? 300 : 270,
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index f7f7215a0f9863252f23363e4d63a5f39d776c1c..7799d9978c852b64f4eabeda399b5dbbc33ab684 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -96,7 +96,7 @@ class WalletOptions extends StatelessWidget {
);
}),
SizedBox(height: 4 * ratio),
- QrImage(
+ QrImageWidget(
data: _walletOptions.pubkey.text,
version: QrVersions.auto,
size: isTall ? 300 : 270,
diff --git a/pubspec.lock b/pubspec.lock
index c082479fa43f5e90790f5dcf82ed46fd6a237fa0..5d802dea1429f4abef689278e7059b557f7bd268 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -49,7 +49,7 @@ packages:
name: barcode
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.2.0"
bip32_ed25519:
dependency: transitive
description:
@@ -640,6 +640,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.3"
matrix4_transform:
dependency: transitive
description:
@@ -765,7 +772,21 @@ packages:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.6"
+ version: "2.0.9"
+ path_provider_android:
+ dependency: transitive
+ description:
+ name: path_provider_android
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.11"
+ path_provider_ios:
+ dependency: transitive
+ description:
+ name: path_provider_ios
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.7"
path_provider_linux:
dependency: transitive
description:
@@ -800,7 +821,7 @@ packages:
name: pdf
url: "https://pub.dartlang.org"
source: hosted
- version: "3.6.1"
+ version: "3.7.1"
pedantic:
dependency: transitive
description:
@@ -849,7 +870,7 @@ packages:
name: platform
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.2"
+ version: "3.1.0"
plugin_platform_interface:
dependency: transitive
description:
@@ -877,7 +898,7 @@ packages:
name: printing
url: "https://pub.dartlang.org"
source: hosted
- version: "5.6.0"
+ version: "5.7.2"
process:
dependency: transitive
description:
@@ -919,21 +940,25 @@ packages:
name: qr
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "3.0.0"
qr_flutter:
dependency: "direct main"
description:
- name: qr_flutter
- url: "https://pub.dartlang.org"
- source: hosted
+ path: "."
+ ref: master
+ resolved-ref: bd3fc334a87e0898bb0092036e74bb99cd7ad4e3
+ url: "git://github.com/insinfo/qr.flutter.git"
+ source: git
version: "4.0.0"
qrscan:
dependency: "direct main"
description:
- name: qrscan
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.3.2"
+ path: "."
+ ref: master
+ resolved-ref: "1fb6b45541965190d16ac214fa6d8b632d1f711e"
+ url: "git://github.com/leyan95/qrcode_scanner.git"
+ source: git
+ version: "0.3.3"
responsive_builder:
dependency: "direct main"
description:
@@ -1141,21 +1166,21 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
- version: "1.17.12"
+ version: "1.19.5"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.3"
+ version: "0.4.8"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.2"
+ version: "0.4.9"
timing:
dependency: transitive
description:
@@ -1204,7 +1229,7 @@ packages:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
- version: "7.3.0"
+ version: "7.5.0"
watcher:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 4da36af3e1a64ca202131fce88934580b76cb5dc..ee0dde1cfc12d0dda8da9207ab56dd65c7fffcc2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -39,15 +39,23 @@ dependencies:
intl: ^0.17.0
jdenticon_dart: ^2.0.0
logger: ^1.1.0
- path_provider: ^2.0.3
- pdf: ^3.5.0
+ path_provider: ^2.0.9
+ pdf: ^3.7.1
permission_handler: ^8.3.0
pin_code_fields: ^7.3.0
- printing: ^5.6.0
+ printing: ^5.7.2
provider: ^6.0.1
- qrscan: ^0.3.2
+ # qrscan: ^0.3.2
+ qrscan:
+ git:
+ url: git://github.com/leyan95/qrcode_scanner.git
+ ref: master # branch name
# qr_code_scanner: ^0.6.1
- qr_flutter: ^4.0.0
+ # qr_flutter: ^4.0.0
+ qr_flutter:
+ git:
+ url: git://github.com/insinfo/qr.flutter.git
+ ref: master # branch name
responsive_builder: ^0.4.1
responsive_framework: ^0.1.4
sentry: ^6.0.0
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 25cb188eb77f8415e658f8d7daf291d9b3e5f170..ef3ae2839dfc4a5fad69494da5acbbec4eee54d8 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -7,14 +7,20 @@
#include "generated_plugin_registrant.h"
#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
+#include <desktop_window/desktop_window_plugin.h>
#include <printing/printing_plugin.h>
#include <sentry_flutter/sentry_flutter_plugin.h>
+#include <window_size/window_size_plugin.h>
void RegisterPlugins(flutter::PluginRegistry* registry) {
ConnectivityPlusWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+ DesktopWindowPluginRegisterWithRegistrar(
+ registry->GetRegistrarForPlugin("DesktopWindowPlugin"));
PrintingPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("PrintingPlugin"));
SentryFlutterPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("SentryFlutterPlugin"));
+ WindowSizePluginRegisterWithRegistrar(
+ registry->GetRegistrarForPlugin("WindowSizePlugin"));
}
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index fcd7a4033ee748202c4987c8573e2fc5de3a1218..7f1ca9db9d1e457b7e181df6d7a966a2ff2bb7d8 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -4,8 +4,10 @@
list(APPEND FLUTTER_PLUGIN_LIST
connectivity_plus_windows
+ desktop_window
printing
sentry_flutter
+ window_size
)
set(PLUGIN_BUNDLED_LIBRARIES)