diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6ed90149273463a1fab5059f03e054db0d9510dd..1061e9e8236a90388eaa9ec2e8fcebd4158a810a 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,8 @@
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
- android:windowSoftInputMode="adjustResize">
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 42976420fe2a1f131484a7f8a45cc30ba1058c3c..f5b3c153753d829723f8d7dfac60f1ec172ca24e 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -492,4 +492,4 @@
/* End XCConfigurationList section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
\ No newline at end of file
+}
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae24ab92b9d25a19199216d9aab06bfbbf7ee117
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3212359a4830f2a786b68e1d7f0860c1d2a36a6d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..529052a083d414d901e7eac32341f21519b7921c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..18aa346597d7c6a8320af9b5de529a46aa5085fe
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..797a9977ba51973e77a3811be5638f288afe5c4f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..44f196dcfa1ad8c21b55fc3d57d7983415f3319a
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/lib/screens/history.dart b/lib/screens/history.dart
index 88f133c62f4f0512387b9361643d3f027752aab1..a3527bc99af265e964f0744a8f947a01d97fbcc0 100644
--- a/lib/screens/history.dart
+++ b/lib/screens/history.dart
@@ -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;
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 4ca2a72e55718a5ff68e5f8fbc0cc39deacbfcf4..e089aeabe653ee6a5522b3e07eb3ee3f23f19a97 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -69,6 +69,20 @@ class HomeScreen extends StatelessWidget {
);
},
),
+ ListTile(
+ key: const Key('substrateSandbox'),
+ title: const Text('SUBSTRATE SANDBOX'),
+ onTap: () {
+ Navigator.pop(context);
+ Navigator.push(
+ context,
+ MaterialPageRoute(builder: (context) {
+ return const SubstrateSandBox();
+ }),
+ );
+ },
+ ),
+
// ListTile(
// title: const Text('A propos'),
// onTap: () {
@@ -86,9 +100,11 @@ 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();
+ if (_sub.sdkReady && !_sub.nodeConnected) {
+ await _sub.connectNode();
+ }
if (isWalletsExists) homeClass.snackNode(ctx);
});
},
@@ -186,24 +202,6 @@ Widget geckHome(context) {
]),
),
const SizedBox(height: 15),
- Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
- ElevatedButton(
- style: ElevatedButton.styleFrom(
- primary: yellowC, // background
- onPrimary: Colors.black, // foreground
- ),
- onPressed: () => Navigator.push(
- context,
- MaterialPageRoute(builder: (context) {
- return const SubstrateSandBox();
- }),
- ),
- child: const Text(
- 'SUBSTRATE SANDBOX',
- style: TextStyle(fontSize: 20),
- ),
- ),
- ]),
Expanded(
flex: 1,
child: Container(
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index 7799d9978c852b64f4eabeda399b5dbbc33ab684..2bef1076de33a76b8a33c1b83234975edcf3565b 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -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();
diff --git a/pubspec.lock b/pubspec.lock
index 336a82704665f1d54eb659bf467e42b527c0646a..296b2dd0bfc4418c2592359cc009c0c7ba9e0b2c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -368,13 +368,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "5.3.2"
- flutter_launcher_icons:
- dependency: "direct main"
- description:
- name: flutter_launcher_icons
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.9.2"
flutter_lints:
dependency: "direct main"
description:
@@ -572,6 +565,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
+ icons_launcher:
+ dependency: "direct dev"
+ description:
+ name: icons_launcher
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.1.3"
image:
dependency: transitive
description:
@@ -779,14 +779,14 @@ packages:
name: package_info_plus
url: "https://pub.dartlang.org"
source: hosted
- version: "1.4.0"
+ version: "1.4.2"
package_info_plus_linux:
dependency: transitive
description:
name: package_info_plus_linux
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.3"
+ version: "1.0.5"
package_info_plus_macos:
dependency: transitive
description:
@@ -807,14 +807,14 @@ packages:
name: package_info_plus_web
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.4"
+ version: "1.0.5"
package_info_plus_windows:
dependency: transitive
description:
name: package_info_plus_windows
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.4"
+ version: "1.0.5"
path:
dependency: transitive
description:
@@ -1295,6 +1295,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
+ universal_io:
+ dependency: transitive
+ description:
+ name: universal_io
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.4"
unorm_dart:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index afc1b578d702327c793acd2309537f58ba694d54..07bfa99885688e2960953bc688e22bda3bca2f8b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,7 +25,6 @@ dependencies:
confirm_dialog: ^1.0.0
crypto: ^3.0.1
fast_base58: ^0.2.0
- flutter_launcher_icons: ^0.9.2
flutter_lints: ^1.0.4
flutter_logs: ^2.1.4
flutter_svg: ^0.22.0
@@ -71,7 +70,7 @@ dependencies:
dio: ^4.0.4
desktop_window: ^0.4.0
durt: ^0.1.6
- package_info_plus: ^1.3.0
+ package_info_plus: ^1.4.2
polkawallet_sdk: #^0.4.1 ## Wait for merging PR: https://github.com/polkawallet-io/sdk/pull/19
# path: ../substrate-sdk
git:
@@ -79,13 +78,13 @@ dependencies:
ref: fixAndroidActivityVersion
flutter_icons:
- android: "ic_launcher"
+ android: true
ios: true
image_path: "assets/icon/gecko_flat.png"
- cupertino_icons: ^1.0.0
remove_alpha_ios: true
dev_dependencies:
+ icons_launcher: ^1.1.3
build_runner: ^2.1.2
flutter_test:
sdk: flutter