From a6640a79503adacf28187dab85d25d8e632a15ef Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 21 Aug 2024 12:22:20 +0300 Subject: [PATCH] feat: Upgrade Flutter to 3.24.0 --- lib/theming/app_theme_factory.dart | 45 +- .../components/buttons/sp_brand_button.dart | 2 +- lib/ui/components/cards/filled_card.dart | 2 +- lib/ui/components/info_box/info_box.dart | 4 +- .../components/jobs_content/jobs_content.dart | 23 +- .../jobs_content/server_job_card.dart | 3 +- .../components/progress_bar/progress_bar.dart | 4 +- .../server_storage_list_item.dart | 4 +- .../service_migration_list_item.dart | 2 +- ...service_storage_consumption_list_item.dart | 3 +- lib/ui/helpers/empty_page_placeholder.dart | 6 +- lib/ui/layouts/brand_hero_screen.dart | 6 +- lib/ui/pages/backups/backup_details.dart | 4 +- lib/ui/pages/backups/backups_list.dart | 2 +- .../backups/copy_encryption_key_modal.dart | 5 +- .../pages/backups/create_backups_modal.dart | 2 +- lib/ui/pages/devices/new_device.dart | 2 +- lib/ui/pages/dns_details/dns_details.dart | 4 +- lib/ui/pages/recovery_key/recovery_key.dart | 6 +- .../memory_usage_by_service_screen.dart | 2 +- .../pages/server_storage/server_storage.dart | 5 +- lib/ui/pages/services/service_page.dart | 16 +- .../pages/services/service_settings_page.dart | 4 +- .../setup/initializing/domain_picker.dart | 2 +- lib/ui/pages/users/user.dart | 2 +- lib/ui/pages/users/user_details.dart | 2 +- lib/ui/router/router.dart | 2 +- lib/ui/router/router.gr.dart | 488 ++++++++---------- macos/Flutter/GeneratedPluginRegistrant.swift | 4 +- pubspec.lock | 317 ++++++------ pubspec.yaml | 36 +- 31 files changed, 515 insertions(+), 494 deletions(-) diff --git a/lib/theming/app_theme_factory.dart b/lib/theming/app_theme_factory.dart index 096dd35a..414fd16d 100644 --- a/lib/theming/app_theme_factory.dart +++ b/lib/theming/app_theme_factory.dart @@ -41,7 +41,6 @@ abstract class AppThemeFactory { brightness: colorScheme.brightness, typography: appTypography, useMaterial3: true, - scaffoldBackgroundColor: colorScheme.background, listTileTheme: ListTileThemeData( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12), @@ -52,12 +51,48 @@ abstract class AppThemeFactory { return materialThemeData; } - static Future _getDynamicColors(final Brightness brightness) { + static Future _getDynamicColors( + final Brightness brightness) async { + List extractAdditionalColours(final ColorScheme scheme) => [ + scheme.surface, + scheme.surfaceDim, + scheme.surfaceBright, + scheme.surfaceContainerLowest, + scheme.surfaceContainerLow, + scheme.surfaceContainer, + scheme.surfaceContainerHigh, + scheme.surfaceContainerHighest, + ]; + + ColorScheme insertAdditionalColours( + final ColorScheme scheme, final List additionalColours) => + scheme.copyWith( + surface: additionalColours[0], + surfaceDim: additionalColours[1], + surfaceBright: additionalColours[2], + surfaceContainerLowest: additionalColours[3], + surfaceContainerLow: additionalColours[4], + surfaceContainer: additionalColours[5], + surfaceContainerHigh: additionalColours[6], + surfaceContainerHighest: additionalColours[7], + ); + try { - return DynamicColorPlugin.getCorePalette().then( - (final corePallete) => - corePallete?.toColorScheme(brightness: brightness), + final ColorScheme? colorScheme = + await DynamicColorPlugin.getCorePalette().then( + (final corePalette) => + corePalette?.toColorScheme(brightness: brightness), ); + if (colorScheme == null) { + return Future.value(null); + } + // Workaround as dynamic_color doesn't add new color roles + final fromSeed = ColorScheme.fromSeed( + seedColor: colorScheme.primary, brightness: brightness); + final additionalColours = extractAdditionalColours(fromSeed); + final updatedColorScheme = + insertAdditionalColours(colorScheme, additionalColours); + return Future.value(updatedColorScheme); } on PlatformException { return Future.value(null); } diff --git a/lib/ui/components/buttons/sp_brand_button.dart b/lib/ui/components/buttons/sp_brand_button.dart index 036b30f2..948ee505 100644 --- a/lib/ui/components/buttons/sp_brand_button.dart +++ b/lib/ui/components/buttons/sp_brand_button.dart @@ -20,7 +20,7 @@ class SPBrandButton extends StatelessWidget { Widget build(final BuildContext context) => FilledButton( // TODO(misterfourtytwo): move button styles to theme configuration style: const ButtonStyle( - minimumSize: MaterialStatePropertyAll(Size.fromHeight(48)), + minimumSize: WidgetStatePropertyAll(Size.fromHeight(48)), ), onPressed: onPressed, child: child, diff --git a/lib/ui/components/cards/filled_card.dart b/lib/ui/components/cards/filled_card.dart index 5122b95e..a3cbbe78 100644 --- a/lib/ui/components/cards/filled_card.dart +++ b/lib/ui/components/cards/filled_card.dart @@ -30,7 +30,7 @@ class FilledCard extends StatelessWidget { ? Theme.of(context).colorScheme.secondaryContainer : tertiary ? Theme.of(context).colorScheme.tertiaryContainer - : Theme.of(context).colorScheme.surfaceVariant, + : Theme.of(context).colorScheme.surfaceContainerHigh, semanticContainer: mergeSemantics, child: child, ); diff --git a/lib/ui/components/info_box/info_box.dart b/lib/ui/components/info_box/info_box.dart index 6b77de9d..07851c55 100644 --- a/lib/ui/components/info_box/info_box.dart +++ b/lib/ui/components/info_box/info_box.dart @@ -19,12 +19,12 @@ class InfoBox extends StatelessWidget { Icon( isWarning ? Icons.warning_amber_outlined : Icons.info_outline, size: 24, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), Text( text, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), ], diff --git a/lib/ui/components/jobs_content/jobs_content.dart b/lib/ui/components/jobs_content/jobs_content.dart index d24e1c27..181de159 100644 --- a/lib/ui/components/jobs_content/jobs_content.dart +++ b/lib/ui/components/jobs_content/jobs_content.dart @@ -110,7 +110,8 @@ class JobsContent extends StatelessWidget { ), Expanded( child: Card( - color: Theme.of(context).colorScheme.surfaceVariant, + color: + Theme.of(context).colorScheme.surfaceContainerHighest, child: Padding( padding: const EdgeInsets.symmetric( horizontal: 15, @@ -163,7 +164,9 @@ class JobsContent extends StatelessWidget { ), Expanded( child: Card( - color: Theme.of(context).colorScheme.surfaceVariant, + color: Theme.of(context) + .colorScheme + .surfaceContainerHighest, child: Padding( padding: const EdgeInsets.symmetric( horizontal: 15, @@ -203,7 +206,7 @@ class JobsContent extends StatelessWidget { ), backgroundColor: Theme.of(context) .colorScheme - .surfaceVariant, + .surfaceContainerHighest, minHeight: 7.0, borderRadius: BorderRadius.circular(7.0), ), @@ -243,7 +246,8 @@ class JobsContent extends StatelessWidget { ), Expanded( child: Card( - color: Theme.of(context).colorScheme.surfaceVariant, + color: + Theme.of(context).colorScheme.surfaceContainerHighest, child: Padding( padding: const EdgeInsets.symmetric( horizontal: 15, @@ -299,7 +303,9 @@ class JobsContent extends StatelessWidget { ), Expanded( child: Card( - color: Theme.of(context).colorScheme.surfaceVariant, + color: Theme.of(context) + .colorScheme + .surfaceContainerHighest, child: Padding( padding: const EdgeInsets.symmetric( horizontal: 15, @@ -336,7 +342,7 @@ class JobsContent extends StatelessWidget { ), backgroundColor: Theme.of(context) .colorScheme - .surfaceVariant, + .surfaceContainerHighest, minHeight: 7.0, borderRadius: BorderRadius.circular(7.0), ), @@ -374,7 +380,8 @@ class JobsContent extends StatelessWidget { children: [ Expanded( child: Card( - color: Theme.of(context).colorScheme.surfaceVariant, + color: + Theme.of(context).colorScheme.surfaceContainerHighest, child: Padding( padding: const EdgeInsets.symmetric( horizontal: 15, @@ -466,7 +473,7 @@ class JobsContent extends StatelessWidget { .add(RemoveAllFinishedJobs()) : null, icon: const Icon(Icons.clear_all), - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ], ), diff --git a/lib/ui/components/jobs_content/server_job_card.dart b/lib/ui/components/jobs_content/server_job_card.dart index a772e3c6..b7904351 100644 --- a/lib/ui/components/jobs_content/server_job_card.dart +++ b/lib/ui/components/jobs_content/server_job_card.dart @@ -75,7 +75,8 @@ class ServerJobCard extends StatelessWidget { ? 0.0 : serverJob.progress! / 100.0, color: color, - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, + backgroundColor: + Theme.of(context).colorScheme.surfaceContainerHighest, height: 7.0, ), const SizedBox(height: 8), diff --git a/lib/ui/components/progress_bar/progress_bar.dart b/lib/ui/components/progress_bar/progress_bar.dart index 344ee2ab..2254ee02 100644 --- a/lib/ui/components/progress_bar/progress_bar.dart +++ b/lib/ui/components/progress_bar/progress_bar.dart @@ -27,7 +27,7 @@ class _ProgressBarState extends State { Container( alignment: Alignment.centerLeft, decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, + color: Theme.of(context).colorScheme.secondaryContainer, borderRadius: BorderRadius.circular(5), ), child: LayoutBuilder( @@ -36,7 +36,7 @@ class _ProgressBarState extends State { height: 5, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5), - color: Theme.of(context).colorScheme.surfaceVariant, + color: Theme.of(context).colorScheme.secondaryContainer, gradient: LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/ui/components/storage_list_items/server_storage_list_item.dart b/lib/ui/components/storage_list_items/server_storage_list_item.dart index cfc98e75..e799fda6 100644 --- a/lib/ui/components/storage_list_items/server_storage_list_item.dart +++ b/lib/ui/components/storage_list_items/server_storage_list_item.dart @@ -32,12 +32,12 @@ class ServerStorageListItem extends StatelessWidget { color: volume.root ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.secondary, - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, + backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest, percentage: volume.percentage, icon: Icon( Icons.storage_outlined, size: 24, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ); } diff --git a/lib/ui/components/storage_list_items/service_migration_list_item.dart b/lib/ui/components/storage_list_items/service_migration_list_item.dart index 3b1bfc0a..66ce58c8 100644 --- a/lib/ui/components/storage_list_items/service_migration_list_item.dart +++ b/lib/ui/components/storage_list_items/service_migration_list_item.dart @@ -73,7 +73,7 @@ class ServiceConsumptionTitle extends StatelessWidget { width: 24.0, height: 24.0, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/ui/components/storage_list_items/service_storage_consumption_list_item.dart b/lib/ui/components/storage_list_items/service_storage_consumption_list_item.dart index ffdb4e34..2ef45e96 100644 --- a/lib/ui/components/storage_list_items/service_storage_consumption_list_item.dart +++ b/lib/ui/components/storage_list_items/service_storage_consumption_list_item.dart @@ -44,7 +44,8 @@ class ServiceStorageConsumptionListItem extends StatelessWidget { BrandLinearIndicator( value: percentage, color: color, - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, + backgroundColor: + Theme.of(context).colorScheme.surfaceContainerHighest, height: 7.0, ), ], diff --git a/lib/ui/helpers/empty_page_placeholder.dart b/lib/ui/helpers/empty_page_placeholder.dart index 10ba21cf..725192e1 100644 --- a/lib/ui/helpers/empty_page_placeholder.dart +++ b/lib/ui/helpers/empty_page_placeholder.dart @@ -66,13 +66,13 @@ class _ContentWidget extends StatelessWidget { Icon( iconData, size: 50, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), const Gap(16), Text( title, style: Theme.of(context).textTheme.headlineMedium?.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), textAlign: TextAlign.center, ), @@ -82,7 +82,7 @@ class _ContentWidget extends StatelessWidget { description!, textAlign: TextAlign.center, style: Theme.of(context).textTheme.titleSmall?.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), ], diff --git a/lib/ui/layouts/brand_hero_screen.dart b/lib/ui/layouts/brand_hero_screen.dart index 638ec2be..78490e52 100644 --- a/lib/ui/layouts/brand_hero_screen.dart +++ b/lib/ui/layouts/brand_hero_screen.dart @@ -49,7 +49,7 @@ class BrandHeroScreen extends StatelessWidget { Icon( heroIcon ?? Icons.help, size: 48.0, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ); final bool hasHeroIcon = heroIcon != null || this.heroIconWidget != null; @@ -78,7 +78,7 @@ class BrandHeroScreen extends StatelessWidget { Text( heroSubtitle!, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), textAlign: hasHeroIcon ? TextAlign.center : TextAlign.start, ), @@ -152,7 +152,7 @@ class _HeroSliverAppBarState extends State { isJobsListEmpty ? Ionicons.flash_outline : Ionicons.flash, ), color: isJobsListEmpty - ? Theme.of(context).colorScheme.onBackground + ? Theme.of(context).colorScheme.onSurface : Theme.of(context).colorScheme.primary, tooltip: 'jobs.title'.tr(), ), diff --git a/lib/ui/pages/backups/backup_details.dart b/lib/ui/pages/backups/backup_details.dart index af28e68b..8e945dd7 100644 --- a/lib/ui/pages/backups/backup_details.dart +++ b/lib/ui/pages/backups/backup_details.dart @@ -373,9 +373,7 @@ class BackupDetailsPage extends StatelessWidget { width: 24, colorFilter: ColorFilter.mode( overrideColor ?? - Theme.of(context) - .colorScheme - .onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ) diff --git a/lib/ui/pages/backups/backups_list.dart b/lib/ui/pages/backups/backups_list.dart index 20843ef4..e37a41a5 100644 --- a/lib/ui/pages/backups/backups_list.dart +++ b/lib/ui/pages/backups/backups_list.dart @@ -92,7 +92,7 @@ class BackupsListPage extends StatelessWidget { height: 24, width: 24, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ) diff --git a/lib/ui/pages/backups/copy_encryption_key_modal.dart b/lib/ui/pages/backups/copy_encryption_key_modal.dart index c53b46e7..8a3a7076 100644 --- a/lib/ui/pages/backups/copy_encryption_key_modal.dart +++ b/lib/ui/pages/backups/copy_encryption_key_modal.dart @@ -74,7 +74,7 @@ class _CopyEncryptionKeyModalState extends State { Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(20), - color: Theme.of(context).colorScheme.surfaceVariant, + color: Theme.of(context).colorScheme.surfaceContainerHighest, ), padding: const EdgeInsets.all(16), child: Stack( @@ -98,7 +98,8 @@ class _CopyEncryptionKeyModalState extends State { duration: const Duration(milliseconds: 200), opacity: isKeyVisible ? 0 : 1, child: Container( - color: Theme.of(context).colorScheme.surfaceVariant, + color: + Theme.of(context).colorScheme.surfaceContainerHighest, child: Row( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/ui/pages/backups/create_backups_modal.dart b/lib/ui/pages/backups/create_backups_modal.dart index 455976a7..d9fa3982 100644 --- a/lib/ui/pages/backups/create_backups_modal.dart +++ b/lib/ui/pages/backups/create_backups_modal.dart @@ -157,7 +157,7 @@ class _CreateBackupsModalState extends State { colorFilter: ColorFilter.mode( busy ? Theme.of(context).colorScheme.outlineVariant - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/ui/pages/devices/new_device.dart b/lib/ui/pages/devices/new_device.dart index 78b69f04..282851ac 100644 --- a/lib/ui/pages/devices/new_device.dart +++ b/lib/ui/pages/devices/new_device.dart @@ -64,7 +64,7 @@ class _KeyDisplay extends StatelessWidget { children: [ Icon( Icons.info_outline, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), const SizedBox(height: 16), Text( diff --git a/lib/ui/pages/dns_details/dns_details.dart b/lib/ui/pages/dns_details/dns_details.dart index 04640732..5efc329e 100644 --- a/lib/ui/pages/dns_details/dns_details.dart +++ b/lib/ui/pages/dns_details/dns_details.dart @@ -102,9 +102,9 @@ class _DnsDetailsPageState extends State { ); } - final Color goodColor = Theme.of(context).colorScheme.onBackground; + final Color goodColor = Theme.of(context).colorScheme.onSurface; final Color errorColor = Theme.of(context).colorScheme.error; - final Color neutralColor = Theme.of(context).colorScheme.onBackground; + final Color neutralColor = Theme.of(context).colorScheme.onSurface; return BrandHeroScreen( hasBackButton: true, diff --git a/lib/ui/pages/recovery_key/recovery_key.dart b/lib/ui/pages/recovery_key/recovery_key.dart index d5bd7a15..e04c0f38 100644 --- a/lib/ui/pages/recovery_key/recovery_key.dart +++ b/lib/ui/pages/recovery_key/recovery_key.dart @@ -145,7 +145,7 @@ class RecoveryKeyStatusCard extends StatelessWidget { color: Theme.of(context).colorScheme.onErrorContainer, ), tileColor: isValid - ? Theme.of(context).colorScheme.surfaceVariant + ? Theme.of(context).colorScheme.surfaceContainerHighest : Theme.of(context).colorScheme.errorContainer, ), ); @@ -175,7 +175,7 @@ class RecoveryKeyInformation extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium!.copyWith( color: state.isInvalidBecauseExpired ? Theme.of(context).colorScheme.error - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), ), ), @@ -189,7 +189,7 @@ class RecoveryKeyInformation extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium!.copyWith( color: state.isInvalidBecauseUsed ? Theme.of(context).colorScheme.error - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), ), ), diff --git a/lib/ui/pages/server_details/memory_usage_by_service_screen.dart b/lib/ui/pages/server_details/memory_usage_by_service_screen.dart index 792e14d8..963194ee 100644 --- a/lib/ui/pages/server_details/memory_usage_by_service_screen.dart +++ b/lib/ui/pages/server_details/memory_usage_by_service_screen.dart @@ -95,7 +95,7 @@ class _MemoryUsageByServiceContents extends StatelessWidget { width: 22.0, height: 24.0, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ) diff --git a/lib/ui/pages/server_storage/server_storage.dart b/lib/ui/pages/server_storage/server_storage.dart index d8bd5972..8e6fec80 100644 --- a/lib/ui/pages/server_storage/server_storage.dart +++ b/lib/ui/pages/server_storage/server_storage.dart @@ -162,7 +162,7 @@ class ServerConsumptionListTile extends StatelessWidget { width: 22.0, height: 24.0, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), @@ -171,7 +171,8 @@ class ServerConsumptionListTile extends StatelessWidget { color: volume.root ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.secondary, - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, + backgroundColor: + Theme.of(context).colorScheme.surfaceContainerHighest, dense: true, ), ), diff --git a/lib/ui/pages/services/service_page.dart b/lib/ui/pages/services/service_page.dart index 2bb40588..3eb7955f 100644 --- a/lib/ui/pages/services/service_page.dart +++ b/lib/ui/pages/services/service_page.dart @@ -65,7 +65,7 @@ class _ServicePageState extends State { width: 48.0, height: 48.0, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), @@ -75,7 +75,7 @@ class _ServicePageState extends State { const SizedBox(height: 16), if (service.url != null && !serviceDisabled) ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, onTap: () => launchURL(service.url), onLongPress: () { PlatformAdapter.setClipboard(service.url!); @@ -96,7 +96,7 @@ class _ServicePageState extends State { const Divider(), const SizedBox(height: 8), ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, onTap: () => context.read().add(ServiceRestart(service)), leading: const Icon(Icons.restart_alt_outlined), @@ -108,7 +108,7 @@ class _ServicePageState extends State { ), if (!service.isRequired) ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, onTap: () => context.read().addJob( ServiceToggleJob( service: service, @@ -126,7 +126,7 @@ class _ServicePageState extends State { ), if (service.configuration.isNotEmpty) ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, onTap: () => context.pushRoute( ServiceSettingsRoute(serviceId: service.id), ), @@ -138,7 +138,7 @@ class _ServicePageState extends State { ), if (service.isMovable) ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, // Open page ServicesMigrationPage onTap: () => context.pushRoute( ServicesMigrationRoute( @@ -172,7 +172,7 @@ class _ServicePageState extends State { ), if (service.canBeBackedUp) ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, // Open page ServicesMigrationPage onTap: () => context.pushRoute( BackupsListRoute(service: service), @@ -184,7 +184,7 @@ class _ServicePageState extends State { ), ), ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, onTap: () => context.pushRoute( ServerLogsRoute(serviceId: service.id), ), diff --git a/lib/ui/pages/services/service_settings_page.dart b/lib/ui/pages/services/service_settings_page.dart index 400cc9ce..d64add5e 100644 --- a/lib/ui/pages/services/service_settings_page.dart +++ b/lib/ui/pages/services/service_settings_page.dart @@ -164,7 +164,7 @@ class _ServiceSettingsPageState extends State { width: 48.0, height: 48.0, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), @@ -197,7 +197,7 @@ class _ServiceSettingsPageState extends State { width: 48.0, height: 48.0, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/ui/pages/setup/initializing/domain_picker.dart b/lib/ui/pages/setup/initializing/domain_picker.dart index cb845a58..719e3bfe 100644 --- a/lib/ui/pages/setup/initializing/domain_picker.dart +++ b/lib/ui/pages/setup/initializing/domain_picker.dart @@ -126,7 +126,7 @@ class _DomainPickerState extends State { child: Text( state.domain, style: Theme.of(context).textTheme.headlineMedium?.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, diff --git a/lib/ui/pages/users/user.dart b/lib/ui/pages/users/user.dart index 9a90857b..6c1658c6 100644 --- a/lib/ui/pages/users/user.dart +++ b/lib/ui/pages/users/user.dart @@ -31,7 +31,7 @@ class _User extends StatelessWidget { child: Text( user.login, style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, decoration: isPrimaryUser ? TextDecoration.underline : user.isFoundOnServer diff --git a/lib/ui/pages/users/user_details.dart b/lib/ui/pages/users/user_details.dart index 43211ba9..f5f0b300 100644 --- a/lib/ui/pages/users/user_details.dart +++ b/lib/ui/pages/users/user_details.dart @@ -45,7 +45,7 @@ class UserDetailsPage extends StatelessWidget { _SshKeysCard(user: user), const SizedBox(height: 8), ListTile( - iconColor: Theme.of(context).colorScheme.onBackground, + iconColor: Theme.of(context).colorScheme.onSurface, onTap: () => showModalBottomSheet( context: context, isScrollControlled: true, diff --git a/lib/ui/router/router.dart b/lib/ui/router/router.dart index 987b080f..31d4c097 100644 --- a/lib/ui/router/router.dart +++ b/lib/ui/router/router.dart @@ -53,7 +53,7 @@ Widget fadeThroughTransition( // transitionsBuilder: fadeThroughTransition, replaceInRouteName: 'Page|Screen|Routing,Route', ) -class RootRouter extends _$RootRouter { +class RootRouter extends RootStackRouter { RootRouter(final GlobalKey navigatorKey) : super(navigatorKey: navigatorKey); diff --git a/lib/ui/router/router.gr.dart b/lib/ui/router/router.gr.dart index 76161cbe..e858ad8d 100644 --- a/lib/ui/router/router.gr.dart +++ b/lib/ui/router/router.gr.dart @@ -9,235 +9,6 @@ part of 'router.dart'; -abstract class _$RootRouter extends RootStackRouter { - // ignore: unused_element - _$RootRouter({super.navigatorKey}); - - @override - final Map pagesMap = { - AboutApplicationRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const AboutApplicationPage(), - ); - }, - AddServerProviderTokenRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: AddServerProviderTokenPage( - server: args.server, - key: args.key, - ), - ); - }, - AppSettingsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const AppSettingsPage(), - ); - }, - BackupDetailsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const BackupDetailsPage(), - ); - }, - BackupsListRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: BackupsListPage( - service: args.service, - key: args.key, - ), - ); - }, - ConsoleRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const ConsolePage(), - ); - }, - DeveloperSettingsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const DeveloperSettingsPage(), - ); - }, - DevicesRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const DevicesScreen(), - ); - }, - DnsDetailsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const DnsDetailsPage(), - ); - }, - ExtendingVolumeRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: ExtendingVolumePage( - diskVolumeToResize: args.diskVolumeToResize, - diskStatus: args.diskStatus, - key: args.key, - ), - ); - }, - InitializingRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const InitializingPage(), - ); - }, - MemoryUsageByServiceRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const MemoryUsageByServiceScreen(), - ); - }, - MoreRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const MorePage(), - ); - }, - NewUserRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const NewUserPage(), - ); - }, - OnboardingRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const OnboardingPage(), - ); - }, - ProvidersRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const ProvidersPage(), - ); - }, - RecoveryKeyRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const RecoveryKeyPage(), - ); - }, - RecoveryRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const RecoveryRouting(), - ); - }, - RootRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: WrappedRoute(child: const RootPage()), - ); - }, - ServerDetailsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const ServerDetailsScreen(), - ); - }, - ServerLogsRoute.name: (routeData) { - final args = routeData.argsAs( - orElse: () => const ServerLogsRouteArgs()); - return AutoRoutePage( - routeData: routeData, - child: ServerLogsScreen( - serviceId: args.serviceId, - key: args.key, - ), - ); - }, - ServerSettingsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const ServerSettingsScreen(), - ); - }, - ServerStorageRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: ServerStoragePage( - diskStatus: args.diskStatus, - key: args.key, - ), - ); - }, - ServiceRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: ServicePage( - serviceId: args.serviceId, - key: args.key, - ), - ); - }, - ServiceSettingsRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: ServiceSettingsPage( - serviceId: args.serviceId, - key: args.key, - ), - ); - }, - ServicesMigrationRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: ServicesMigrationPage( - services: args.services, - diskStatus: args.diskStatus, - isMigration: args.isMigration, - key: args.key, - ), - ); - }, - ServicesRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const ServicesPage(), - ); - }, - TokensRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const TokensPage(), - ); - }, - UserDetailsRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: UserDetailsPage( - login: args.login, - key: args.key, - ), - ); - }, - UsersRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const UsersPage(), - ); - }, - }; -} - /// generated route for /// [AboutApplicationPage] class AboutApplicationRoute extends PageRouteInfo { @@ -249,7 +20,12 @@ class AboutApplicationRoute extends PageRouteInfo { static const String name = 'AboutApplicationRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const AboutApplicationPage(); + }, + ); } /// generated route for @@ -271,8 +47,16 @@ class AddServerProviderTokenRoute static const String name = 'AddServerProviderTokenRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return AddServerProviderTokenPage( + server: args.server, + key: args.key, + ); + }, + ); } class AddServerProviderTokenRouteArgs { @@ -302,7 +86,12 @@ class AppSettingsRoute extends PageRouteInfo { static const String name = 'AppSettingsRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const AppSettingsPage(); + }, + ); } /// generated route for @@ -316,7 +105,12 @@ class BackupDetailsRoute extends PageRouteInfo { static const String name = 'BackupDetailsRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const BackupDetailsPage(); + }, + ); } /// generated route for @@ -337,8 +131,16 @@ class BackupsListRoute extends PageRouteInfo { static const String name = 'BackupsListRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return BackupsListPage( + service: args.service, + key: args.key, + ); + }, + ); } class BackupsListRouteArgs { @@ -368,7 +170,12 @@ class ConsoleRoute extends PageRouteInfo { static const String name = 'ConsoleRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const ConsolePage(); + }, + ); } /// generated route for @@ -382,7 +189,12 @@ class DeveloperSettingsRoute extends PageRouteInfo { static const String name = 'DeveloperSettingsRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const DeveloperSettingsPage(); + }, + ); } /// generated route for @@ -396,7 +208,12 @@ class DevicesRoute extends PageRouteInfo { static const String name = 'DevicesRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const DevicesScreen(); + }, + ); } /// generated route for @@ -410,7 +227,12 @@ class DnsDetailsRoute extends PageRouteInfo { static const String name = 'DnsDetailsRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const DnsDetailsPage(); + }, + ); } /// generated route for @@ -433,8 +255,17 @@ class ExtendingVolumeRoute extends PageRouteInfo { static const String name = 'ExtendingVolumeRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return ExtendingVolumePage( + diskVolumeToResize: args.diskVolumeToResize, + diskStatus: args.diskStatus, + key: args.key, + ); + }, + ); } class ExtendingVolumeRouteArgs { @@ -467,7 +298,12 @@ class InitializingRoute extends PageRouteInfo { static const String name = 'InitializingRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const InitializingPage(); + }, + ); } /// generated route for @@ -481,7 +317,12 @@ class MemoryUsageByServiceRoute extends PageRouteInfo { static const String name = 'MemoryUsageByServiceRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const MemoryUsageByServiceScreen(); + }, + ); } /// generated route for @@ -495,7 +336,12 @@ class MoreRoute extends PageRouteInfo { static const String name = 'MoreRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const MorePage(); + }, + ); } /// generated route for @@ -509,7 +355,12 @@ class NewUserRoute extends PageRouteInfo { static const String name = 'NewUserRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const NewUserPage(); + }, + ); } /// generated route for @@ -523,7 +374,12 @@ class OnboardingRoute extends PageRouteInfo { static const String name = 'OnboardingRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const OnboardingPage(); + }, + ); } /// generated route for @@ -537,7 +393,12 @@ class ProvidersRoute extends PageRouteInfo { static const String name = 'ProvidersRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const ProvidersPage(); + }, + ); } /// generated route for @@ -551,7 +412,12 @@ class RecoveryKeyRoute extends PageRouteInfo { static const String name = 'RecoveryKeyRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const RecoveryKeyPage(); + }, + ); } /// generated route for @@ -565,7 +431,12 @@ class RecoveryRoute extends PageRouteInfo { static const String name = 'RecoveryRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const RecoveryRouting(); + }, + ); } /// generated route for @@ -579,7 +450,12 @@ class RootRoute extends PageRouteInfo { static const String name = 'RootRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return WrappedRoute(child: const RootPage()); + }, + ); } /// generated route for @@ -593,7 +469,12 @@ class ServerDetailsRoute extends PageRouteInfo { static const String name = 'ServerDetailsRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const ServerDetailsScreen(); + }, + ); } /// generated route for @@ -614,8 +495,17 @@ class ServerLogsRoute extends PageRouteInfo { static const String name = 'ServerLogsRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs( + orElse: () => const ServerLogsRouteArgs()); + return ServerLogsScreen( + serviceId: args.serviceId, + key: args.key, + ); + }, + ); } class ServerLogsRouteArgs { @@ -645,7 +535,12 @@ class ServerSettingsRoute extends PageRouteInfo { static const String name = 'ServerSettingsRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const ServerSettingsScreen(); + }, + ); } /// generated route for @@ -666,8 +561,16 @@ class ServerStorageRoute extends PageRouteInfo { static const String name = 'ServerStorageRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return ServerStoragePage( + diskStatus: args.diskStatus, + key: args.key, + ); + }, + ); } class ServerStorageRouteArgs { @@ -704,8 +607,16 @@ class ServiceRoute extends PageRouteInfo { static const String name = 'ServiceRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return ServicePage( + serviceId: args.serviceId, + key: args.key, + ); + }, + ); } class ServiceRouteArgs { @@ -742,8 +653,16 @@ class ServiceSettingsRoute extends PageRouteInfo { static const String name = 'ServiceSettingsRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return ServiceSettingsPage( + serviceId: args.serviceId, + key: args.key, + ); + }, + ); } class ServiceSettingsRouteArgs { @@ -784,8 +703,18 @@ class ServicesMigrationRoute extends PageRouteInfo { static const String name = 'ServicesMigrationRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return ServicesMigrationPage( + services: args.services, + diskStatus: args.diskStatus, + isMigration: args.isMigration, + key: args.key, + ); + }, + ); } class ServicesMigrationRouteArgs { @@ -821,7 +750,12 @@ class ServicesRoute extends PageRouteInfo { static const String name = 'ServicesRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const ServicesPage(); + }, + ); } /// generated route for @@ -835,7 +769,12 @@ class TokensRoute extends PageRouteInfo { static const String name = 'TokensRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const TokensPage(); + }, + ); } /// generated route for @@ -856,8 +795,16 @@ class UserDetailsRoute extends PageRouteInfo { static const String name = 'UserDetailsRoute'; - static const PageInfo page = - PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = data.argsAs(); + return UserDetailsPage( + login: args.login, + key: args.key, + ); + }, + ); } class UserDetailsRouteArgs { @@ -887,5 +834,10 @@ class UsersRoute extends PageRouteInfo { static const String name = 'UsersRoute'; - static const PageInfo page = PageInfo(name); + static PageInfo page = PageInfo( + name, + builder: (data) { + return const UsersPage(); + }, + ); } diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index d831f93f..6bc4b68b 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,16 +9,18 @@ import connectivity_plus import device_info_plus import dynamic_color import flutter_secure_storage_macos +import local_auth_darwin import package_info_plus import path_provider_foundation import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) + FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 0ca9c299..b2a1c0c6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" animations: dependency: "direct main" description: @@ -29,10 +34,10 @@ packages: dependency: transitive description: name: archive - sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265 + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.5.1" + version: "3.6.1" args: dependency: transitive description: @@ -53,18 +58,18 @@ packages: dependency: "direct main" description: name: auto_route - sha256: "6cad3f408863ffff2b5757967c802b18415dac4acb1b40c5cdd45d0a26e5080f" + sha256: b83e8ce46da7228cdd019b5a11205454847f0a971bca59a7529b98df9876889b url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "9.2.2" auto_route_generator: dependency: "direct dev" description: name: auto_route_generator - sha256: ba28133d3a3bf0a66772bcc98dade5843753cd9f1a8fb4802b842895515b67d3 + sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.0.0" auto_size_text: dependency: "direct main" description: @@ -117,10 +122,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -133,18 +138,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.12" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.3.2" built_collection: dependency: transitive description: @@ -213,18 +218,18 @@ packages: dependency: transitive description: name: connectivity_plus - sha256: "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0" + sha256: "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "6.0.5" connectivity_plus_platform_interface: dependency: transitive description: name: connectivity_plus_platform_interface - sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a + sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204" url: "https://pub.dev" source: hosted - version: "1.2.4" + version: "2.0.1" convert: dependency: transitive description: @@ -245,18 +250,18 @@ packages: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" cubit_form: dependency: "direct main" description: name: cubit_form - sha256: d4e0afd9ca95ee5602a26e9d678ee4f591f98b52539906cc0e23c54c3a71062b + sha256: "41202f95130e3f029c77ad96cba812939cfe77f9316c298bf5fcbaf56864c904" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.5" cupertino_icons: dependency: "direct dev" description: @@ -285,34 +290,42 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91 + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 url: "https://pub.dev" source: hosted - version: "10.1.0" + version: "10.1.2" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" dio: dependency: "direct main" description: name: dio - sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5" + sha256: "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0" url: "https://pub.dev" source: hosted - version: "5.4.3+1" + version: "5.6.0" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + url: "https://pub.dev" + source: hosted + version: "2.0.0" duration: dependency: "direct main" description: name: duration - sha256: "0548a12d235dab185c677ef660995f23fdc06a02a2b984aa23805f6a03d82815" + sha256: "8b9020df63d2894f29fe250b60ca5b7f9e943d4a3cf766c2b161efeb617a0ea3" url: "https://pub.dev" source: hosted - version: "3.0.13" + version: "3.0.15" dynamic_color: dependency: "direct main" description: @@ -365,10 +378,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: @@ -402,10 +415,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2 + sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a url: "https://pub.dev" source: hosted - version: "8.1.5" + version: "8.1.6" flutter_hooks: dependency: transitive description: @@ -426,10 +439,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.0.0" flutter_localizations: dependency: transitive description: flutter @@ -439,26 +452,26 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: "9921f9deda326f8a885e202b1e35237eadfc1345239a0f6f0f1ff287e047547f" + sha256: a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7 url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.3+1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" + sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de" url: "https://pub.dev" source: hosted - version: "2.0.19" + version: "2.0.21" flutter_secure_storage: dependency: "direct main" description: name: flutter_secure_storage - sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4 + sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0" url: "https://pub.dev" source: hosted - version: "9.1.1" + version: "9.2.2" flutter_secure_storage_linux: dependency: transitive description: @@ -471,18 +484,18 @@ packages: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510" + sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a" + sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8 url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" flutter_secure_storage_web: dependency: transitive description: @@ -553,10 +566,10 @@ packages: dependency: "direct main" description: name: gql - sha256: "5877b9e6537eb69431df7a45959d3f137ba5b7eba73208a631c404f36600e259" + sha256: "8ecd3585bb9e40d671aa58f52575d950670f99e5ffab18e2b34a757e071a6693" url: "https://pub.dev" source: hosted - version: "1.0.1-alpha+1715521079501" + version: "1.0.1-alpha+1717789143880" gql_code_builder: dependency: transitive description: @@ -593,18 +606,18 @@ packages: dependency: transitive description: name: gql_http_link - sha256: "1f922eed1b7078fdbfd602187663026f9f659fe9a9499e2207b5d5e01617f658" + sha256: ef6ad24d31beb5a30113e9b919eec20876903cc4b0ee0d31550047aaaba7d5dd url: "https://pub.dev" source: hosted - version: "1.0.1+1" + version: "1.1.0" gql_link: dependency: transitive description: name: gql_link - sha256: a0dae65d022285564ad333763a6988a603d6b9a075760ae178d6d22586bd342b + sha256: "70fd5b5cbcc50601679f4b9fea3bcc994e583f59cfec7e1fec11113074b1a565" url: "https://pub.dev" source: hosted - version: "1.0.1-alpha+1715521079517" + version: "1.0.1-alpha+1717789143896" gql_transform_link: dependency: transitive description: @@ -625,10 +638,10 @@ packages: dependency: "direct main" description: name: graphql - sha256: d066e53446166c12537458386b507f7426f2b8801ebafc184576aab3cbc64d56 + sha256: "62f31433ba194eda7b81a812a83c3d9560766cec5ac0210ea4a3e677c91b8df4" url: "https://pub.dev" source: hosted - version: "5.2.0-beta.7" + version: "5.2.0-beta.8" graphql_codegen: dependency: "direct dev" description: @@ -641,18 +654,18 @@ packages: dependency: "direct main" description: name: graphql_flutter - sha256: "39b5e830bc654ab02c5b776c31675841d1a8c95840fdd284efba713b1d47e65d" + sha256: "2423b394465e7d83a5e708cd2f5b37b54e7ae9900abfbf0948d512fa46961acb" url: "https://pub.dev" source: hosted - version: "5.2.0-beta.6" + version: "5.2.0-beta.7" graphs: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" hive: dependency: "direct main" description: @@ -681,10 +694,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -705,18 +718,18 @@ packages: dependency: transitive description: name: image - sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" url: "https://pub.dev" source: hosted - version: "4.1.7" + version: "4.2.0" intl: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -761,58 +774,58 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" local_auth: dependency: "direct main" description: name: local_auth - sha256: "280421b416b32de31405b0a25c3bd42dfcef2538dfbb20c03019e02a5ed55ed0" + sha256: "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.0" local_auth_android: dependency: transitive description: name: local_auth_android - sha256: e0e5b1ea247c5a0951c13a7ee13dc1beae69750e6a2e1910d1ed6a3cd4d56943 + sha256: e99c44ca0bce08f26f25e2a2e07d3b443d69986e1c3acf67c1449f7d847e3625 url: "https://pub.dev" source: hosted - version: "1.0.38" + version: "1.0.43" local_auth_darwin: dependency: transitive description: name: local_auth_darwin - sha256: "959145a4cf6f0de745b9ec9ac60101270eb4c5b8b7c2a0470907014adc1c618d" + sha256: "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" local_auth_platform_interface: dependency: transitive description: @@ -825,10 +838,10 @@ packages: dependency: transitive description: name: local_auth_windows - sha256: "505ba3367ca781efb1c50d3132e44a2446bccc4163427bc203b9b4d8994d97ea" + sha256: bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5 url: "https://pub.dev" source: hosted - version: "1.0.10" + version: "1.0.11" logging: dependency: transitive description: @@ -837,6 +850,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" markdown: dependency: transitive description: @@ -865,18 +886,18 @@ packages: dependency: "direct main" description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" mime: dependency: transitive description: @@ -937,18 +958,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" path: dependency: transitive description: @@ -969,18 +990,18 @@ packages: dependency: transitive description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.10" path_provider_foundation: dependency: transitive description: @@ -1009,10 +1030,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" petitparser: dependency: transitive description: @@ -1025,10 +1046,10 @@ packages: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -1049,10 +1070,10 @@ packages: dependency: "direct main" description: name: pretty_dio_logger - sha256: "00b80053063935cf9a6190da344c5373b9d0e92da4c944c878ff2fbef0ef6dc2" + sha256: "36f2101299786d567869493e2f5731de61ce130faa14679473b26905a92b6407" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.4.0" provider: dependency: "direct main" description: @@ -1073,10 +1094,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" recase: dependency: transitive description: @@ -1097,58 +1118,58 @@ packages: dependency: transitive description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + sha256: a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974 url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.1" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" + sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.2" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shelf: dependency: transitive description: @@ -1161,10 +1182,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -1246,18 +1267,18 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" timezone: dependency: "direct main" description: name: timezone - sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5 + sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" url: "https://pub.dev" source: hosted - version: "0.9.3" + version: "0.9.4" timing: dependency: transitive description: @@ -1278,34 +1299,34 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" + sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" url: "https://pub.dev" source: hosted - version: "6.2.6" + version: "6.3.0" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" + sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.9" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: @@ -1326,26 +1347,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" uuid: dependency: transitive description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.4.2" vector_graphics: dependency: transitive description: @@ -1382,10 +1403,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.4" watcher: dependency: transitive description: @@ -1398,34 +1419,34 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.0.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.0" win32: dependency: transitive description: name: win32 - sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.5.4" win32_registry: dependency: transitive description: name: win32_registry - sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb" + sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.1.4" xdg_directories: dependency: transitive description: @@ -1451,5 +1472,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.1 <4.0.0" - flutter: ">=3.19.5" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 24cf9e2c..1a10a2f7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,29 +4,31 @@ publish_to: 'none' version: 0.12.1+24 environment: - sdk: '>=3.2.1 <4.0.0' - flutter: ">=3.19.5 <3.20.0" + sdk: '>=3.5.0 <4.0.0' + flutter: ">=3.24.0 <3.25.0" dependencies: animations: ^2.0.11 - auto_route: ^8.1.3 + auto_route: ^9.2.2 auto_size_text: ^3.0.0 bloc_concurrency: ^0.2.5 collection: ^1.18.0 crypt: ^4.3.1 - cubit_form: ^2.0.1 + cubit_form: ^2.0.5 device_info_plus: ^10.0.1 - dio: ^5.4.2+1 - duration: ^3.0.13 + dio: ^5.6.0 + duration: ^3.0.15 + # When updated, check if they now support new color roles and remove the + # workaround from the theme factory. dynamic_color: ^1.7.0 easy_localization: ^3.0.6 equatable: ^2.0.5 fl_chart: ^0.68.0 flutter: sdk: flutter - flutter_bloc: ^8.1.5 - flutter_markdown: ^0.7.1 - flutter_secure_storage: ^9.0.0 + flutter_bloc: ^8.1.6 + flutter_markdown: ^0.7.3+1 + flutter_secure_storage: ^9.2.2 flutter_svg: ^2.0.10+1 gap: ^3.0.1 get_it: ^7.6.7 @@ -36,28 +38,28 @@ dependencies: hive: ^2.2.3 hive_flutter: ^1.1.0 http: ^1.2.1 - intl: ^0.18.1 + intl: ^0.19.0 ionicons: ^0.2.2 json_annotation: ^4.9.0 - local_auth: ^2.2.0 - material_color_utilities: ^0.8.0 + local_auth: ^2.3.0 + material_color_utilities: ^0.11.0 modal_bottom_sheet: ^3.0.0-pre nanoid: ^1.0.0 package_info_plus: ^8.0.0 - pretty_dio_logger: ^1.3.1 + pretty_dio_logger: ^1.4.0 provider: ^6.1.2 pub_semver: ^2.1.4 - timezone: ^0.9.3 - url_launcher: ^6.2.5 + timezone: ^0.9.4 + url_launcher: ^6.3.0 # wakelock: ^0.6.2 # TODO: Developer is not available, update later. dev_dependencies: - auto_route_generator: ^8.0.0 + auto_route_generator: ^9.0.0 build_runner: ^2.4.9 cupertino_icons: ^1.0.8 flutter_launcher_icons: ^0.13.1 - flutter_lints: ^3.0.2 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter graphql_codegen: ^0.14.0