diff --git a/packages/cosmos_auth/pubspec.lock b/packages/cosmos_auth/pubspec.lock index 5e8b815b..23566baf 100644 --- a/packages/cosmos_auth/pubspec.lock +++ b/packages/cosmos_auth/pubspec.lock @@ -21,7 +21,7 @@ packages: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" async: dependency: transitive description: @@ -97,7 +97,7 @@ packages: description: path: "packages/cosmos_lint" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "1.9.0" @@ -106,7 +106,7 @@ packages: description: path: "packages/cosmos_utils" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" @@ -163,7 +163,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" flutter_test: dependency: "direct dev" description: flutter @@ -175,7 +175,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" glob: dependency: transitive description: @@ -266,7 +266,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" mocktail: dependency: "direct dev" description: @@ -474,14 +474,14 @@ packages: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.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.5.0" diff --git a/packages/cosmos_node_client/pubspec.lock b/packages/cosmos_node_client/pubspec.lock index 9f81c9e5..50867e3e 100644 --- a/packages/cosmos_node_client/pubspec.lock +++ b/packages/cosmos_node_client/pubspec.lock @@ -21,7 +21,7 @@ packages: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" async: dependency: transitive description: @@ -83,7 +83,7 @@ packages: description: path: "packages/cosmos_lint" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "1.9.0" @@ -100,7 +100,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" fake_async: dependency: transitive description: @@ -131,7 +131,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" glob: dependency: transitive description: @@ -201,7 +201,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" mocktail: dependency: "direct dev" description: @@ -381,21 +381,21 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" webkit_inspection_protocol: dependency: transitive description: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.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: ">=1.17.0" diff --git a/packages/cosmos_ui_components/pubspec.lock b/packages/cosmos_ui_components/pubspec.lock index 95eea557..2c2e0873 100644 --- a/packages/cosmos_ui_components/pubspec.lock +++ b/packages/cosmos_ui_components/pubspec.lock @@ -69,7 +69,7 @@ packages: description: path: "packages/cosmos_lint" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "1.9.0" @@ -78,7 +78,7 @@ packages: description: path: "packages/cosmos_utils" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" diff --git a/packages/cosmos_utils/pubspec.lock b/packages/cosmos_utils/pubspec.lock index c4eadf87..f8131a97 100644 --- a/packages/cosmos_utils/pubspec.lock +++ b/packages/cosmos_utils/pubspec.lock @@ -69,7 +69,7 @@ packages: description: path: "packages/cosmos_lint" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "1.9.0" diff --git a/packages/transaction_signing_gateway/pubspec.lock b/packages/transaction_signing_gateway/pubspec.lock index 1eb0ce24..3a7af39e 100644 --- a/packages/transaction_signing_gateway/pubspec.lock +++ b/packages/transaction_signing_gateway/pubspec.lock @@ -35,7 +35,7 @@ packages: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" asn1lib: dependency: transitive description: @@ -139,7 +139,7 @@ packages: description: path: "packages/cosmos_lint" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "1.9.0" @@ -148,7 +148,7 @@ packages: description: path: "packages/cosmos_utils" ref: main - resolved-ref: "64fc9a44b76bef7a6a6cd98763048630afdc99da" + resolved-ref: "5b1a8296cf9481824940c330d8bf6bdf23ec14e7" url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" @@ -214,7 +214,7 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.1" file: dependency: transitive description: @@ -228,7 +228,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 @@ -292,7 +292,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" glob: dependency: transitive description: @@ -306,7 +306,7 @@ packages: name: googleapis_auth url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" grpc: dependency: transitive description: @@ -418,7 +418,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" mocktail: dependency: "direct dev" description: @@ -460,21 +460,21 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.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" platform: dependency: transitive description: @@ -544,35 +544,35 @@ packages: 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: @@ -586,14 +586,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: @@ -759,7 +759,7 @@ packages: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" win32: dependency: transitive description: @@ -780,7 +780,7 @@ packages: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" sdks: dart: ">=2.16.1 <3.0.0" flutter: ">=2.8.0" diff --git a/starport_template/assets/images/svg/close.svg b/starport_template/assets/images/svg/close.svg new file mode 100644 index 00000000..0b342023 --- /dev/null +++ b/starport_template/assets/images/svg/close.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/starport_template/assets/images/svg/menu_bar.svg b/starport_template/assets/images/svg/menu_bar.svg new file mode 100644 index 00000000..9c1f43fa --- /dev/null +++ b/starport_template/assets/images/svg/menu_bar.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/starport_template/assets/images/svg/wallet.svg b/starport_template/assets/images/svg/wallet.svg new file mode 100644 index 00000000..3c281145 --- /dev/null +++ b/starport_template/assets/images/svg/wallet.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/starport_template/ios/Podfile.lock b/starport_template/ios/Podfile.lock index 42b27f96..b2e44860 100644 --- a/starport_template/ios/Podfile.lock +++ b/starport_template/ios/Podfile.lock @@ -55,4 +55,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/starport_template/lib/app_config.dart b/starport_template/lib/app_config.dart index 5adf32ce..2ea6c07f 100644 --- a/starport_template/lib/app_config.dart +++ b/starport_template/lib/app_config.dart @@ -3,9 +3,9 @@ import 'package:grpc/grpc.dart'; class AppConfig { AppConfig({ - this.lcdUrl = 'http://localhost', - this.grpcUrl = 'http://localhost', - this.lcdPort = '1317', + this.lcdUrl = 'https://api.testnet.cosmos.network', + this.grpcUrl = 'https://grpc.testnet.cosmos.network', + this.lcdPort = '443', this.grpcPort = '9090', this.prefixAddress = 'cosmos', }); diff --git a/starport_template/lib/pages/assets_portfolio_page.dart b/starport_template/lib/pages/assets_list_page.dart similarity index 76% rename from starport_template/lib/pages/assets_portfolio_page.dart rename to starport_template/lib/pages/assets_list_page.dart index eedbeafb..d0a20468 100644 --- a/starport_template/lib/pages/assets_portfolio_page.dart +++ b/starport_template/lib/pages/assets_list_page.dart @@ -4,15 +4,15 @@ import 'package:cosmos_ui_components/cosmos_theme.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:mobx/mobx.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; import 'package:starport_template/entities/balance.dart'; -import 'package:starport_template/pages/accounts_list_sheet.dart'; +import 'package:starport_template/pages/menu_page.dart'; import 'package:starport_template/pages/receive_money_sheet.dart'; import 'package:starport_template/pages/select_asset_page.dart'; import 'package:starport_template/pages/transaction_history_page.dart'; import 'package:starport_template/starport_app.dart'; -import 'package:starport_template/widgets/asset_portfolio_heading.dart'; import 'package:starport_template/widgets/balance_card_list.dart'; import 'package:starport_template/widgets/starport_button_bar.dart'; import 'package:transaction_signing_gateway/transaction_signing_gateway.dart'; @@ -27,7 +27,8 @@ class AssetsPortfolioPage extends StatefulWidget { } class _AssetsPortfolioPageState extends State { - ObservableList get balancesList => StarportApp.accountsStore.balancesList; + ObservableList get balancesList => + StarportApp.accountsStore.balancesList; bool get isBalancesLoading => StarportApp.accountsStore.isBalancesLoading; @@ -35,7 +36,8 @@ class _AssetsPortfolioPageState extends State { bool get isError => StarportApp.accountsStore.isBalancesLoadingError; - AccountPublicInfo get selectedAccount => StarportApp.accountsStore.selectedAccount; + AccountPublicInfo get selectedAccount => + StarportApp.accountsStore.selectedAccount; @override Widget build(BuildContext context) { @@ -51,13 +53,25 @@ class _AssetsPortfolioPageState extends State { children: [ Column( children: [ - _gradientAvatar(context), - AssetPortfolioHeading( - title: selectedAccount.name, - onTap: _onTapDropDown, + Row( + children: [ + IconButton( + onPressed: _onTapMenu, + icon: SvgPicture.asset( + 'assets/images/svg/menu_bar.svg', + ), + ), + const Spacer(), + Text( + selectedAccount.name, + style: TextStyle( + fontSize: CosmosTheme.of(context).fontSizeM, + fontWeight: FontWeight.w700, + ), + ), + _gradientAvatar(context), + ], ), - SizedBox(height: CosmosTheme.of(context).spacingXL), - const Divider(), SizedBox(height: CosmosTheme.of(context).spacingL), SizedBox(height: CosmosTheme.of(context).spacingM), BalanceCardList(balancesList: balancesList), @@ -68,7 +82,8 @@ class _AssetsPortfolioPageState extends State { onSendPressed: () { Navigator.of(context).push( MaterialPageRoute( - builder: (context) => SelectAssetPage(balancesList: balancesList), + builder: (context) => + SelectAssetPage(balancesList: balancesList), ), ); }, @@ -77,7 +92,8 @@ class _AssetsPortfolioPageState extends State { ), isLoading: isBalancesLoading, isError: isError, - errorChild: const Center(child: Text('An unexpected error occurred')), + errorChild: + const Center(child: Text('An unexpected error occurred')), ), ), ), @@ -105,7 +121,7 @@ class _AssetsPortfolioPageState extends State { MaterialPageRoute(builder: (context) => const TransactionHistoryPage()), ); - Future _onTapDropDown() async { + /* Future _onTapDropDown() async { final account = await showMaterialModalBottomSheet( context: context, backgroundColor: Colors.transparent, @@ -118,7 +134,7 @@ class _AssetsPortfolioPageState extends State { if (account != null) { StarportApp.accountsStore.selectAccount(account); } - } + } */ void _onTapReceive() { showMaterialModalBottomSheet( @@ -133,6 +149,12 @@ class _AssetsPortfolioPageState extends State { ); } + void _onTapMenu() { + Navigator.of(context).push( + MaterialPageRoute(builder: (context) => const MenuPage()), + ); + } + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { super.debugFillProperties(properties); diff --git a/starport_template/lib/pages/create_account_page.dart b/starport_template/lib/pages/create_account_page.dart index ccc22804..832ee6c6 100644 --- a/starport_template/lib/pages/create_account_page.dart +++ b/starport_template/lib/pages/create_account_page.dart @@ -5,7 +5,7 @@ import 'package:cosmos_utils/cosmos_utils.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; -import 'package:starport_template/pages/assets_portfolio_page.dart'; +import 'package:starport_template/pages/assets_list_page.dart'; import 'package:starport_template/pages/back_up_account_page.dart'; import 'package:starport_template/pages/backup_later_bottom_sheet.dart'; import 'package:starport_template/pages/passcode_prompt_page.dart'; @@ -40,9 +40,11 @@ class _CreateAccountPageState extends State { bool get isAccountImporting => StarportApp.accountsStore.isAccountImporting; - bool get isMnemonicCreatingError => StarportApp.accountsStore.isMnemonicCreatingError; + bool get isMnemonicCreatingError => + StarportApp.accountsStore.isMnemonicCreatingError; - bool get isAccountImportingError => StarportApp.accountsStore.isAccountImportingError; + bool get isAccountImportingError => + StarportApp.accountsStore.isAccountImportingError; @override void initState() { @@ -60,7 +62,9 @@ class _CreateAccountPageState extends State { loadingChild: LoadingSplash( text: isAuthenticating ? 'Authenticating..' - : (isMnemonicCreating ? 'Creating a recovery phrase..' : 'Creating account..'), + : (isMnemonicCreating + ? 'Creating a recovery phrase..' + : 'Creating account..'), ), contentChild: Scaffold( backgroundColor: CosmosTheme.of(context).colors.background, @@ -102,12 +106,16 @@ class _CreateAccountPageState extends State { style: CosmosTextTheme.copy0Normal, ), SizedBox(height: theme.spacingXL), - const InfoCard(text: 'We will never ask you to share your recovery phrase.'), + const InfoCard( + text: 'We will never ask you to share your recovery phrase.'), SizedBox(height: theme.spacingL), - const InfoCard(text: 'Never share your recovery phrase with anyone, store it securely.'), + const InfoCard( + text: + 'Never share your recovery phrase with anyone, store it securely.'), SizedBox(height: theme.spacingL), const InfoCard( - text: 'If you don’t backup your account or lose your recovery phrase, ' + text: + 'If you don’t backup your account or lose your recovery phrase, ' 'you will not able to recover your account', ), const Spacer(), @@ -147,7 +155,8 @@ class _CreateAccountPageState extends State { } if (mounted) { await Navigator.of(context).pushReplacement( - MaterialPageRoute(builder: (context) => BackUpAccountPage(mnemonic: mnemonic)), + MaterialPageRoute( + builder: (context) => BackUpAccountPage(mnemonic: mnemonic)), ); } } @@ -171,7 +180,8 @@ class _CreateAccountPageState extends State { password: password, isBackedUp: isBackedUp, onMnemonicGenerationStarted: () => setState(() {}), - onAccountCreationStarted: () => setState(() {}), //this will cause the loading message to update + onAccountCreationStarted: () => + setState(() {}), //this will cause the loading message to update ); if (mounted) { await Navigator.of(context).pushAndRemoveUntil( @@ -187,12 +197,14 @@ class _CreateAccountPageState extends State { void debugFillProperties(DiagnosticPropertiesBuilder properties) { super.debugFillProperties(properties); properties - ..add(DiagnosticsProperty('isMnemonicCreatingError', isMnemonicCreatingError)) + ..add(DiagnosticsProperty( + 'isMnemonicCreatingError', isMnemonicCreatingError)) ..add(DiagnosticsProperty('isMnemonicCreating', isMnemonicCreating)) ..add(DiagnosticsProperty('isAccountImporting', isAccountImporting)) ..add(DiagnosticsProperty('isLoading', isLoading)) ..add(DiagnosticsProperty('isAuthenticating', isAuthenticating)) - ..add(DiagnosticsProperty('isAccountImportingError', isAccountImportingError)) + ..add(DiagnosticsProperty( + 'isAccountImportingError', isAccountImportingError)) ..add(DiagnosticsProperty('isError', isError)); } } diff --git a/starport_template/lib/pages/import_account_page.dart b/starport_template/lib/pages/import_account_page.dart index 8c5ae3b8..532d6a21 100644 --- a/starport_template/lib/pages/import_account_page.dart +++ b/starport_template/lib/pages/import_account_page.dart @@ -6,7 +6,7 @@ import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:starport_template/entities/account_additional_data.dart'; import 'package:starport_template/entities/import_account_form_data.dart'; import 'package:starport_template/pages/account_name_page.dart'; -import 'package:starport_template/pages/assets_portfolio_page.dart'; +import 'package:starport_template/pages/assets_list_page.dart'; import 'package:starport_template/pages/passcode_prompt_page.dart'; import 'package:starport_template/starport_app.dart'; import 'package:starport_template/widgets/loading_splash.dart'; diff --git a/starport_template/lib/pages/menu_page.dart b/starport_template/lib/pages/menu_page.dart new file mode 100644 index 00000000..374ee739 --- /dev/null +++ b/starport_template/lib/pages/menu_page.dart @@ -0,0 +1,78 @@ +import 'package:cosmos_ui_components/cosmos_ui_components.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:starport_template/pages/transaction_history_page.dart'; +import 'package:starport_template/starport_app.dart'; +import 'package:transaction_signing_gateway/transaction_signing_gateway.dart'; + +class MenuPage extends StatelessWidget { + const MenuPage({Key? key}) : super(key: key); + + AccountPublicInfo get selectedAccount => + StarportApp.accountsStore.selectedAccount; + + @override + Widget build(BuildContext context) { + return Scaffold( + body: SafeArea( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + children: [ + Row( + children: [ + SvgPicture.asset('assets/images/svg/close.svg'), + const Spacer(), + SizedBox( + height: 35, + child: InkWell( + onTap: () { + + }, + child: GradientAvatar( + stringKey: selectedAccount.publicAddress), + ), + ), + ], + ), + const SizedBox(height: 43), + Container( + decoration: BoxDecoration( + border: Border.all( + color: const Color.fromRGBO(0, 0, 0, 0.07), + ), + borderRadius: BorderRadius.circular(8)), + padding: const EdgeInsets.all(16), + child: Row( + children: [ + SvgPicture.asset('assets/images/svg/wallet.svg'), + const SizedBox(width: 20), + Text( + 'Wallet', + style: TextStyle( + fontSize: CosmosTheme.of(context).fontSizeM, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ], + ), + ), + ), + ); + } + + void _onTapAvatar(BuildContext context) => Navigator.of(context).push( + MaterialPageRoute(builder: (context) => const TransactionHistoryPage()), + ); + + @override + void debugFillProperties(DiagnosticPropertiesBuilder properties) { + super.debugFillProperties(properties); + properties.add(DiagnosticsProperty( + 'selectedAccount', selectedAccount)); + } +} diff --git a/starport_template/lib/pages/repeat_mnemonic_page.dart b/starport_template/lib/pages/repeat_mnemonic_page.dart index 6bf8425e..65fc118e 100644 --- a/starport_template/lib/pages/repeat_mnemonic_page.dart +++ b/starport_template/lib/pages/repeat_mnemonic_page.dart @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:starport_template/entities/account_additional_data.dart'; import 'package:starport_template/entities/import_account_form_data.dart'; -import 'package:starport_template/pages/assets_portfolio_page.dart'; +import 'package:starport_template/pages/assets_list_page.dart'; import 'package:starport_template/pages/passcode_prompt_page.dart'; import 'package:starport_template/starport_app.dart'; import 'package:starport_template/widgets/loading_splash.dart'; diff --git a/starport_template/lib/pages/routing_page.dart b/starport_template/lib/pages/routing_page.dart index 6e0f4f03..7cff7624 100644 --- a/starport_template/lib/pages/routing_page.dart +++ b/starport_template/lib/pages/routing_page.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:cosmos_ui_components/cosmos_ui_components.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:starport_template/pages/assets_portfolio_page.dart'; +import 'package:starport_template/pages/assets_list_page.dart'; import 'package:starport_template/pages/onboarding_page.dart'; import 'package:starport_template/pages/passcode_prompt_page.dart'; import 'package:starport_template/starport_app.dart'; diff --git a/starport_template/lib/pages/sign_transaction_page.dart b/starport_template/lib/pages/sign_transaction_page.dart index 257148da..055d5922 100644 --- a/starport_template/lib/pages/sign_transaction_page.dart +++ b/starport_template/lib/pages/sign_transaction_page.dart @@ -8,7 +8,7 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; import 'package:starport_template/entities/amount.dart'; import 'package:starport_template/entities/balance.dart'; import 'package:starport_template/entities/msg_send_transaction.dart'; -import 'package:starport_template/pages/assets_portfolio_page.dart'; +import 'package:starport_template/pages/assets_list_page.dart'; import 'package:starport_template/pages/assets_transfer_sheet.dart'; import 'package:starport_template/pages/passcode_prompt_page.dart'; import 'package:starport_template/starport_app.dart'; diff --git a/starport_template/lib/widgets/asset_portfolio_heading.dart b/starport_template/lib/widgets/asset_portfolio_heading.dart index ee5f3e9b..dc5df8d1 100644 --- a/starport_template/lib/widgets/asset_portfolio_heading.dart +++ b/starport_template/lib/widgets/asset_portfolio_heading.dart @@ -1,4 +1,3 @@ -import 'package:cosmos_ui_components/cosmos_text_theme.dart'; import 'package:cosmos_ui_components/cosmos_theme.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -19,21 +18,17 @@ class AssetPortfolioHeading extends StatelessWidget { Widget build(BuildContext context) { final theme = CosmosTheme.of(context); return Padding( - padding: EdgeInsets.only(left: CosmosTheme.of(context).spacingL, top: theme.spacingM), + padding: EdgeInsets.only( + left: CosmosTheme.of(context).spacingL, + top: theme.spacingM, + ), child: Row( mainAxisAlignment: isCentered ? MainAxisAlignment.center : MainAxisAlignment.start, children: [ - Text( - title, - style: CosmosTextTheme.title2Bold.copyWith( - color: theme.colors.text, - ), - ), IconButton( icon: Icon( Icons.arrow_downward_sharp, - size: theme.fontSizeXL, - color: theme.colors.text, + size: CosmosTheme.of(context).fontSizeXL, ), onPressed: onTap, ) diff --git a/starport_template/pubspec.lock b/starport_template/pubspec.lock index 722ab22e..318110c1 100644 --- a/starport_template/pubspec.lock +++ b/starport_template/pubspec.lock @@ -153,7 +153,7 @@ packages: description: path: "packages/cosmos_auth" ref: main - resolved-ref: "0710c51c597daafbf62cf552fbbc5280cd90f7bc" + resolved-ref: d21c434b9d4bf574375e8674120338899524aa6c url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" @@ -162,7 +162,7 @@ packages: description: path: "packages/cosmos_lint" ref: main - resolved-ref: "0710c51c597daafbf62cf552fbbc5280cd90f7bc" + resolved-ref: d21c434b9d4bf574375e8674120338899524aa6c url: "https://github.com/tendermint/flutter.git" source: git version: "1.9.0" @@ -171,7 +171,7 @@ packages: description: path: "packages/cosmos_ui_components" ref: main - resolved-ref: "0710c51c597daafbf62cf552fbbc5280cd90f7bc" + resolved-ref: d21c434b9d4bf574375e8674120338899524aa6c url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" @@ -180,7 +180,7 @@ packages: description: path: "packages/cosmos_utils" ref: main - resolved-ref: "0710c51c597daafbf62cf552fbbc5280cd90f7bc" + resolved-ref: d21c434b9d4bf574375e8674120338899524aa6c url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" @@ -336,6 +336,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.2" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" flutter_test: dependency: "direct dev" description: flutter @@ -394,7 +401,7 @@ packages: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" image: dependency: transitive description: @@ -797,7 +804,7 @@ packages: description: path: "packages/transaction_signing_gateway" ref: main - resolved-ref: "0710c51c597daafbf62cf552fbbc5280cd90f7bc" + resolved-ref: d21c434b9d4bf574375e8674120338899524aa6c url: "https://github.com/tendermint/flutter.git" source: git version: "0.0.1" @@ -828,7 +835,7 @@ packages: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.16" + version: "6.0.17" url_launcher_linux: dependency: transitive description: diff --git a/starport_template/pubspec.yaml b/starport_template/pubspec.yaml index 804d8064..e0297bcb 100644 --- a/starport_template/pubspec.yaml +++ b/starport_template/pubspec.yaml @@ -56,6 +56,7 @@ dependencies: ref: main cupertino_icons: 1.0.4 + flutter_svg: ^1.0.3 dev_dependencies: flutter_test: @@ -87,6 +88,7 @@ flutter: assets: - assets/images/ + - assets/images/svg/ fonts: - family: Inter fonts: