From 5d1909f91c4e3f0c87cff13b2cb37d7e7548c52f Mon Sep 17 00:00:00 2001 From: Chralu Date: Mon, 25 Mar 2024 15:28:19 +0100 Subject: [PATCH 01/16] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Use=20AWC=20with=20W?= =?UTF-8?q?eb=20MessageChannel=20RPC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 196d805..7f660d8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,10 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - archethic_wallet_client: ^1.0.0 + archethic_wallet_client: #^1.0.0 + git: + url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git + ref: web_messagechannel_rpc #archethic_wallet_client: # git: # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git From 850b3532a2439cad62d9c1b0ff1b7d76faf92238 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Mon, 25 Mar 2024 17:48:00 +0100 Subject: [PATCH 02/16] =?UTF-8?q?=F0=9F=94=96=20version=20AWC=20dev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.lock | 44 ++++++++++---------------------------------- pubspec.yaml | 7 ++----- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 6062b3c..c4a18c0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: "direct main" description: name: archethic_lib_dart - sha256: a327b4838ae3c39b14905e01199899befa11568734b0f7f7ed950c88d936af44 + sha256: f2cd0e2516caa91fb675abeaf5b6e88d15c78252964b7335fd583458fd8a6a24 url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "3.3.8" archethic_wallet_client: dependency: "direct main" description: name: archethic_wallet_client - sha256: ffb6821b039df5597ada7f54b2f64bc0198c0dd54342517138d1ddac66678cd9 + sha256: "237cb5843f0d0581457b364a376f14bf775ea32711c3a2403d6a4c85ed11bcb0" url: "https://pub.dev" source: hosted - version: "1.0.11" + version: "1.1.0-dev.0" archive: dependency: "direct main" description: @@ -161,22 +161,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" - ci: - dependency: transitive - description: - name: ci - sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13" - url: "https://pub.dev" - source: hosted - version: "0.1.0" - cli_util: - dependency: transitive - description: - name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 - url: "https://pub.dev" - source: hosted - version: "0.4.1" clock: dependency: transitive description: @@ -225,22 +209,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.7.0" - custom_lint: - dependency: transitive - description: - name: custom_lint - sha256: "445242371d91d2e24bd7b82e3583a2c05610094ba2d0575262484ad889c8f981" - url: "https://pub.dev" - source: hosted - version: "0.6.2" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: ce5d6215f4e143f7780ce53f73dfa6fc503f39d2d30bef76c48be9ac1a09d9a6 + sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6 url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "0.6.3" dart_style: dependency: transitive description: @@ -269,10 +245,10 @@ packages: dependency: transitive description: name: ecdsa - sha256: dd1efbaf6c18bfde9347dddcfe10dce3dd044e5a1b237457a49b5c24850dfb95 + sha256: b71687a843151255fced9fead63b09816cc59e9ae7b954e6a852bdc344ae1aca url: "https://pub.dev" source: hosted - version: "0.0.4" + version: "0.1.0" elliptic: dependency: transitive description: @@ -660,10 +636,10 @@ packages: dependency: transitive description: name: phoenix_socket - sha256: dcbf94b27a5492e14b7cc74dfd2e2a6cec73cfb09cee4f1cc19a58dfa40eb3c2 + sha256: a9d62b25291c3fea7c4439376f33860fb27ff39a7d69a96063fc356e78dee87f url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.7.0" pinenacl: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7f660d8..b56d86f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: archethic_dapp_framework_flutter description: An internal framework for archethic flutter development homepage: https://github.com/archethic-foundation/archethic-dapp-framework-flutter -version: 0.0.5 +version: 0.0.6 environment: sdk: ">=3.3.0 <4.0.0" @@ -12,10 +12,7 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - archethic_wallet_client: #^1.0.0 - git: - url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git - ref: web_messagechannel_rpc + archethic_wallet_client: ^1.1.0-dev.0 #archethic_wallet_client: # git: # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git From 834cc14e35b7e1f459e4dd2b6eb969595738e0de Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Mon, 25 Mar 2024 19:11:20 +0100 Subject: [PATCH 03/16] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20AWC=20versi?= =?UTF-8?q?on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.lock | 24 ------------------------ pubspec.yaml | 4 +++- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index c4a18c0..42c17c3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -41,14 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.8" - archethic_wallet_client: - dependency: "direct main" - description: - name: archethic_wallet_client - sha256: "237cb5843f0d0581457b364a376f14bf775ea32711c3a2403d6a4c85ed11bcb0" - url: "https://pub.dev" - source: hosted - version: "1.1.0-dev.0" archive: dependency: "direct main" description: @@ -233,14 +225,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.3" - deeplink_rpc: - dependency: transitive - description: - name: deeplink_rpc - sha256: eefff517ccc79f26b4414fc3387932d49f80248640ebfbf8331d4a998531d1d9 - url: "https://pub.dev" - source: hosted - version: "1.0.6" ecdsa: dependency: transitive description: @@ -504,14 +488,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" - json_rpc_2: - dependency: transitive - description: - name: json_rpc_2 - sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" - url: "https://pub.dev" - source: hosted - version: "3.0.2" json_serializable: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index b56d86f..0a991ab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,11 +12,13 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - archethic_wallet_client: ^1.1.0-dev.0 + #archethic_wallet_client: ^1.1.0-dev.1 #archethic_wallet_client: # git: # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git # ref: 29-integrate-dart-sdk-fix-from-pr-httpsgithubcomarchethic-foundationlibdartpull127 + #archethic_wallet_client: + # path: ../archethic-wallet-client-dart # Compression archive: ^3.4.10 From 93b7e9bfcf7b7e9b8819eff1110643b2bed713b0 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Mon, 25 Mar 2024 20:48:36 +0100 Subject: [PATCH 04/16] =?UTF-8?q?=F0=9F=94=96=20version=200.0.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.lock | 24 ++++++++++++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index 42c17c3..c2f043d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -41,6 +41,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.8" + archethic_wallet_client: + dependency: "direct main" + description: + name: archethic_wallet_client + sha256: f07adecdcf466e5caa5f779bf72622b27183645c52381257dca7ca7503c68686 + url: "https://pub.dev" + source: hosted + version: "1.1.0-dev.1" archive: dependency: "direct main" description: @@ -225,6 +233,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.3" + deeplink_rpc: + dependency: transitive + description: + name: deeplink_rpc + sha256: eefff517ccc79f26b4414fc3387932d49f80248640ebfbf8331d4a998531d1d9 + url: "https://pub.dev" + source: hosted + version: "1.0.6" ecdsa: dependency: transitive description: @@ -488,6 +504,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + json_rpc_2: + dependency: transitive + description: + name: json_rpc_2 + sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" + url: "https://pub.dev" + source: hosted + version: "3.0.2" json_serializable: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 0a991ab..1429a38 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - #archethic_wallet_client: ^1.1.0-dev.1 + archethic_wallet_client: ^1.1.0-dev.1 #archethic_wallet_client: # git: # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git From ea8c4c30dded54df5912eaa3b5637f239ec1cb6c Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Mon, 25 Mar 2024 20:49:55 +0100 Subject: [PATCH 05/16] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f16bad4..224f628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ Changelog ========= +#### Version 0.0.6 +* Upgrade dependencies + #### Version 0.0.5 * Get Verified tokens from blockchain From 9d15efc49d3682f4675c3091b1f3173ada1373df Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Tue, 26 Mar 2024 23:57:34 +0100 Subject: [PATCH 06/16] =?UTF-8?q?=F0=9F=92=84=20Fix=20responsible=20tools?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/ui/util/components/buttons/app_button.dart | 2 ++ .../ui/util/components/in_progress/in_progress_popup.dart | 8 ++++++-- lib/src/ui/util/generic/responsive.dart | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/src/ui/util/components/buttons/app_button.dart b/lib/src/ui/util/components/buttons/app_button.dart index a43fe2f..67ff5b5 100644 --- a/lib/src/ui/util/components/buttons/app_button.dart +++ b/lib/src/ui/util/components/buttons/app_button.dart @@ -95,6 +95,8 @@ class AppButtonState extends State { fontSize: Responsive.fontSizeFromValue( context, desktopValue: widget.fontSize, + ratioTablet: 1, + ratioMobile: 1, ), fontWeight: FontWeight.w400, ), diff --git a/lib/src/ui/util/components/in_progress/in_progress_popup.dart b/lib/src/ui/util/components/in_progress/in_progress_popup.dart index 50abc6f..c2fd26c 100755 --- a/lib/src/ui/util/components/in_progress/in_progress_popup.dart +++ b/lib/src/ui/util/components/in_progress/in_progress_popup.dart @@ -12,10 +12,14 @@ class InProgressPopup { BuildContext context, List Function(BuildContext context, WidgetRef ref) bodyBuilder, PopupCloseButton Function(BuildContext context, WidgetRef ref) - closeButtonBuilder, - ) async { + closeButtonBuilder, { + bool useSafeArea = false, + bool useRootNavigator = false, + }) async { return showDialog( context: context, + useSafeArea: useSafeArea, + useRootNavigator: useRootNavigator, builder: (context) { return ScaffoldMessenger( child: Builder( diff --git a/lib/src/ui/util/generic/responsive.dart b/lib/src/ui/util/generic/responsive.dart index 3245687..44e05f6 100644 --- a/lib/src/ui/util/generic/responsive.dart +++ b/lib/src/ui/util/generic/responsive.dart @@ -38,15 +38,17 @@ class Responsive extends StatelessWidget { static double fontSizeFromValue( BuildContext context, { required double desktopValue, + double ratioTablet = 2, + double ratioMobile = 4, }) { if (Responsive.isDesktop(context)) { return desktopValue; } else { if (Responsive.isTablet(context)) { - return desktopValue - 2; + return desktopValue - ratioTablet; } } - return desktopValue - 4; + return desktopValue - ratioMobile; } @override From bc507e3710165ba2201f77597a5cf18032bbffb1 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Wed, 27 Mar 2024 11:14:27 +0100 Subject: [PATCH 07/16] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20Archethic?= =?UTF-8?q?=20Dart=20SDK=20version=203.3.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index c2f043d..8c3979f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: "direct main" description: name: archethic_lib_dart - sha256: f2cd0e2516caa91fb675abeaf5b6e88d15c78252964b7335fd583458fd8a6a24 + sha256: c5e252c062ecab7f8bdede233f7f337f0d44018459ebd7f772ed777875ca7de2 url: "https://pub.dev" source: hosted - version: "3.3.8" + version: "3.3.9" archethic_wallet_client: dependency: "direct main" description: name: archethic_wallet_client - sha256: f07adecdcf466e5caa5f779bf72622b27183645c52381257dca7ca7503c68686 + sha256: "212d1194b0f27fbd52023d4f4cd677f9cf7e62c7f3d45392226b8c1f40fbbd67" url: "https://pub.dev" source: hosted - version: "1.1.0-dev.1" + version: "1.1.0-dev.2" archive: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 1429a38..f3de3da 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - archethic_wallet_client: ^1.1.0-dev.1 + archethic_wallet_client: ^1.1.0-dev.2 #archethic_wallet_client: # git: # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git From a28f5125b3653b966b5f7885abd788d889aa4898 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Wed, 27 Mar 2024 11:15:19 +0100 Subject: [PATCH 08/16] =?UTF-8?q?=F0=9F=94=96=20new=20version=200.0.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index f3de3da..1ac7df4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: archethic_dapp_framework_flutter description: An internal framework for archethic flutter development homepage: https://github.com/archethic-foundation/archethic-dapp-framework-flutter -version: 0.0.6 +version: 0.0.7 environment: sdk: ">=3.3.0 <4.0.0" From 88d1ccc655f98c6b08f9c842d8639e2e05eafb26 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Wed, 27 Mar 2024 11:16:29 +0100 Subject: [PATCH 09/16] . --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 224f628..d765651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ Changelog ========= +#### Version 0.0.7 +* Upgrade dependencies + #### Version 0.0.6 * Upgrade dependencies From 0d1af09504617a8430b621aad6878a035b3832a7 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Wed, 27 Mar 2024 17:02:43 +0100 Subject: [PATCH 10/16] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Upgrade=20depende?= =?UTF-8?q?ncies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ pubspec.lock | 8 ++++---- pubspec.yaml | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d765651..3b06aa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ Changelog ========= +#### Version 0.0.8 +* Upgrade dependencies + #### Version 0.0.7 * Upgrade dependencies diff --git a/pubspec.lock b/pubspec.lock index 8c3979f..2cde5ec 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: "direct main" description: name: archethic_lib_dart - sha256: c5e252c062ecab7f8bdede233f7f337f0d44018459ebd7f772ed777875ca7de2 + sha256: "126d8cb7e79dd201c1ec6d2472d12124c3473004413b0befe3ce8d53abb25409" url: "https://pub.dev" source: hosted - version: "3.3.9" + version: "3.3.10" archethic_wallet_client: dependency: "direct main" description: name: archethic_wallet_client - sha256: "212d1194b0f27fbd52023d4f4cd677f9cf7e62c7f3d45392226b8c1f40fbbd67" + sha256: "803c2ae053e31e0996080a5e9a904ead6ca3afc4ebd3f62ed8fe36e31666632a" url: "https://pub.dev" source: hosted - version: "1.1.0-dev.2" + version: "1.1.0-dev.3" archive: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 1ac7df4..3ac8407 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: archethic_dapp_framework_flutter description: An internal framework for archethic flutter development homepage: https://github.com/archethic-foundation/archethic-dapp-framework-flutter -version: 0.0.7 +version: 0.0.8 environment: sdk: ">=3.3.0 <4.0.0" @@ -12,7 +12,7 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - archethic_wallet_client: ^1.1.0-dev.2 + archethic_wallet_client: ^1.1.0-dev.3 #archethic_wallet_client: # git: # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git From 9908e36ea742a8d06bd6c37783c20038b693a4b1 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Thu, 28 Mar 2024 10:16:43 +0100 Subject: [PATCH 11/16] =?UTF-8?q?=F0=9F=92=84=20Fix=20responsive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/util/components/archethic_oracle_uco.dart | 6 +----- lib/src/ui/util/components/info_banner.dart | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/src/ui/util/components/archethic_oracle_uco.dart b/lib/src/ui/util/components/archethic_oracle_uco.dart index 1eef392..a88991b 100755 --- a/lib/src/ui/util/components/archethic_oracle_uco.dart +++ b/lib/src/ui/util/components/archethic_oracle_uco.dart @@ -2,7 +2,6 @@ import 'package:archethic_dapp_framework_flutter/src/application/oracle/provider.dart'; import 'package:archethic_dapp_framework_flutter/src/ui/util/components/icon_button_animated.dart'; import 'package:archethic_dapp_framework_flutter/src/ui/util/generic/formatters.dart'; -import 'package:archethic_dapp_framework_flutter/src/ui/util/generic/responsive.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; @@ -49,10 +48,7 @@ class ArchethicOracleUco extends ConsumerWidget { SelectableText( '1 UCO = \$${archethicOracleUCO.usd.formatNumber(precision: 2)} ($timestamp)', style: TextStyle( - fontSize: Responsive.fontSizeFromTextStyle( - context, - Theme.of(context).textTheme.labelSmall!, - ), + fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, ), ), ], diff --git a/lib/src/ui/util/components/info_banner.dart b/lib/src/ui/util/components/info_banner.dart index d44fb1c..9f7e56e 100755 --- a/lib/src/ui/util/components/info_banner.dart +++ b/lib/src/ui/util/components/info_banner.dart @@ -1,5 +1,6 @@ /// SPDX-License-Identifier: AGPL-3.0-or-later import 'package:archethic_dapp_framework_flutter/src/ui/themes/app_theme_base.dart'; +import 'package:archethic_dapp_framework_flutter/src/ui/util/generic/responsive.dart'; import 'package:archethic_dapp_framework_flutter/src/ui/util/iconsax.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; @@ -101,6 +102,19 @@ class InfoBanner extends StatelessWidget { .colorScheme .primary : AppThemeBase.statusOK, + fontSize: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith( + fontSize: Responsive + .fontSizeFromTextStyle( + context, + Theme.of(context) + .textTheme + .bodyMedium!, + ), + ) + .fontSize, ), ), ), From c616680d1501594ec7739aac76cfb204d984a824 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Thu, 28 Mar 2024 10:16:53 +0100 Subject: [PATCH 12/16] =?UTF-8?q?=F0=9F=90=9B=20Fix=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/ui/util/components/buttons/popup_close_button.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/ui/util/components/buttons/popup_close_button.dart b/lib/src/ui/util/components/buttons/popup_close_button.dart index bc80008..9c65d5e 100644 --- a/lib/src/ui/util/components/buttons/popup_close_button.dart +++ b/lib/src/ui/util/components/buttons/popup_close_button.dart @@ -109,7 +109,6 @@ class PopupCloseButton extends StatelessWidget { if (!context.mounted) return; Navigator.of(context).pop(); - Navigator.of(context).pop(); }, ), ], From 743e88e4b932dded33d2112ef3b72c10440edd5e Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Thu, 28 Mar 2024 10:17:19 +0100 Subject: [PATCH 13/16] =?UTF-8?q?=F0=9F=94=96=20new=20version=200.0.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 3ac8407..06faa76 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: archethic_dapp_framework_flutter description: An internal framework for archethic flutter development homepage: https://github.com/archethic-foundation/archethic-dapp-framework-flutter -version: 0.0.8 +version: 0.0.9 environment: sdk: ">=3.3.0 <4.0.0" From 92f7468fe13b680026235e77659b28a2752aa24a Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Thu, 28 Mar 2024 10:19:06 +0100 Subject: [PATCH 14/16] =?UTF-8?q?=F0=9F=93=9D=20Fix=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b06aa2..26d56b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ Changelog ========= +#### Version 0.0.9 +* Fix responsive +* Fix popup navigation + #### Version 0.0.8 * Upgrade dependencies From 3f3410daba85f3e0138e1cbafd4b57ac23e68d62 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Sat, 30 Mar 2024 00:49:18 +0100 Subject: [PATCH 15/16] =?UTF-8?q?=F0=9F=92=84=20Improve=20widgets=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buttons/popup_close_button.dart | 11 +- lib/src/ui/util/components/info_banner.dart | 166 +++++++----------- pubspec.lock | 12 +- pubspec.yaml | 2 +- 4 files changed, 74 insertions(+), 117 deletions(-) diff --git a/lib/src/ui/util/components/buttons/popup_close_button.dart b/lib/src/ui/util/components/buttons/popup_close_button.dart index 9c65d5e..4aacd63 100644 --- a/lib/src/ui/util/components/buttons/popup_close_button.dart +++ b/lib/src/ui/util/components/buttons/popup_close_button.dart @@ -12,11 +12,13 @@ class PopupCloseButton extends StatelessWidget { this.warningCloseLabel = '', this.warningCloseFunction, this.warningCloseWarning = false, + this.closeFunction, }); final bool warningCloseWarning; final String warningCloseLabel; final Function? warningCloseFunction; + final Function? closeFunction; @override Widget build(BuildContext context) { @@ -25,11 +27,12 @@ class PopupCloseButton extends StatelessWidget { child: InkWell( onTap: () async { if (warningCloseWarning == false) { - if (warningCloseFunction != null) { - await warningCloseFunction!(); + if (closeFunction != null) { + await closeFunction!(); + } else { + if (!context.mounted) return; + Navigator.of(context).pop(); } - if (!context.mounted) return; - Navigator.of(context).pop(); return; } diff --git a/lib/src/ui/util/components/info_banner.dart b/lib/src/ui/util/components/info_banner.dart index 9f7e56e..274b101 100755 --- a/lib/src/ui/util/components/info_banner.dart +++ b/lib/src/ui/util/components/info_banner.dart @@ -11,7 +11,6 @@ class InfoBanner extends StatelessWidget { const InfoBanner( this.message, this.infoBannerType, { - this.height = 40, this.width = AppThemeBase.sizeBoxComponentWidth, this.waitAnimation = false, super.key, @@ -19,126 +18,81 @@ class InfoBanner extends StatelessWidget { final String message; final InfoBannerType infoBannerType; - final double height; final double width; final bool waitAnimation; @override Widget build(BuildContext context) { if (message.isEmpty) { - return SizedBox( - height: height, - ); + return const SizedBox.shrink(); // } - return SizedBox( - width: width, - height: height, + return Container( + padding: const EdgeInsets.only( + left: 10, + right: 10, + top: 5, + bottom: 5, + ), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular( + 10, + ), + border: Border.all( + color: infoBannerType == InfoBannerType.error + ? Theme.of(context).colorScheme.error.withOpacity(0.6) + : infoBannerType == InfoBannerType.request + ? Theme.of(context).colorScheme.primary.withOpacity(0.6) + : AppThemeBase.statusOK.withOpacity(0.6), + width: 0.5, + ), + gradient: AppThemeBase.gradientInfoBannerBackground, + ), + alignment: Alignment.centerLeft, child: Row( - mainAxisAlignment: MainAxisAlignment.center, children: [ + if (infoBannerType == InfoBannerType.error) + Icon( + Iconsax.warning_2, + color: Theme.of(context).colorScheme.error, + size: Responsive.fontSizeFromTextStyle( + context, + Theme.of(context).textTheme.bodyMedium!, + ) + + 2, + ), + if (infoBannerType == InfoBannerType.error) const SizedBox(width: 5), Expanded( - child: DecoratedBox( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20), - ), - child: Row( - children: [ - Expanded( - child: DecoratedBox( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular( - 10, - ), - border: Border.all( - color: infoBannerType == InfoBannerType.error - ? Theme.of(context) - .colorScheme - .error - .withOpacity(0.6) - : infoBannerType == InfoBannerType.request - ? Theme.of(context) - .colorScheme - .primary - .withOpacity(0.6) - : AppThemeBase.statusOK.withOpacity(0.6), - width: 0.5, - ), - gradient: AppThemeBase.gradientInfoBannerBackground, + child: SelectableText( + message, + style: TextStyle( + color: infoBannerType == InfoBannerType.error + ? Theme.of(context).colorScheme.error + : infoBannerType == InfoBannerType.request + ? Theme.of(context).colorScheme.primary + : AppThemeBase.statusOK, + fontSize: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith( + fontSize: Responsive.fontSizeFromTextStyle( + context, + Theme.of(context).textTheme.bodyMedium!, ), - child: Container( - padding: const EdgeInsets.only( - left: 10, - ), - height: 45, - alignment: Alignment.centerLeft, - child: Row( - children: [ - if (infoBannerType == InfoBannerType.error) - Icon( - Iconsax.warning_2, - color: Theme.of(context).colorScheme.error, - ), - if (infoBannerType == InfoBannerType.error) - const SizedBox(width: 5), - Expanded( - child: Wrap( - crossAxisAlignment: WrapCrossAlignment.center, - children: [ - Padding( - padding: - const EdgeInsets.only(top: 2, right: 5), - child: SelectableText( - message, - style: TextStyle( - color: infoBannerType == - InfoBannerType.error - ? Theme.of(context) - .colorScheme - .error - : infoBannerType == - InfoBannerType.request - ? Theme.of(context) - .colorScheme - .primary - : AppThemeBase.statusOK, - fontSize: Theme.of(context) - .textTheme - .bodyMedium! - .copyWith( - fontSize: Responsive - .fontSizeFromTextStyle( - context, - Theme.of(context) - .textTheme - .bodyMedium!, - ), - ) - .fontSize, - ), - ), - ), - if (waitAnimation) - SizedBox( - width: 10, - height: 10, - child: CircularProgressIndicator( - color: Colors.white.withOpacity(0.6), - strokeWidth: 1, - ), - ), - ], - ), - ), - ], - ), - ), - ), - ), - ], + ) + .fontSize, ), ), ), + if (waitAnimation) + SizedBox( + width: 10, + height: 10, + child: CircularProgressIndicator( + color: Colors.white.withOpacity(0.6), + strokeWidth: 1, + ), + ), ], ), ) diff --git a/pubspec.lock b/pubspec.lock index 2cde5ec..4f0522d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -117,10 +117,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.4.9" build_runner_core: dependency: transitive description: @@ -348,10 +348,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" get_it: dependency: "direct main" description: @@ -636,10 +636,10 @@ packages: dependency: transitive description: name: phoenix_socket - sha256: a9d62b25291c3fea7c4439376f33860fb27ff39a7d69a96063fc356e78dee87f + sha256: "21c0ed733db29a74d54f676aaab4800d8b7278bc0e4e95a7a7c5d7773464a2bf" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.1" pinenacl: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 06faa76..4c11e17 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: archethic_dapp_framework_flutter description: An internal framework for archethic flutter development homepage: https://github.com/archethic-foundation/archethic-dapp-framework-flutter -version: 0.0.9 +version: 0.0.10 environment: sdk: ">=3.3.0 <4.0.0" From c5ec9401e29d7eb84e66bad5d36f5d963b6308c8 Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Wed, 3 Apr 2024 21:48:16 +0200 Subject: [PATCH 16/16] =?UTF-8?q?=F0=9F=94=96=20Stable=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ README.md | 2 +- pubspec.lock | 20 ++++++++++---------- pubspec.yaml | 10 ++-------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26d56b6..dfcdf60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ Changelog ========= +#### Version 1.0.0 +* Stable version + #### Version 0.0.9 * Fix responsive * Fix popup navigation diff --git a/README.md b/README.md index b774c29..a4660b0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Archethic's flutter framework to create Archethic Dapps -WIP +This project provides widgets to facilitate the creation of Archethic DApps ## Arb file management diff --git a/pubspec.lock b/pubspec.lock index 4f0522d..3245067 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: "direct main" description: name: archethic_lib_dart - sha256: "126d8cb7e79dd201c1ec6d2472d12124c3473004413b0befe3ce8d53abb25409" + sha256: "6de293153303da1a32e8b32e12410bf3da351f24aeb5b77fccd052aab852bb7e" url: "https://pub.dev" source: hosted - version: "3.3.10" + version: "3.3.11" archethic_wallet_client: dependency: "direct main" description: name: archethic_wallet_client - sha256: "803c2ae053e31e0996080a5e9a904ead6ca3afc4ebd3f62ed8fe36e31666632a" + sha256: cdfadc5d8d095db8b766d327d2bcc2de649102cb69f21851c63d66743900ffd0 url: "https://pub.dev" source: hosted - version: "1.1.0-dev.3" + version: "1.1.0" archive: dependency: "direct main" description: @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: built_value - sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.9.1" + version: "8.9.2" characters: dependency: transitive description: @@ -356,10 +356,10 @@ packages: dependency: "direct main" description: name: get_it - sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7 + sha256: "36524bfb3f0b4ec952c3202466fdd69ad1f7ac1dd9b0a7564177707e45bfaeb9" url: "https://pub.dev" source: hosted - version: "7.6.7" + version: "7.6.8" glob: dependency: transitive description: @@ -993,10 +993,10 @@ packages: dependency: transitive description: name: win32 - sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480" + sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.0" x25519: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4c11e17..bda4f8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: archethic_dapp_framework_flutter description: An internal framework for archethic flutter development homepage: https://github.com/archethic-foundation/archethic-dapp-framework-flutter -version: 0.0.10 +version: 1.0.0 environment: sdk: ">=3.3.0 <4.0.0" @@ -12,13 +12,7 @@ dependencies: archethic_lib_dart: ^3.3.0 # A client dart library to interact with Archethic Wallet RPC API. - archethic_wallet_client: ^1.1.0-dev.3 - #archethic_wallet_client: - # git: - # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git - # ref: 29-integrate-dart-sdk-fix-from-pr-httpsgithubcomarchethic-foundationlibdartpull127 - #archethic_wallet_client: - # path: ../archethic-wallet-client-dart + archethic_wallet_client: ^1.1.0 # Compression archive: ^3.4.10