Merge pull request #11 from polkawallet-io/develop

release 0.4.8
polkawallet-io · Jun 21, 2022 · db4a165 · db4a165
2 parents c8c801a + 353bb6b
commit db4a165
Show file tree

Hide file tree

Showing 48 changed files with 821 additions and 429 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.4.8] - 20220621.
+
+* bump polkawallet_sdk: 0.4.8.
+* ui update.
+
 ## [0.4.6] - 20220527.
 
 * bump polkawallet_sdk: 0.4.6.

diff --git a/assets/images/staking/icon_rebond.png b/assets/images/staking/icon_rebond.png
diff --git a/example/lib/pages/assetsContent.dart b/example/lib/pages/assetsContent.dart
@@ -1,6 +1,4 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:polkawallet_ui/components/borderedTitle.dart';
 import 'package:polkawallet_ui/components/roundedCard.dart';

diff --git a/example/lib/pages/homePage.dart b/example/lib/pages/homePage.dart
@@ -31,18 +31,12 @@ class _MyHomePageState extends State<MyHomePage> {
     return items.map((e) {
       final active = items[_tabIndex].text == e.text;
       return BottomNavigationBarItem(
-        icon: SizedBox(
-          child: active ? e.iconActive : e.icon,
-          width: 32,
-          height: 32,
-        ),
-        title: Text(
-          e.text,
-          style: TextStyle(
-              fontSize: 14,
-              color: active ? Theme.of(context).primaryColor : Colors.grey),
-        ),
-      );
+          icon: SizedBox(
+            child: active ? e.iconActive : e.icon,
+            width: 32,
+            height: 32,
+          ),
+          label: e.text);
     }).toList();
   }
 

diff --git a/example/lib/pages/selectListPage.dart b/example/lib/pages/selectListPage.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class ListItemData {

diff --git a/example/lib/pages/tx.dart b/example/lib/pages/tx.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
 

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -35,7 +35,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   convert:
     dependency: transitive
     description:
@@ -281,7 +281,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   json_annotation:
     dependency: transitive
     description:
@@ -296,6 +296,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
@@ -323,7 +330,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   path_drawing:
     dependency: transitive
     description:
@@ -428,14 +435,14 @@ packages:
       name: polkawallet_sdk
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.6"
+    version: "0.4.7"
   polkawallet_ui:
     dependency: "direct main"
     description:
-      path: "../../ui"
-      relative: true
-    source: path
-    version: "0.4.6"
+      name: polkawallet_ui
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.7"
   process:
     dependency: transitive
     description:
@@ -622,7 +629,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   webview_flutter:
     dependency: transitive
     description:
@@ -673,5 +680,5 @@ packages:
     source: hosted
     version: "5.3.1"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
   flutter: ">=2.5.0"
diff --git a/lib/common/components/chartLabel.dart b/lib/common/components/chartLabel.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class ChartLabel extends StatelessWidget {

diff --git a/lib/pages/governanceNew/candidateDetailPage.dart b/lib/pages/governanceNew/candidateDetailPage.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:polkawallet_plugin_kusama/pages/governanceNew/councilPage.dart';
@@ -11,6 +10,7 @@ import 'package:polkawallet_ui/components/v3/plugin/pluginScaffold.dart';
 import 'package:polkawallet_ui/components/v3/plugin/roundedPluginCard.dart';
 import 'package:polkawallet_ui/utils/format.dart';
 import 'package:polkawallet_ui/utils/i18n.dart';
+import 'package:polkawallet_ui/utils/index.dart';
 
 class CandidateDetailPage extends StatefulWidget {
   CandidateDetailPage(this.plugin, this.keyring);
@@ -29,7 +29,7 @@ class _CandidateDetailPageState extends State<CandidateDetailPage> {
   void initState() {
     super.initState();
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       if (widget.plugin.store.gov.councilVotes != null) {
         final List info =
             ModalRoute.of(context)!.settings.arguments as List<dynamic>;
@@ -104,7 +104,7 @@ class _CandidateDetailPageState extends State<CandidateDetailPage> {
                       child: Text(
                         dic['vote.voter'],
                         style: Theme.of(context).textTheme.headline3?.copyWith(
-                            fontSize: 18,
+                            fontSize: UI.getTextSize(18, context),
                             fontWeight: FontWeight.w600,
                             color: Colors.white),
                       ),

diff --git a/lib/pages/governanceNew/councilPage.dart b/lib/pages/governanceNew/councilPage.dart
@@ -114,8 +114,8 @@ class _CouncilPageState extends State<CouncilPage> {
               width: double.infinity,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.only(
-                    topLeft: const Radius.circular(14),
-                    topRight: const Radius.circular(14)),
+                    topLeft: const Radius.circular(8),
+                    topRight: const Radius.circular(8)),
                 color: Color.fromARGB(255, 68, 70, 74),
               ),
               child: Row(
@@ -129,7 +129,7 @@ class _CouncilPageState extends State<CouncilPage> {
                         ?.copyWith(color: Colors.white),
                     style: Theme.of(context).textTheme.headline3?.copyWith(
                         color: Colors.white,
-                        fontSize: 22,
+                        fontSize: UI.getTextSize(22, context),
                         fontWeight: FontWeight.bold,
                         height: 1.7),
                     title: dic['seats'],
@@ -145,7 +145,7 @@ class _CouncilPageState extends State<CouncilPage> {
                         ?.copyWith(color: Colors.white),
                     style: Theme.of(context).textTheme.headline3?.copyWith(
                         color: Colors.white,
-                        fontSize: 22,
+                        fontSize: UI.getTextSize(22, context),
                         fontWeight: FontWeight.bold,
                         height: 1.7),
                     title: dic['up'],
@@ -161,7 +161,7 @@ class _CouncilPageState extends State<CouncilPage> {
                         ?.copyWith(color: Colors.white),
                     style: Theme.of(context).textTheme.headline3?.copyWith(
                         color: Colors.white,
-                        fontSize: 22,
+                        fontSize: UI.getTextSize(22, context),
                         fontWeight: FontWeight.bold,
                         height: 1.7),
                     title: dic['candidate'],
@@ -183,7 +183,7 @@ class _CouncilPageState extends State<CouncilPage> {
                       ?.copyWith(color: Colors.white),
                   style: Theme.of(context).textTheme.headline3?.copyWith(
                       color: Colors.white,
-                      fontSize: 22,
+                      fontSize: UI.getTextSize(22, context),
                       fontWeight: FontWeight.bold,
                       height: 1.7),
                   title: dic['voted'],
@@ -202,7 +202,7 @@ class _CouncilPageState extends State<CouncilPage> {
                           ?.copyWith(color: Colors.white),
                       style: Theme.of(context).textTheme.headline3?.copyWith(
                           color: Colors.white,
-                          fontSize: 22,
+                          fontSize: UI.getTextSize(22, context),
                           fontWeight: FontWeight.bold,
                           height: 1.7),
                       title: dic['vote.my'],
@@ -274,7 +274,6 @@ class _CouncilPageState extends State<CouncilPage> {
                             crossAxisAlignment: CrossAxisAlignment.end,
                             children: [
                               PluginTextTag(
-                                padding: EdgeInsets.zero,
                                 margin: EdgeInsets.only(left: 16),
                                 title: dic['member']!,
                               ),
@@ -289,7 +288,7 @@ class _CouncilPageState extends State<CouncilPage> {
                                 activeTextcolor:
                                     _select ? Colors.white : Colors.black,
                                 active: true,
-                                fontSize: 12,
+                                fontSize: UI.getTextSize(12, context),
                                 minSize: 19,
                                 onPressed: () {
                                   setState(() {
@@ -362,7 +361,6 @@ class _CouncilPageState extends State<CouncilPage> {
                             ),
                           ),
                           PluginTextTag(
-                            padding: EdgeInsets.zero,
                             margin: EdgeInsets.only(left: 16, top: 15),
                             title: dic['up']!,
                           ),
@@ -424,7 +422,6 @@ class _CouncilPageState extends State<CouncilPage> {
                             ),
                           ),
                           PluginTextTag(
-                            padding: EdgeInsets.zero,
                             margin: EdgeInsets.only(left: 16, top: 15),
                             title: dic['candidate']!,
                           ),
@@ -590,7 +587,7 @@ class CandidateItem extends StatelessWidget {
                   )} $tokenSymbol',
                   style: Theme.of(context).textTheme.headline5?.copyWith(
                       color: Colors.white,
-                      fontSize: 10,
+                      fontSize: UI.getTextSize(10, context),
                       fontWeight: FontWeight.w300)),
           onTap: noTap
               ? null

diff --git a/lib/pages/governanceNew/councilVotePage.dart b/lib/pages/governanceNew/councilVotePage.dart
@@ -1,6 +1,5 @@
 import 'dart:math';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:polkawallet_plugin_kusama/pages/staking/actions/bondExtraPage.dart';
@@ -10,13 +9,13 @@ import 'package:polkawallet_sdk/plugin/store/balances.dart';
 import 'package:polkawallet_sdk/storage/keyring.dart';
 import 'package:polkawallet_sdk/utils/i18n.dart';
 import 'package:polkawallet_ui/components/infoItemRow.dart';
-import 'package:polkawallet_ui/components/txButton.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginAddressFormItem.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginInputBalance.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginScaffold.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginTxButton.dart';
 import 'package:polkawallet_ui/utils/format.dart';
 import 'package:polkawallet_ui/utils/i18n.dart';
+import 'package:polkawallet_ui/utils/index.dart';
 
 class CouncilVotePage extends StatefulWidget {
   CouncilVotePage(this.plugin, this.keyring);
@@ -164,7 +163,8 @@ class _CouncilVote extends State<CouncilVotePage> {
                                           .headline4
                                           ?.copyWith(
                                               color: Colors.white,
-                                              fontSize: 12),
+                                              fontSize:
+                                                  UI.getTextSize(12, context)),
                                     )
                                   ],
                                 ),

diff --git a/lib/pages/governanceNew/govExternalLinks.dart b/lib/pages/governanceNew/govExternalLinks.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:polkawallet_ui/utils/index.dart';
 
@@ -33,7 +32,7 @@ class GovExternalLinks extends StatelessWidget {
                   data['name'],
                   style: Theme.of(context).textTheme.headline5?.copyWith(
                       color: Colors.white,
-                      fontSize: 10,
+                      fontSize: UI.getTextSize(10, context),
                       fontWeight: FontWeight.w300),
                 )
               ],