refactor!: [DX-3717] Upgrade to Flutter 3.27.1

MewsSystems · Jan 10, 2025 · 209f31a · 209f31a
1 parent 61dba6e
commit 209f31a
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 142 deletions.
diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
@@ -15,7 +15,7 @@ runs:
     - name: Setup Flutter
       uses: subosito/flutter-action@v2
       with:
-        flutter-version: 3.24.2
+        flutter-version: 3.27.1
 
     - name: Get ID Token
       uses: actions/github-script@v6

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -6,7 +6,7 @@ runs:
     - name: Set up Flutter
       uses: subosito/flutter-action@ea686d7c56499339ad176e9f19c516ff6cf05a31
       with:
-        flutter-version: 3.24.2
+        flutter-version: 3.27.1
         cache: true
 
     - name: Set up environment paths

diff --git a/optimus/lib/src/common/field_wrapper.dart b/optimus/lib/src/common/field_wrapper.dart
@@ -503,7 +503,7 @@ class _ColoredTransitionState extends State<_ColoredTransition> {
           color: widget.state == OptimusStatusBarState.empty
               ? _previousState
                   .getStatusBarColor(context.tokens)
-                  .withOpacity(0.5)
+                  .withValues(alpha: 0.5)
               : widget.state.getStatusBarColor(context.tokens),
         ),
       );

diff --git a/optimus/lib/src/common/state_property.dart b/optimus/lib/src/common/state_property.dart
diff --git a/optimus/lib/src/lists/nav_list_tile.dart b/optimus/lib/src/lists/nav_list_tile.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:optimus/optimus.dart';
 import 'package:optimus/src/common/gesture_wrapper.dart';
-import 'package:optimus/src/common/state_property.dart';
 import 'package:optimus/src/lists/base_list_tile.dart';
 
 /// Lists are vertically organized groups of data. Optimized for reading
@@ -83,12 +82,12 @@ class _OptimusNavListTileState extends State<OptimusNavListTile>
     }
   }
 
-  InteractiveStateColor get _backgroundColor => InteractiveStateColor(
-        defaultColor: tokens.backgroundInteractiveNeutralSubtleDefault,
-        disabled: Colors.transparent,
-        pressed: tokens.backgroundInteractiveNeutralSubtleActive,
-        hovered: tokens.backgroundInteractiveNeutralSubtleHover,
-      );
+  WidgetStateColor get _backgroundColor => WidgetStateColor.fromMap({
+        WidgetState.disabled: Colors.transparent,
+        WidgetState.pressed: tokens.backgroundInteractiveNeutralSubtleActive,
+        WidgetState.hovered: tokens.backgroundInteractiveNeutralSubtleHover,
+        WidgetState.any: tokens.backgroundInteractiveNeutralSubtleDefault,
+      });
 
   void _handleHoverChanged(bool isHovered) {
     setState(() => _controller.update(WidgetState.hovered, isHovered));

diff --git a/optimus/lib/src/radio/radio_circle.dart b/optimus/lib/src/radio/radio_circle.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:optimus/optimus.dart';
-import 'package:optimus/src/common/state_property.dart';
 
 class RadioCircle extends StatelessWidget {
   const RadioCircle({
@@ -13,28 +12,28 @@ class RadioCircle extends StatelessWidget {
   final bool isSelected;
   final WidgetStatesController controller;
 
-  InteractiveStateColor _getBorderColor(OptimusTokens tokens) =>
-      InteractiveStateColor(
-        defaultColor: isSelected
-            ? tokens.backgroundInteractivePrimaryDefault
-            : tokens.borderInteractiveSecondaryDefault,
-        disabled:
+  WidgetStateColor _getBorderColor(OptimusTokens tokens) =>
+      WidgetStateColor.fromMap({
+        WidgetState.disabled:
             isSelected ? tokens.backgroundDisabled : tokens.borderDisabled,
-        pressed: isSelected
+        WidgetState.pressed: isSelected
             ? tokens.backgroundInteractivePrimaryActive
             : tokens.borderInteractiveSecondaryActive,
-        hovered: isSelected
+        WidgetState.hovered: isSelected
             ? tokens.backgroundInteractivePrimaryHover
             : tokens.borderInteractiveSecondaryHover,
-      );
+        WidgetState.any: isSelected
+            ? tokens.backgroundInteractivePrimaryDefault
+            : tokens.borderInteractiveSecondaryDefault,
+      });
 
-  InteractiveStateColor _getFillColor(OptimusTokens tokens) =>
-      InteractiveStateColor(
-        defaultColor: tokens.backgroundInteractiveNeutralSubtleDefault,
-        disabled: tokens.backgroundInteractiveNeutralSubtleDefault,
-        pressed: tokens.backgroundInteractiveNeutralSubtleActive,
-        hovered: tokens.backgroundInteractiveNeutralSubtleHover,
-      );
+  WidgetStateColor _getFillColor(OptimusTokens tokens) =>
+      WidgetStateColor.fromMap({
+        WidgetState.disabled: tokens.backgroundInteractiveNeutralSubtleDefault,
+        WidgetState.pressed: tokens.backgroundInteractiveNeutralSubtleActive,
+        WidgetState.hovered: tokens.backgroundInteractiveNeutralSubtleHover,
+        WidgetState.any: tokens.backgroundInteractiveNeutralSubtleDefault,
+      });
 
   @override
   Widget build(BuildContext context) {

diff --git a/optimus/lib/src/selection_card.dart b/optimus/lib/src/selection_card.dart
@@ -3,7 +3,6 @@ import 'package:flutter/widgets.dart';
 import 'package:optimus/optimus.dart';
 import 'package:optimus/src/checkbox/checkbox_tick.dart';
 import 'package:optimus/src/common/gesture_wrapper.dart';
-import 'package:optimus/src/common/state_property.dart';
 import 'package:optimus/src/radio/radio_circle.dart';
 
 enum OptimusSelectionCardVariant { vertical, horizontal }
@@ -75,45 +74,41 @@ class _OptimusSelectionCardState extends State<OptimusSelectionCard>
     super.dispose();
   }
 
-  InteractiveStateColor get _backgroundColor => InteractiveStateColor(
-        defaultColor: widget.isSelected
-            ? tokens.backgroundInteractiveSecondaryDefault
-            : tokens.backgroundStaticFlat,
-        disabled: tokens.backgroundStaticFlat,
-        pressed: widget.isSelected
+  WidgetStateColor get _backgroundColor => WidgetStateColor.fromMap({
+        WidgetState.disabled: tokens.backgroundStaticFlat,
+        WidgetState.pressed: widget.isSelected
             ? tokens.backgroundInteractiveSecondaryActive
             : tokens.backgroundStaticFlat,
-        hovered: widget.isSelected
+        WidgetState.hovered: widget.isSelected
             ? tokens.backgroundInteractiveSecondaryHover
             : tokens.backgroundStaticFlat,
-      );
+        WidgetState.any: widget.isSelected
+            ? tokens.backgroundInteractiveSecondaryDefault
+            : tokens.backgroundStaticFlat,
+      });
 
-  InteractiveStateColor get _borderColor => InteractiveStateColor(
-        defaultColor: widget.isSelected
-            ? tokens.borderInteractivePrimaryDefault
-            : tokens.borderInteractiveSecondaryDefault,
-        disabled: tokens.borderDisabled,
-        pressed: widget.isSelected
+  WidgetStateColor get _borderColor => WidgetStateColor.fromMap({
+        WidgetState.disabled: tokens.borderDisabled,
+        WidgetState.pressed: widget.isSelected
             ? tokens.borderInteractivePrimaryActive
             : tokens.borderInteractiveSecondaryActive,
-        hovered: widget.isSelected
+        WidgetState.hovered: widget.isSelected
             ? tokens.borderInteractivePrimaryHover
             : tokens.borderInteractiveSecondaryHover,
-      );
+        WidgetState.any: widget.isSelected
+            ? tokens.borderInteractivePrimaryDefault
+            : tokens.borderInteractiveSecondaryDefault,
+      });
 
-  InteractiveStateColor get _titleColor => InteractiveStateColor(
-        defaultColor: tokens.textStaticPrimary,
-        disabled: tokens.textDisabled,
-        pressed: tokens.textStaticPrimary,
-        hovered: tokens.textStaticPrimary,
-      );
+  WidgetStateColor get _titleColor => WidgetStateColor.fromMap({
+        WidgetState.disabled: tokens.textDisabled,
+        WidgetState.any: tokens.textStaticPrimary,
+      });
 
-  InteractiveStateColor get _descriptionColor => InteractiveStateColor(
-        defaultColor: tokens.textStaticTertiary,
-        disabled: tokens.textDisabled,
-        pressed: tokens.textStaticTertiary,
-        hovered: tokens.textStaticTertiary,
-      );
+  WidgetStateColor get _descriptionColor => WidgetStateColor.fromMap({
+        WidgetState.disabled: tokens.textDisabled,
+        WidgetState.any: tokens.textStaticTertiary,
+      });
 
   @override
   void didUpdateWidget(covariant OptimusSelectionCard oldWidget) {

diff --git a/optimus/pubspec.yaml b/optimus/pubspec.yaml
@@ -5,7 +5,7 @@ repository: https://github.com/MewsSystems/mews-flutter
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.24.0"
+  flutter: ">=3.27.0"
 
 dependencies:
   dfunc: ^0.10.0