update plugins

polkawallet-io · Apr 23, 2021 · 7f30c70 · 7f30c70
1 parent aaf8439
commit 7f30c70
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 43 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -509,7 +509,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -542,7 +542,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/lib/common/consts.dart b/lib/common/consts.dart
@@ -15,8 +15,8 @@ const prefixList = [
 
 /// app versions
 enum BuildTargets { apk, playStore, dev }
-const String app_beta_version = 'v2.0.3-beta.2';
-const int app_beta_version_code = 2032;
+const String app_beta_version = 'v2.0.4-beta.1';
+const int app_beta_version_code = 2041;
 
 const show_guide_status_key = 'show_guide_status';
 const show_banner_status_key = 'show_banner_status';
diff --git a/lib/main.dart b/lib/main.dart
@@ -3,9 +3,9 @@ import 'package:app/common/consts.dart';
 import 'package:flutter/material.dart';
 import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
 import 'package:polkawallet_plugin_acala/polkawallet_plugin_acala.dart';
-// import 'package:polkawallet_plugin_laminar/polkawallet_plugin_laminar.dart';
-// import 'package:polkawallet_plugin_chainx/polkawallet_plugin_chainx.dart';
-// import 'package:polkawallet_plugin_edgeware/polkawallet_plugin_edgeware.dart';
+import 'package:polkawallet_plugin_laminar/polkawallet_plugin_laminar.dart';
+import 'package:polkawallet_plugin_chainx/polkawallet_plugin_chainx.dart';
+import 'package:polkawallet_plugin_edgeware/polkawallet_plugin_edgeware.dart';
 
 import 'package:get_storage/get_storage.dart';
 
@@ -16,9 +16,9 @@ void main() async {
     PluginKusama(name: 'polkadot'),
     PluginKusama(),
     PluginAcala(),
-    // PluginLaminar(),
-    // PluginChainX(),
-    // PluginEdgeware(),
+    PluginLaminar(),
+    PluginChainX(),
+    PluginEdgeware(),
   ];
 
   runApp(WalletApp(_plugins, BuildTargets.apk));

diff --git a/lib/pages/networkSelectPage.dart b/lib/pages/networkSelectPage.dart
@@ -271,22 +271,16 @@ class _NetworkItemActive extends StatelessWidget {
         ),
         Container(
           padding: EdgeInsets.all(8),
-          child: SizedBox(
-            child: icon,
-            width: 28,
-          ),
+          child: SizedBox(child: icon, height: 28, width: 28),
           decoration: BoxDecoration(
             borderRadius: const BorderRadius.all(const Radius.circular(24)),
             color: Theme.of(context).cardColor,
             boxShadow: [
               BoxShadow(
                 color: Colors.black12,
-                blurRadius: 12.0, // has the effect of softening the shadow
-                spreadRadius: 0, // has the effect of extending the shadow
-                offset: Offset(
-                  6.0, // horizontal, move right 10
-                  1.0, // vertical, move down 10
-                ),
+                blurRadius: 12.0,
+                spreadRadius: 0,
+                offset: Offset(6.0, 1.0),
               )
             ],
           ),

diff --git a/pubspec.lock b/pubspec.lock
@@ -678,17 +678,17 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "07b601d0aaae0b173e7a18006f7502b9bb55b32d"
-      resolved-ref: "07b601d0aaae0b173e7a18006f7502b9bb55b32d"
+      ref: "225f62ae68adfef0d50bdb4d2eb6a34e4f518269"
+      resolved-ref: "225f62ae68adfef0d50bdb4d2eb6a34e4f518269"
       url: "https://github.com/true-eye/polkawallet_plugin_chainx.git"
     source: git
     version: "0.0.1"
   polkawallet_plugin_edgeware:
     dependency: "direct main"
     description:
       path: "."
-      ref: acdfd8bddce2075542e4678ef55855805700c752
-      resolved-ref: acdfd8bddce2075542e4678ef55855805700c752
+      ref: e05ce06f0a459ae0879a7adf56295d5e25eba8be
+      resolved-ref: e05ce06f0a459ae0879a7adf56295d5e25eba8be
       url: "https://github.com/remzrn/polkawallet_plugin_edgeware.git"
     source: git
     version: "0.0.1"
@@ -702,11 +702,9 @@ packages:
   polkawallet_plugin_laminar:
     dependency: "direct main"
     description:
-      path: "."
-      ref: a6bcda75198f64b70e0f13f6c71f067b72d536b0
-      resolved-ref: a6bcda75198f64b70e0f13f6c71f067b72d536b0
-      url: "https://github.com/polkawallet-io/polkawallet_plugin_laminar.git"
-    source: git
+      path: "../../coding/polkawallet/polkawallet_plugin_laminar"
+      relative: true
+    source: path
     version: "0.1.5"
   polkawallet_sdk:
     dependency: "direct overridden"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.0.3+2032
+version: 2.0.4+2041
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -35,43 +35,47 @@ dependencies:
   polkawallet_plugin_kusama:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_kusama.git
-      ref: a4ae23cc229016babf82fb0e6c85a6cb46ec16a3
+      ref: 5bd378a753df123014ed3dddd68ec644c23c6543
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
-      ref: 8714c27a4f46e3f0277ab58b42eea547f7d33095
+      ref: fd16946d18c84078e96c64e3dbc1b93061dc6802
   polkawallet_plugin_laminar:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_laminar.git
-      ref: a6bcda75198f64b70e0f13f6c71f067b72d536b0
+      ref: 3011d23be5c005e088ddd7ce6c58d82ef31dca36
   polkawallet_plugin_chainx:
     git:
       url: https://github.com/true-eye/polkawallet_plugin_chainx.git
-      ref: 07b601d0aaae0b173e7a18006f7502b9bb55b32d
+      ref: 225f62ae68adfef0d50bdb4d2eb6a34e4f518269
   polkawallet_plugin_edgeware:
     git:
       url: https://github.com/remzrn/polkawallet_plugin_edgeware.git
-      ref: acdfd8bddce2075542e4678ef55855805700c752
+      ref: e05ce06f0a459ae0879a7adf56295d5e25eba8be
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.0
 
 dependency_overrides:
-  polkawallet_plugin_kusama:
-    path: ../../coding/polkawallet/polkawallet_plugin_kusama
-  polkawallet_plugin_acala:
-    path: ../../coding/polkawallet/polkawallet_plugin_acala
+#  polkawallet_plugin_kusama:
+#    path: ../../coding/polkawallet/polkawallet_plugin_kusama
+#  polkawallet_plugin_acala:
+#    path: ../../coding/polkawallet/polkawallet_plugin_acala
 #  polkawallet_plugin_laminar:
 #    path: ../../coding/polkawallet/polkawallet_plugin_laminar
 #  polkawallet_plugin_chainx:
 #    path: ../../coding/polkawallet/polkawallet_plugin_chainx
 #  polkawallet_plugin_edgeware:
 #    path: ../../coding/polkawallet/polkawallet_plugin_edgeware
   polkawallet_ui:
-    path: ../../coding/polkawallet/ui
-  polkawallet_sdk:
-    path: ../../coding/polkawallet/sdk
+    git:
+      url: https://github.com/polkawallet-io/ui.git
+      ref: a71c448a632c77f9727925c06c17b5de49bf53ee
+#    path: ../../coding/polkawallet/ui
+  polkawallet_sdk: ^0.1.6
+#  polkawallet_sdk:
+#    path: ../../coding/polkawallet/sdk
 
 dev_dependencies:
   flutter_test: