From 6cc4285f9783e5e3c81eeee1c603740d0d6b2099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Moli=C5=84ski?= <47773413+damian-molinski@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:24:59 +0100 Subject: [PATCH] chore(cat-voices): update flutter version (#1775) * chore: update flutter constraints * chore: address warnings * chore: bump ci version for testing * fix: segments button icon color * chore: test update ci * chore: test * chore: bump ci ver * chore: use latest ci version --------- Co-authored-by: Oleksandr Prokhorenko --- .../workflows/flutter-publish-packages.yml | 2 +- Earthfile | 6 ++--- catalyst-gateway/Earthfile | 2 +- catalyst-gateway/event-db/Earthfile | 2 +- catalyst-gateway/tests/Earthfile | 2 +- catalyst-gateway/tests/api_tests/Earthfile | 2 +- catalyst_voices/Earthfile | 4 ++-- catalyst_voices/README.md | 2 +- .../apps/voices/lib/common/ext/space_ext.dart | 4 ++-- .../details/widgets/campaign_management.dart | 2 +- .../overall_spaces/brands_navigation.dart | 4 ++-- .../widgets/cards/campaign_category_card.dart | 2 +- .../lib/widgets/cards/comment_card.dart | 2 +- .../widgets/cards/funded_proposal_card.dart | 2 +- .../widgets/cards/pending_proposal_card.dart | 4 ++-- .../lib/widgets/cards/role_chooser_card.dart | 3 +++ .../language_code_widget.dart | 3 +-- .../details/voices_details_dialog_header.dart | 6 ++--- .../seed_phrase/seed_phrases_completer.dart | 2 +- .../seed_phrase/seed_phrases_picker.dart | 2 +- .../widgets/text/timezone_date_time_text.dart | 4 ++-- .../widgets/text_field/voices_text_field.dart | 5 +++- catalyst_voices/apps/voices/pubspec.yaml | 4 ++-- catalyst_voices/melos.yaml | 4 ++-- .../example/pubspec.yaml | 2 +- .../catalyst_voices_assets/pubspec.yaml | 2 +- .../catalyst_voices_blocs/pubspec.yaml | 4 ++-- .../lib/src/catalyst_voices_brands.dart | 1 + .../lib/src/themes/widgets/toggles_theme.dart | 4 ++-- .../themes/widgets/voices_dialog_theme.dart | 1 + .../voices_segmented_button_theme.dart | 19 +++++++++++++++ .../lib/src/utils/color_ext.dart | 24 +++++++++++++++++++ .../catalyst_voices_brands/pubspec.yaml | 2 +- .../catalyst_voices_driver/pubspec.yaml | 2 +- .../catalyst_voices_localization/pubspec.yaml | 2 +- .../catalyst_voices_models/pubspec.yaml | 2 +- .../catalyst_voices_repositories/pubspec.yaml | 4 ++-- .../catalyst_voices_services/pubspec.yaml | 4 ++-- .../catalyst_voices_shared/pubspec.yaml | 4 ++-- .../catalyst_voices_view_models/pubspec.yaml | 2 +- catalyst_voices/packages/libs/README.md | 2 +- .../catalyst_cardano/README.md | 2 +- .../catalyst_cardano/example/pubspec.yaml | 2 +- .../catalyst_cardano/pubspec.yaml | 2 +- .../wallet-automation/Earthfile | 4 ++-- .../pubspec.yaml | 2 +- .../catalyst_cardano_web/pubspec.yaml | 2 +- .../catalyst_cardano_serialization/README.md | 2 +- .../pubspec.yaml | 2 +- .../catalyst_compression/README.md | 2 +- .../catalyst_compression/pubspec.yaml | 2 +- .../pubspec.yaml | 2 +- .../catalyst_compression_web/pubspec.yaml | 2 +- .../packages/libs/catalyst_cose/pubspec.yaml | 2 +- .../libs/catalyst_key_derivation/Earthfile | 4 ++-- .../libs/catalyst_key_derivation/README.md | 2 +- .../cargokit/build_tool/pubspec.yaml | 2 +- .../libs/catalyst_key_derivation/pubspec.yaml | 4 ++-- .../catalyst_key_derivation/rust/Earthfile | 2 +- .../utilities/poc_local_storage/pubspec.yaml | 4 ++-- .../utilities/remote_widgets/pubspec.yaml | 2 +- .../utilities/uikit_example/Earthfile | 2 +- .../lib/examples/voices_avatar_example.dart | 4 +++- .../utilities/uikit_example/pubspec.yaml | 4 ++-- docs/Earthfile | 2 +- utilities/docs-preview/Earthfile | 2 +- 66 files changed, 135 insertions(+), 83 deletions(-) create mode 100644 catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/utils/color_ext.dart diff --git a/.github/workflows/flutter-publish-packages.yml b/.github/workflows/flutter-publish-packages.yml index 7515393f89aa..19a9a40dacd7 100644 --- a/.github/workflows/flutter-publish-packages.yml +++ b/.github/workflows/flutter-publish-packages.yml @@ -20,7 +20,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.24.1 + flutter-version: 3.27.3 - uses: bluefireteam/melos-action@v3 with: run-versioning: true diff --git a/Earthfile b/Earthfile index 6ffd5da828f9..fdaf96c1697b 100644 --- a/Earthfile +++ b/Earthfile @@ -1,8 +1,8 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.31 AS mdlint-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.31 AS cspell-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.31 AS postgresql-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.35 AS mdlint-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.35 AS cspell-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.35 AS postgresql-ci FROM debian:stable-slim diff --git a/catalyst-gateway/Earthfile b/catalyst-gateway/Earthfile index 7b7ba67519a3..b4cc0fa904dc 100644 --- a/catalyst-gateway/Earthfile +++ b/catalyst-gateway/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.31 AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.35 AS rust-ci IMPORT ../ AS repo-ci #cspell: words rustfmt toolsets USERARCH stdcfgs diff --git a/catalyst-gateway/event-db/Earthfile b/catalyst-gateway/event-db/Earthfile index e0e4d840f0e8..fd5c60002039 100644 --- a/catalyst-gateway/event-db/Earthfile +++ b/catalyst-gateway/event-db/Earthfile @@ -3,7 +3,7 @@ # the database and its associated software. VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.34 AS postgresql-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.35 AS postgresql-ci # cspell: words diff --git a/catalyst-gateway/tests/Earthfile b/catalyst-gateway/tests/Earthfile index 4ad00f6a912b..0ee49b24d63b 100644 --- a/catalyst-gateway/tests/Earthfile +++ b/catalyst-gateway/tests/Earthfile @@ -1,5 +1,5 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.2.31 AS spectral-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.2.35 AS spectral-ci IMPORT .. AS gateway # INSTALL_SCYLLA - Installs scylla for bookworm-slim/debian diff --git a/catalyst-gateway/tests/api_tests/Earthfile b/catalyst-gateway/tests/api_tests/Earthfile index e803c48a85bc..0b233211df2f 100644 --- a/catalyst-gateway/tests/api_tests/Earthfile +++ b/catalyst-gateway/tests/api_tests/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.31 AS python-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.35 AS python-ci builder: FROM python-ci+python-base diff --git a/catalyst_voices/Earthfile b/catalyst_voices/Earthfile index 0e62799f9ab8..8fa86be011ff 100644 --- a/catalyst_voices/Earthfile +++ b/catalyst_voices/Earthfile @@ -1,7 +1,8 @@ VERSION 0.8 IMPORT ../catalyst-gateway AS catalyst-gateway -IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.33 AS flutter-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.35 AS flutter-ci + # repo-catalyst-voices - Creates artifacts of all configuration files, # packages and folders related to catalyst_voices frontend. @@ -76,7 +77,6 @@ code-generator: # restore current working directory to the root of the project WORKDIR /frontend - # Runs static analysis on the code. check-static-analysis: FROM +code-generator diff --git a/catalyst_voices/README.md b/catalyst_voices/README.md index 266da52c97a5..87252c13fecd 100644 --- a/catalyst_voices/README.md +++ b/catalyst_voices/README.md @@ -20,7 +20,7 @@ This repository contains the Catalyst Voices app and packages. ## Requirements -* flutter: 3.24.1+ +* flutter: 3.27.3+ * Dart: 3.5.0+ * Ruby: 2.5+ * Xcode: 15.0+ diff --git a/catalyst_voices/apps/voices/lib/common/ext/space_ext.dart b/catalyst_voices/apps/voices/lib/common/ext/space_ext.dart index c399cc5c4ea6..8e3aa06794a7 100644 --- a/catalyst_voices/apps/voices/lib/common/ext/space_ext.dart +++ b/catalyst_voices/apps/voices/lib/common/ext/space_ext.dart @@ -41,11 +41,11 @@ extension SpaceExt on Space { Color backgroundColor(BuildContext context) => switch (this) { Space.discovery => - Theme.of(context).colors.iconsSecondary.withOpacity(0.16), + Theme.of(context).colors.iconsSecondary.withValues(alpha: 0.16), Space.workspace => Theme.of(context).colorScheme.primaryContainer, Space.voting => Theme.of(context).colors.warningContainer, Space.fundedProjects => - Theme.of(context).colors.iconsSecondary.withOpacity(0.16), + Theme.of(context).colors.iconsSecondary.withValues(alpha: 0.16), Space.treasury => Theme.of(context).colors.successContainer, }; diff --git a/catalyst_voices/apps/voices/lib/pages/campaign/details/widgets/campaign_management.dart b/catalyst_voices/apps/voices/lib/pages/campaign/details/widgets/campaign_management.dart index 3ca93482df5d..271525ba7bea 100644 --- a/catalyst_voices/apps/voices/lib/pages/campaign/details/widgets/campaign_management.dart +++ b/catalyst_voices/apps/voices/lib/pages/campaign/details/widgets/campaign_management.dart @@ -82,7 +82,7 @@ class _CampaignStatusIndicator extends StatelessWidget { decoration: BoxDecoration( color: currentStatus == campaignStatus ? theme.colors.success - : theme.colors.onSurfaceNeutral012.withOpacity(.12), + : theme.colors.onSurfaceNeutral012.withValues(alpha: .12), borderRadius: BorderRadius.circular(8), ), child: Padding( diff --git a/catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart b/catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart index 40373a17d764..660907369f04 100644 --- a/catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart +++ b/catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart @@ -166,7 +166,7 @@ final class _BackgroundColor implements WidgetStateProperty { @override Color? resolve(Set states) { if (states.contains(WidgetState.selected)) { - return colors.onSurfacePrimaryContainer.withOpacity(0.12); + return colors.onSurfacePrimaryContainer.withValues(alpha: 0.12); } return Colors.transparent; @@ -181,7 +181,7 @@ final class _ForegroundColor implements WidgetStateProperty { @override Color? resolve(Set states) { if (states.contains(WidgetState.disabled)) { - return colors.textOnPrimaryLevel0.withOpacity(0.3); + return colors.textOnPrimaryLevel0.withValues(alpha: 0.3); } return colors.textOnPrimaryLevel0; diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/campaign_category_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/campaign_category_card.dart index cf315ae3f7ed..4f6b4626272d 100644 --- a/catalyst_voices/apps/voices/lib/widgets/cards/campaign_category_card.dart +++ b/catalyst_voices/apps/voices/lib/widgets/cards/campaign_category_card.dart @@ -21,7 +21,7 @@ class CampaignCategoryCard extends StatelessWidget { color: context.colors.elevationsOnSurfaceNeutralLv1White, borderRadius: BorderRadius.circular(16), border: Border.all( - color: context.colors.outlineBorderVariant.withOpacity(.38), + color: context.colors.outlineBorderVariant.withValues(alpha: .38), ), ), clipBehavior: Clip.antiAlias, diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/comment_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/comment_card.dart index e1df06de0f13..fc64ff514948 100644 --- a/catalyst_voices/apps/voices/lib/widgets/cards/comment_card.dart +++ b/catalyst_voices/apps/voices/lib/widgets/cards/comment_card.dart @@ -17,7 +17,7 @@ class CommentCard extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(16), border: Border.all( - color: Theme.of(context).colorScheme.outline.withOpacity(.38), + color: Theme.of(context).colorScheme.outline.withValues(alpha: .38), width: 1, ), ), diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/funded_proposal_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/funded_proposal_card.dart index 12d82b8a204e..4bb64071470e 100644 --- a/catalyst_voices/apps/voices/lib/widgets/cards/funded_proposal_card.dart +++ b/catalyst_voices/apps/voices/lib/widgets/cards/funded_proposal_card.dart @@ -195,7 +195,7 @@ class _FundsAndComments extends StatelessWidget { return Container( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), decoration: BoxDecoration( - color: Theme.of(context).colors.success.withOpacity(0.08), + color: Theme.of(context).colors.success.withValues(alpha: 0.08), borderRadius: BorderRadius.circular(8), ), child: Row( diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/pending_proposal_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/pending_proposal_card.dart index 8b0ec06699ab..914805609841 100644 --- a/catalyst_voices/apps/voices/lib/widgets/cards/pending_proposal_card.dart +++ b/catalyst_voices/apps/voices/lib/widgets/cards/pending_proposal_card.dart @@ -142,7 +142,7 @@ final class _ProposalBorderColor extends WidgetStateColor { required this.publishStage, required this.colors, required this.colorScheme, - }) : super(colors.outlineBorder.value); + }) : super(colors.outlineBorder.toARGB32()); @override Color resolve(Set states) { @@ -291,7 +291,7 @@ class _FundsAndDuration extends StatelessWidget { return Container( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primary.withOpacity(0.12), + color: Theme.of(context).colorScheme.primary.withValues(alpha: 0.12), borderRadius: BorderRadius.circular(8), ), child: SizedBox( diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/role_chooser_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/role_chooser_card.dart index 89772d2268e3..a32310d33647 100644 --- a/catalyst_voices/apps/voices/lib/widgets/cards/role_chooser_card.dart +++ b/catalyst_voices/apps/voices/lib/widgets/cards/role_chooser_card.dart @@ -230,6 +230,9 @@ class _DisplayingValueAsSegmentedButton extends StatelessWidget { selectedBackgroundColor: value ? Theme.of(context).colors.success : Theme.of(context).colors.iconsError, + iconColor: value + ? Theme.of(context).colors.successContainer + : Colors.transparent, ), showSelectedIcon: false, selected: {value}, diff --git a/catalyst_voices/apps/voices/lib/widgets/document_builder/language_code_widget.dart b/catalyst_voices/apps/voices/lib/widgets/document_builder/language_code_widget.dart index 3b56888b9f2f..17960222ab1c 100644 --- a/catalyst_voices/apps/voices/lib/widgets/document_builder/language_code_widget.dart +++ b/catalyst_voices/apps/voices/lib/widgets/document_builder/language_code_widget.dart @@ -1,7 +1,6 @@ import 'package:catalyst_voices/common/ext/document_property_schema_ext.dart'; import 'package:catalyst_voices/widgets/dropdown/voices_dropdown.dart'; import 'package:catalyst_voices_models/catalyst_voices_models.dart'; -import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localized_locales/flutter_localized_locales.dart'; @@ -38,7 +37,7 @@ class _LanguageCodeWidgetState extends State { ? DropdownMenuEntry(value: e, label: label) : null; }) - .whereNotNull() + .nonNulls .toList(); } diff --git a/catalyst_voices/apps/voices/lib/widgets/modals/details/voices_details_dialog_header.dart b/catalyst_voices/apps/voices/lib/widgets/modals/details/voices_details_dialog_header.dart index ab13a9515fe3..6f777c93085a 100644 --- a/catalyst_voices/apps/voices/lib/widgets/modals/details/voices_details_dialog_header.dart +++ b/catalyst_voices/apps/voices/lib/widgets/modals/details/voices_details_dialog_header.dart @@ -38,9 +38,9 @@ class _Background extends StatelessWidget { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Colors.black.withOpacity(0), - Colors.black.withOpacity(0.4), - Colors.black.withOpacity(0.4), + Colors.black.withValues(alpha: 0), + Colors.black.withValues(alpha: 0.4), + Colors.black.withValues(alpha: 0.4), ], stops: const [ 0, diff --git a/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_completer.dart b/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_completer.dart index df0844284f04..b2e19caa4e13 100644 --- a/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_completer.dart +++ b/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_completer.dart @@ -164,7 +164,7 @@ final class _CellBackgroundColor extends WidgetStateProperty { @override Color? resolve(Set states) { if (states.contains(WidgetState.disabled)) { - return theme.colorScheme.onSurface.withOpacity(0.08); + return theme.colorScheme.onSurface.withValues(alpha: 0.08); } if (states.contains(WidgetState.focused)) { diff --git a/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_picker.dart b/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_picker.dart index 3db064b2617f..c59eb3ee5c11 100644 --- a/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_picker.dart +++ b/catalyst_voices/apps/voices/lib/widgets/seed_phrase/seed_phrases_picker.dart @@ -119,7 +119,7 @@ final class _CellBackgroundColor extends WidgetStateProperty { @override Color resolve(Set states) { if (states.contains(WidgetState.selected)) { - return theme.colorScheme.primary.withOpacity(0.12); + return theme.colorScheme.primary.withValues(alpha: 0.12); } return theme.colorScheme.primary; diff --git a/catalyst_voices/apps/voices/lib/widgets/text/timezone_date_time_text.dart b/catalyst_voices/apps/voices/lib/widgets/text/timezone_date_time_text.dart index f37bf5931caa..21ae9a99010e 100644 --- a/catalyst_voices/apps/voices/lib/widgets/text/timezone_date_time_text.dart +++ b/catalyst_voices/apps/voices/lib/widgets/text/timezone_date_time_text.dart @@ -74,8 +74,8 @@ class TimezoneDateTimeText extends StatelessWidget { Widget build(BuildContext context) { final theme = Theme.of(context); final textTheme = theme.textTheme; - final timezone = context.select( - (value) => value.state.settings.timezone, + final timezone = context.select( + (value) => value?.state.settings.timezone ?? TimezonePreferences.local, ); final effectiveData = switch (timezone) { diff --git a/catalyst_voices/apps/voices/lib/widgets/text_field/voices_text_field.dart b/catalyst_voices/apps/voices/lib/widgets/text_field/voices_text_field.dart index 2b3b7a318ed3..f7911ce01eac 100644 --- a/catalyst_voices/apps/voices/lib/widgets/text_field/voices_text_field.dart +++ b/catalyst_voices/apps/voices/lib/widgets/text_field/voices_text_field.dart @@ -433,7 +433,10 @@ class _VoicesTextFieldState extends State { case VoicesTextFieldStatus.none: return null; case VoicesTextFieldStatus.success: - return VoicesAssets.icons.checkCircle.buildIcon(color: color); + return VoicesAssets.icons.checkCircle.buildIcon( + color: color, + fit: BoxFit.scaleDown, + ); case VoicesTextFieldStatus.warning: // TODO(dtscalac): this is not the right icon, it should be outlined // & rounded, ask designers to provide it and update it diff --git a/catalyst_voices/apps/voices/pubspec.yaml b/catalyst_voices/apps/voices/pubspec.yaml index 41823d0dcd11..97269b34f8df 100644 --- a/catalyst_voices/apps/voices/pubspec.yaml +++ b/catalyst_voices/apps/voices/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: animated_text_kit: ^4.2.2 @@ -32,7 +32,7 @@ dependencies: path: ../../packages/internal/catalyst_voices_shared catalyst_voices_view_models: path: ../../packages/internal/catalyst_voices_view_models - collection: ^1.18.0 + collection: ^1.19.0 dotted_border: ^2.1.0 equatable: ^2.0.7 file_picker: ^8.0.7 diff --git a/catalyst_voices/melos.yaml b/catalyst_voices/melos.yaml index 50024491e11c..5dae3679dcbd 100644 --- a/catalyst_voices/melos.yaml +++ b/catalyst_voices/melos.yaml @@ -86,13 +86,13 @@ command: runPubGetInParallel: true environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: asn1lib: ^1.5.3 bip39: ^1.0.6 bloc_concurrency: ^0.2.2 chopper: ^8.0.3 - collection: ^1.18.0 + collection: ^1.19.0 cryptography: ^2.7.0 dotted_border: ^2.1.0 ed25519_hd_key: ^2.3.0 diff --git a/catalyst_voices/packages/internal/catalyst_voices_assets/example/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_assets/example/pubspec.yaml index 1a2532aae13d..3d8b984f9b3b 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_assets/example/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_assets/example/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_voices_assets: diff --git a/catalyst_voices/packages/internal/catalyst_voices_assets/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_assets/pubspec.yaml index 87f4243fcf37..9f53e96107b2 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_assets/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_assets/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: flutter: diff --git a/catalyst_voices/packages/internal/catalyst_voices_blocs/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_blocs/pubspec.yaml index e16e58a16447..36fc77541542 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_blocs/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_blocs/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: bloc_concurrency: ^0.2.2 @@ -25,7 +25,7 @@ dependencies: path: ../catalyst_voices_shared catalyst_voices_view_models: path: ../catalyst_voices_view_models - collection: ^1.18.0 + collection: ^1.19.0 equatable: ^2.0.7 flutter: sdk: flutter diff --git a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/catalyst_voices_brands.dart b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/catalyst_voices_brands.dart index 433bcdb99754..02207a448276 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/catalyst_voices_brands.dart +++ b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/catalyst_voices_brands.dart @@ -1,4 +1,5 @@ export 'brands/brand.dart'; export 'theme_builder/theme_builder.dart'; export 'theme_extensions/theme_extensions.dart'; +export 'utils/color_ext.dart'; export 'utils/typedefs.dart'; diff --git a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/toggles_theme.dart b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/toggles_theme.dart index d5326ae4e678..c04f98b0aec7 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/toggles_theme.dart +++ b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/toggles_theme.dart @@ -12,7 +12,7 @@ extension TogglesTheme on ThemeData { fillColor: WidgetStateProperty.resolveWith( (states) { if (states.contains(WidgetState.disabled)) { - return colors.iconsDisabled.withOpacity(0.32); + return colors.iconsDisabled.withValues(alpha: 0.32); } if (states.contains(WidgetState.selected)) { @@ -114,7 +114,7 @@ extension TogglesTheme on ThemeData { return colorScheme.primary; } - return colors.outlineBorderVariant.withOpacity(0.38); + return colors.outlineBorderVariant.withValues(alpha: 0.38); }, ), trackOutlineColor: WidgetStateProperty.resolveWith( diff --git a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_dialog_theme.dart b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_dialog_theme.dart index c62033a0e55d..1b27577f0616 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_dialog_theme.dart +++ b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_dialog_theme.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; class VoicesDialogTheme extends DialogTheme { VoicesDialogTheme({ + super.key, required VoicesColorScheme colors, }) : super( barrierColor: colors.overlay, diff --git a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_segmented_button_theme.dart b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_segmented_button_theme.dart index 05dbbf34fb0e..ebee1bb87703 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_segmented_button_theme.dart +++ b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/themes/widgets/voices_segmented_button_theme.dart @@ -18,6 +18,7 @@ class VoicesSegmentedButtonTheme extends SegmentedButtonThemeData { textStyle: textTheme.labelLarge, ).copyWith( side: _Side(colors: voicesColors), + iconColor: _IconColor(colors: voicesColors), ), ); } @@ -38,3 +39,21 @@ class _Side extends WidgetStateBorderSide { return BorderSide(color: colors.outlineBorder); } } + +class _IconColor extends WidgetStateColor { + final VoicesColorScheme colors; + + _IconColor({ + required this.colors, + }) : super( + colors.iconsForeground.toARGB32(), + ); + + @override + Color resolve(Set states) { + if (!states.contains(WidgetState.selected)) { + return colors.iconsForeground; + } + return colors.iconsBackground; + } +} diff --git a/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/utils/color_ext.dart b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/utils/color_ext.dart new file mode 100644 index 000000000000..a275799d23f2 --- /dev/null +++ b/catalyst_voices/packages/internal/catalyst_voices_brands/lib/src/utils/color_ext.dart @@ -0,0 +1,24 @@ +import 'dart:ui'; + +extension ColorExt on Color { + // TODO(damian-molinski): WidgetStateColor still uses argb32 int color. + // Delete this once its migrated by flutter team. + /// A 32 bit value representing this color. + /// + /// The bits are assigned as follows: + /// + /// * Bits 24-31 are the alpha value. + /// * Bits 16-23 are the red value. + /// * Bits 8-15 are the green value. + /// * Bits 0-7 are the blue value. + int toARGB32() { + return _floatToInt8(a) << 24 | + _floatToInt8(r) << 16 | + _floatToInt8(g) << 8 | + _floatToInt8(b) << 0; + } +} + +int _floatToInt8(double x) { + return (x * 255.0).round() & 0xff; +} diff --git a/catalyst_voices/packages/internal/catalyst_voices_brands/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_brands/pubspec.yaml index bcb08d712e83..195589c376b0 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_brands/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_brands/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_voices_assets: diff --git a/catalyst_voices/packages/internal/catalyst_voices_driver/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_driver/pubspec.yaml index 49e47f44cb46..c934136fb89e 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_driver/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_driver/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: equatable: ^2.0.7 diff --git a/catalyst_voices/packages/internal/catalyst_voices_localization/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_localization/pubspec.yaml index c92fabc3c657..61f925ecd4d0 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_localization/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_localization/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: flutter: diff --git a/catalyst_voices/packages/internal/catalyst_voices_models/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_models/pubspec.yaml index 6819fdab2598..709b9c7b4498 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_models/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_models/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: catalyst_cardano_web: ^0.4.0+4 catalyst_voices_shared: path: ../catalyst_voices_shared - collection: ^1.18.0 + collection: ^1.19.0 convert: ^3.1.1 equatable: ^2.0.7 # Flutter is added because tests are using @visibleForTesting and loggers which are flutter diff --git a/catalyst_voices/packages/internal/catalyst_voices_repositories/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_repositories/pubspec.yaml index 3a7092927434..082df882cc13 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_repositories/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_repositories/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano_serialization: ^0.5.0+4 @@ -17,7 +17,7 @@ dependencies: catalyst_voices_shared: path: ../catalyst_voices_shared chopper: ^8.0.3 - collection: ^1.18.0 + collection: ^1.19.0 equatable: ^2.0.7 flutter: sdk: flutter diff --git a/catalyst_voices/packages/internal/catalyst_voices_services/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_services/pubspec.yaml index c00abc0b45c8..96948236477a 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_services/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_services/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano: ^0.4.1 @@ -18,7 +18,7 @@ dependencies: path: ../catalyst_voices_repositories catalyst_voices_shared: path: ../catalyst_voices_shared - collection: ^1.18.0 + collection: ^1.19.0 flutter: sdk: flutter flutter_driver: diff --git a/catalyst_voices/packages/internal/catalyst_voices_shared/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_shared/pubspec.yaml index 21c729c6052e..c162a0818a80 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_shared/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_shared/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano_serialization: ^0.5.0+4 @@ -15,7 +15,7 @@ dependencies: catalyst_voices_models: path: ../catalyst_voices_models cbor: ^6.2.0 - collection: ^1.18.0 + collection: ^1.19.0 convert: ^3.1.1 cryptography: ^2.7.0 equatable: ^2.0.7 diff --git a/catalyst_voices/packages/internal/catalyst_voices_view_models/pubspec.yaml b/catalyst_voices/packages/internal/catalyst_voices_view_models/pubspec.yaml index 07ed8a17cb4b..2abcc89bc5ac 100644 --- a/catalyst_voices/packages/internal/catalyst_voices_view_models/pubspec.yaml +++ b/catalyst_voices/packages/internal/catalyst_voices_view_models/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano: ^0.4.1 diff --git a/catalyst_voices/packages/libs/README.md b/catalyst_voices/packages/libs/README.md index 41f0d73fe192..776baa0a2f37 100644 --- a/catalyst_voices/packages/libs/README.md +++ b/catalyst_voices/packages/libs/README.md @@ -26,7 +26,7 @@ A collection of Catalyst packages and plugins for Flutter and Dart. ## Requirements -* Flutter: 3.24.1+ +* Flutter: 3.27.3+ * Dart: 3.5.0+ * Xcode: 15.0+ * Android Studio: Android Studio Electric Eel | 2022.1.1 + diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/README.md b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/README.md index 14a9214b91b0..59eec56f3620 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/README.md +++ b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/README.md @@ -23,7 +23,7 @@ away all the complexities of using js_interop. ## Requirements * Dart: 3.5.0+ -* Flutter: 3.24.1+ +* Flutter: 3.27.3+ ## Install diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/pubspec.yaml index a92a9bdb49db..9702e6ada9e0 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/pubspec.yaml @@ -6,7 +6,7 @@ version: 1.0.0+1 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano: ^0.4.1 diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/pubspec.yaml index 10c58eed98f6..3f37cac5d37f 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.1 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" flutter: plugin: diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/Earthfile b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/Earthfile index 1e152d46f23a..d8d5820c8427 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/Earthfile +++ b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.31 AS flutter-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/playwright:v3.2.31 AS playwright-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.35 AS flutter-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/playwright:v3.2.35 AS playwright-ci deps: DO playwright-ci+SETUP --workdir=/wallet-automation diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml index 78f898c53722..96d254b4890e 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_platform_interface/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0+4 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano_serialization: ^0.5.0+4 diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_web/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_web/pubspec.yaml index 570cb331ddcc..76de75b6822a 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_web/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano_web/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0+4 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" flutter: plugin: diff --git a/catalyst_voices/packages/libs/catalyst_cardano_serialization/README.md b/catalyst_voices/packages/libs/catalyst_cardano_serialization/README.md index f30308ebdf2f..4c461eedc4cd 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano_serialization/README.md +++ b/catalyst_voices/packages/libs/catalyst_cardano_serialization/README.md @@ -24,7 +24,7 @@ and submission are outside of scope of this package. ## Requirements * Dart: 3.5.0+ -* Flutter: 3.24.1+ +* Flutter: 3.27.3+ ## Install diff --git a/catalyst_voices/packages/libs/catalyst_cardano_serialization/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_cardano_serialization/pubspec.yaml index cb2228587cab..783b5054373d 100644 --- a/catalyst_voices/packages/libs/catalyst_cardano_serialization/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_cardano_serialization/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.5.0+4 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: asn1lib: ^1.5.3 diff --git a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/README.md b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/README.md index d5c0683c0f44..87d70c2e7d2a 100644 --- a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/README.md +++ b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/README.md @@ -20,7 +20,7 @@ This package exposes a JS wrapper around Brotli and zstd compression/decompressi ## Requirements * Dart: 3.5.0+ -* Flutter: 3.24.1+ +* Flutter: 3.27.3+ ## Install diff --git a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/pubspec.yaml index 39cf094b26ac..9d3bc1b760c0 100644 --- a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" flutter: plugin: diff --git a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_platform_interface/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_platform_interface/pubspec.yaml index 73074879929b..48f4027fae0c 100644 --- a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_platform_interface/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_platform_interface/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: equatable: ^2.0.7 diff --git a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_web/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_web/pubspec.yaml index 306e2c278a74..15bb2132090b 100644 --- a/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_web/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_compression/catalyst_compression_web/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" flutter: plugin: diff --git a/catalyst_voices/packages/libs/catalyst_cose/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_cose/pubspec.yaml index 9286fc0dd4bb..c958ea707116 100644 --- a/catalyst_voices/packages/libs/catalyst_cose/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_cose/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: cbor: ^6.2.0 - collection: ^1.18.0 + collection: ^1.19.0 convert: ^3.1.1 cryptography: ^2.7.0 equatable: ^2.0.7 diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/Earthfile b/catalyst_voices/packages/libs/catalyst_key_derivation/Earthfile index 827f5b6b58ed..75477e18b9e3 100644 --- a/catalyst_voices/packages/libs/catalyst_key_derivation/Earthfile +++ b/catalyst_voices/packages/libs/catalyst_key_derivation/Earthfile @@ -1,7 +1,7 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.31 AS flutter-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter_rust_bridge:v3.2.31 AS flutter_rust_bridge +IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.35 AS flutter-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter_rust_bridge:v3.2.35 AS flutter_rust_bridge builder: FROM flutter_rust_bridge+builder diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/README.md b/catalyst_voices/packages/libs/catalyst_key_derivation/README.md index 2a5390b181cd..d457f770eaa2 100644 --- a/catalyst_voices/packages/libs/catalyst_key_derivation/README.md +++ b/catalyst_voices/packages/libs/catalyst_key_derivation/README.md @@ -28,7 +28,7 @@ via the [flutter_rust_bridge](https://pub.dev/packages/flutter_rust_bridge). ## Requirements * Dart: 3.5.0+ -* Flutter: 3.24.1+ +* Flutter: 3.27.3+ ## Install diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/cargokit/build_tool/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_key_derivation/cargokit/build_tool/pubspec.yaml index 83d9eb8f8b44..fde56ddfebcc 100644 --- a/catalyst_voices/packages/libs/catalyst_key_derivation/cargokit/build_tool/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_key_derivation/cargokit/build_tool/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: logging: ^1.2.0 path: ^1.9.0 version: 3.0.0 - collection: ^1.18.0 + collection: ^1.19.0 ed25519_edwards: 0.3.1 hex: 0.2.0 yaml: 3.1.2 diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/pubspec.yaml b/catalyst_voices/packages/libs/catalyst_key_derivation/pubspec.yaml index a0a1aa3ca6bd..d76c7250c698 100644 --- a/catalyst_voices/packages/libs/catalyst_key_derivation/pubspec.yaml +++ b/catalyst_voices/packages/libs/catalyst_key_derivation/pubspec.yaml @@ -7,11 +7,11 @@ version: 0.1.3 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: cbor: ^6.2.0 - collection: ^1.18.0 + collection: ^1.19.0 convert: ^3.1.1 cryptography: ^2.7.0 equatable: ^2.0.7 diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Earthfile b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Earthfile index 1e75c2a00ed8..76c297e14be7 100644 --- a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Earthfile +++ b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.31 AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.35 AS rust-ci IMPORT ../ AS flutter-rust-bridge # builder : Setup the builder diff --git a/catalyst_voices/utilities/poc_local_storage/pubspec.yaml b/catalyst_voices/utilities/poc_local_storage/pubspec.yaml index abcd8ba87823..2eed67abc155 100644 --- a/catalyst_voices/utilities/poc_local_storage/pubspec.yaml +++ b/catalyst_voices/utilities/poc_local_storage/pubspec.yaml @@ -6,10 +6,10 @@ version: 1.0.0+1 environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: - collection: ^1.18.0 + collection: ^1.19.0 file_picker: ^8.0.7 flutter: sdk: flutter diff --git a/catalyst_voices/utilities/remote_widgets/pubspec.yaml b/catalyst_voices/utilities/remote_widgets/pubspec.yaml index 8aa98d7e1b44..0d699447c204 100644 --- a/catalyst_voices/utilities/remote_widgets/pubspec.yaml +++ b/catalyst_voices/utilities/remote_widgets/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: flutter: diff --git a/catalyst_voices/utilities/uikit_example/Earthfile b/catalyst_voices/utilities/uikit_example/Earthfile index 8ddc602d9531..79a1aae1d082 100644 --- a/catalyst_voices/utilities/uikit_example/Earthfile +++ b/catalyst_voices/utilities/uikit_example/Earthfile @@ -1,7 +1,7 @@ VERSION 0.8 IMPORT ../../ AS catalyst-voices -IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.31 AS flutter-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.35 AS flutter-ci # local-build-web - build web version of UIKit example. # Prefixed by "local" to make sure it's not auto triggered, the target was diff --git a/catalyst_voices/utilities/uikit_example/lib/examples/voices_avatar_example.dart b/catalyst_voices/utilities/uikit_example/lib/examples/voices_avatar_example.dart index 4f3ae128b4ac..98b0339b2093 100644 --- a/catalyst_voices/utilities/uikit_example/lib/examples/voices_avatar_example.dart +++ b/catalyst_voices/utilities/uikit_example/lib/examples/voices_avatar_example.dart @@ -38,7 +38,9 @@ class VoicesAvatarExample extends StatelessWidget { icon: VoicesAssets.icons.lightBulb.buildIcon(), foregroundColor: Theme.of(context).colors.iconsSecondary, backgroundColor: - Theme.of(context).colors.iconsSecondary.withOpacity(0.16), + Theme.of(context).colors.iconsSecondary.withValues( + alpha: 0.16, + ), ), VoicesAvatar( icon: Image.asset(UiKitAssets.images.robotAvatar.path), diff --git a/catalyst_voices/utilities/uikit_example/pubspec.yaml b/catalyst_voices/utilities/uikit_example/pubspec.yaml index 710b729666da..6f9e78b9e92b 100644 --- a/catalyst_voices/utilities/uikit_example/pubspec.yaml +++ b/catalyst_voices/utilities/uikit_example/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" environment: sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.24.1" + flutter: ">=3.27.3" dependencies: catalyst_cardano_serialization: ^0.5.0+4 @@ -24,7 +24,7 @@ dependencies: path: ../../packages/internal/catalyst_voices_shared catalyst_voices_view_models: path: ../../packages/internal/catalyst_voices_view_models - collection: ^1.18.0 + collection: ^1.19.0 cupertino_icons: ^1.0.6 flutter: sdk: flutter diff --git a/docs/Earthfile b/docs/Earthfile index 3106cf05c894..f21cae925348 100644 --- a/docs/Earthfile +++ b/docs/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.31 AS docs-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.35 AS docs-ci IMPORT .. AS repo IMPORT ../catalyst-gateway AS catalyst-gateway diff --git a/utilities/docs-preview/Earthfile b/utilities/docs-preview/Earthfile index 41e72fd130d8..36f96e2e1529 100644 --- a/utilities/docs-preview/Earthfile +++ b/utilities/docs-preview/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.31 AS docs-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.35 AS docs-ci # update-docs-dev-script: get the latest docs dev script from CI.