Version 2.1.5 #540 (#544)

Adrian-Samoticha · web-flow · commit 709125c879c6 · 2025-01-08T14:39:57.000+01:00
* migrate from `withOpacity` to `withValues`

* migrate away from `value` in `Color`

* migrate away from `red`, `green`, `blue`, and `alpha`

* bump version to 2.1.5

* add changelog entry for version 2.1.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [2.1.5]
+### 🛻 Migrated 🛻
+* Migrate to Flutter’s new Color API.
+
 ## [2.1.4]
 ### 🛠️ Fixed 🛠️
 * Fix incorrect barrier color when calling `showMacosAlertDialog` when dark mode is enabled.
diff --git a/example/lib/widgets/widget_text_title1.dart b/example/lib/widgets/widget_text_title1.dart
@@ -11,7 +11,7 @@ class WidgetTextTitle1 extends StatelessWidget {
   Widget build(BuildContext context) {
     return DecoratedBox(
       decoration: BoxDecoration(
-        color: MacosColors.systemGrayColor.withOpacity(0.5),
+        color: MacosColors.systemGrayColor.withValues(alpha: 0.5),
         borderRadius: BorderRadius.circular(4.0),
       ),
       child: Padding(
diff --git a/example/lib/widgets/widget_text_title2.dart b/example/lib/widgets/widget_text_title2.dart
@@ -11,7 +11,7 @@ class WidgetTextTitle2 extends StatelessWidget {
   Widget build(BuildContext context) {
     return DecoratedBox(
       decoration: BoxDecoration(
-        color: MacosColors.systemGrayColor.withOpacity(0.5),
+        color: MacosColors.systemGrayColor.withValues(alpha: 0.5),
         borderRadius: BorderRadius.circular(4.0),
       ),
       child: Padding(
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -182,7 +182,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.1.3"
+    version: "2.1.4"
   macos_window_utils:
     dependency: transitive
     description:
diff --git a/lib/src/buttons/popup_button.dart b/lib/src/buttons/popup_button.dart
@@ -261,7 +261,7 @@ class _MacosPopupMenuState<T> extends State<_MacosPopupMenu<T>> {
                 return true;
               },
               child: MacosOverlayFilter(
-                color: popupColor?.withOpacity(0.25),
+                color: popupColor?.withValues(alpha: 0.25),
                 borderRadius: _kBorderRadius,
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
diff --git a/lib/src/buttons/pulldown_button.dart b/lib/src/buttons/pulldown_button.dart
@@ -202,7 +202,7 @@ class _MacosPulldownMenuState extends State<_MacosPulldownMenu> {
           child: MacosOverlayFilter(
             color: MacosPulldownButtonTheme.of(context)
                 .pulldownColor
-                ?.withOpacity(0.25),
+                ?.withValues(alpha: 0.25),
             borderRadius: _kBorderRadius,
             child: Padding(
               padding: const EdgeInsets.all(6.0),
@@ -1042,7 +1042,7 @@ _ButtonStyles _getButtonStyles(
           );
           break;
         case PulldownButtonState.pressed:
-          textColor = caretColor = iconColor.withOpacity(0.85);
+          textColor = caretColor = iconColor.withValues(alpha: 0.85);
           bgColor = brightness.resolve(
             const Color.fromRGBO(0, 0, 0, 0.1),
             const Color.fromRGBO(255, 255, 255, 0.1),
@@ -1061,8 +1061,8 @@ _ButtonStyles _getButtonStyles(
         case PulldownButtonState.hovered:
           break;
         case PulldownButtonState.pressed:
-          bgColor = pulldownTheme.backgroundColor!.withOpacity(0.4);
-          caretBgColor = pulldownTheme.highlightColor!.withOpacity(0.9);
+          bgColor = pulldownTheme.backgroundColor!.withValues(alpha: 0.4);
+          caretBgColor = pulldownTheme.highlightColor!.withValues(alpha: 0.9);
           break;
       }
     }
diff --git a/lib/src/buttons/push_button.dart b/lib/src/buttons/push_button.dart
@@ -298,12 +298,12 @@ class PushButtonState extends State<PushButton>
     final blendedBackgroundColor = Color.lerp(
       theme.canvasColor,
       backgroundColor,
-      backgroundColor.opacity,
+      backgroundColor.a,
     )!;
 
     return widget.enabled
         ? textLuminance(blendedBackgroundColor)
-        : textLuminance(blendedBackgroundColor).withOpacity(0.25);
+        : textLuminance(blendedBackgroundColor).withValues(alpha: 0.25);
   }
 
   BoxDecoration _getClickEffectBoxDecoration() {
diff --git a/lib/src/buttons/switch.dart b/lib/src/buttons/switch.dart
@@ -281,10 +281,16 @@ class _MacosSwitchState extends State<MacosSwitch>
     final MacosThemeData theme = MacosTheme.of(context);
     MacosColor borderColor =
         MacosDynamicColor.resolve(_kDefaultBorderColor, context).toMacosColor();
-    MacosColor activeColor = MacosColor(MacosDynamicColor.resolve(
+    final resolvedActiveColor = MacosDynamicColor.resolve(
       widget.activeColor ?? theme.primaryColor,
       context,
-    ).value);
+    );
+    MacosColor activeColor = MacosColor.fromRGBO(
+      (resolvedActiveColor.r * 255).toInt(),
+      (resolvedActiveColor.g * 255).toInt(),
+      (resolvedActiveColor.b * 255).toInt(),
+      resolvedActiveColor.a,
+    );
     MacosColor trackColor = widget.trackColor ??
         MacosDynamicColor.resolve(_kDefaultTrackColor, context).toMacosColor();
     MacosColor knobColor = widget.knobColor ??
diff --git a/lib/src/dialogs/macos_alert_dialog.dart b/lib/src/dialogs/macos_alert_dialog.dart
@@ -126,13 +126,13 @@ class MacosAlertDialog extends StatelessWidget {
     final brightness = MacosTheme.brightnessOf(context);
 
     final outerBorderColor = brightness.resolve(
-      Colors.black.withOpacity(0.23),
-      Colors.black.withOpacity(0.76),
+      Colors.black.withValues(alpha: 0.23),
+      Colors.black.withValues(alpha: 0.76),
     );
 
     final innerBorderColor = brightness.resolve(
-      Colors.white.withOpacity(0.45),
-      Colors.white.withOpacity(0.15),
+      Colors.white.withValues(alpha: 0.45),
+      Colors.white.withValues(alpha: 0.15),
     );
 
     return Dialog(
diff --git a/lib/src/fields/text_field.dart b/lib/src/fields/text_field.dart
@@ -1046,7 +1046,7 @@ class _MacosTextFieldState extends State<MacosTextField>
         ? const Color.fromRGBO(255, 255, 255, 0.55)
         : const Color.fromRGBO(0, 0, 0, 0.5);
     if (widget.enabled != null && widget.enabled == false) {
-      iconsColor = iconsColor.withOpacity(0.2);
+      iconsColor = iconsColor.withValues(alpha: 0.2);
     }
 
     // Otherwise, listen to the current state of the text entry.
@@ -1251,8 +1251,8 @@ class _MacosTextFieldState extends State<MacosTextField>
 
     final placeholderStyle = textStyle.merge(enabled
         ? resolvedPlaceholderStyle
-        : resolvedPlaceholderStyle!
-            .copyWith(color: resolvedPlaceholderStyle.color!.withOpacity(0.2)));
+        : resolvedPlaceholderStyle!.copyWith(
+            color: resolvedPlaceholderStyle.color!.withValues(alpha: 0.2)));
 
     final Brightness keyboardAppearance =
         widget.keyboardAppearance ?? MacosTheme.brightnessOf(context);
@@ -1315,7 +1315,7 @@ class _MacosTextFieldState extends State<MacosTextField>
         if (focusedDecoration.border is Border) {
           BorderSide borderSide(BorderSide fromSide) {
             return BorderSide(
-              color: fromSide.color.withOpacity(0.0),
+              color: fromSide.color.withValues(alpha: 0.0),
               style: fromSide.style,
               width: fromSide.width,
             );
@@ -1334,7 +1334,7 @@ class _MacosTextFieldState extends State<MacosTextField>
     );
 
     final Color selectionColor =
-        MacosTheme.of(context).primaryColor.withOpacity(0.2);
+        MacosTheme.of(context).primaryColor.withValues(alpha: 0.2);
 
     final Widget paddedEditable = Padding(
       padding: widget.padding,
diff --git a/lib/src/icon/image_icon.dart b/lib/src/icon/image_icon.dart
@@ -71,7 +71,7 @@ class MacosImageIcon extends StatelessWidget {
     Color iconColor = color ?? iconTheme.color!;
 
     if (iconOpacity != null && iconOpacity != 1.0) {
-      iconColor = iconColor.withOpacity(iconColor.opacity * iconOpacity);
+      iconColor = iconColor.withValues(alpha: iconColor.a * iconOpacity);
     }
 
     return Semantics(
diff --git a/lib/src/icon/macos_icon.dart b/lib/src/icon/macos_icon.dart
@@ -95,7 +95,7 @@ class MacosIcon extends StatelessWidget {
     final iconOpacity = iconTheme.opacity ?? 1.0;
     Color iconColor = color ?? iconTheme.color!;
     if (iconOpacity != 1.0) {
-      iconColor = iconColor.withOpacity(iconColor.opacity * iconOpacity);
+      iconColor = iconColor.withValues(alpha: iconColor.a * iconOpacity);
     }
 
     Widget iconWidget = RichText(
diff --git a/lib/src/layout/scrollbar.dart b/lib/src/layout/scrollbar.dart
@@ -156,7 +156,7 @@ class _RawMacosScrollBarState extends RawScrollbarState<_RawMacosScrollBar> {
     );
     _trackColorTween = ColorTween(
       begin: MacosColors.transparent,
-      end: widget.effectiveThumbColor.withOpacity(0.15),
+      end: widget.effectiveThumbColor.withValues(alpha: 0.15),
     ).animate(_trackColorAnimationController);
     _thumbThicknessAnimationController.addListener(() {
       updateScrollbarPainter();
diff --git a/lib/src/layout/title_bar.dart b/lib/src/layout/title_bar.dart
@@ -100,7 +100,7 @@ class TitleBar extends StatelessWidget {
       ),
       child: ClipRect(
         child: BackdropFilter(
-          filter: decoration?.color?.opacity == 1
+          filter: decoration?.color?.a == 1
               ? ImageFilter.blur()
               : ImageFilter.blur(sigmaX: 5.0, sigmaY: 5.0),
           child: Container(
diff --git a/lib/src/layout/toolbar/sliver_toolbar.dart b/lib/src/layout/toolbar/sliver_toolbar.dart
@@ -296,10 +296,11 @@ class _SliverToolBarDelegate extends SliverPersistentHeaderDelegate {
     BoxDecoration? effectiveDecoration;
     if (isScrolledUnder) {
       effectiveDecoration = decoration?.copyWith(
-            color: decoration?.color?.withOpacity(opacity),
+            color: decoration?.color?.withValues(alpha: opacity),
           ) ??
           BoxDecoration(
-            color: MacosTheme.of(context).canvasColor.withOpacity(opacity),
+            color:
+                MacosTheme.of(context).canvasColor.withValues(alpha: opacity),
           );
     }
 
diff --git a/lib/src/layout/toolbar/toolbar.dart b/lib/src/layout/toolbar/toolbar.dart
@@ -266,7 +266,7 @@ class _ToolBarState extends State<ToolBar> {
         enableWallpaperTintedArea: kIsWeb ? false : !widget.enableBlur,
         isWidgetVisible: widget.allowWallpaperTintingOverrides,
         backgroundColor: theme.canvasColor,
-        widgetOpacity: widget.decoration?.color?.opacity,
+        widgetOpacity: widget.decoration?.color?.a,
         child: Container(
           alignment: widget.alignment,
           padding: widget.padding,
diff --git a/lib/src/layout/toolbar/toolbar_overflow_menu.dart b/lib/src/layout/toolbar/toolbar_overflow_menu.dart
@@ -27,7 +27,7 @@ class ToolbarOverflowMenu extends StatelessWidget {
         child: MacosOverlayFilter(
           color: MacosPulldownButtonTheme.of(context)
               .pulldownColor
-              ?.withOpacity(0.25),
+              ?.withValues(alpha: 0.25),
           borderRadius: _kBorderRadius,
           child: Padding(
             padding: const EdgeInsets.all(6.0),
diff --git a/lib/src/layout/wallpaper_tinted_area.dart b/lib/src/layout/wallpaper_tinted_area.dart
@@ -142,7 +142,7 @@ class _WallpaperTintedAreaTweenAnimationBuilder extends StatelessWidget {
       builder: (context, value, child) {
         return Container(
           decoration: BoxDecoration(
-            color: backgroundColor.withOpacity(value),
+            color: backgroundColor.withValues(alpha: value),
             backgroundBlendMode: BlendMode.src,
           ),
           child: child,
diff --git a/lib/src/selectors/color_well.dart b/lib/src/selectors/color_well.dart
@@ -106,7 +106,7 @@ class _MacosColorWellState extends State<MacosColorWell> {
   Widget build(BuildContext context) {
     final theme = MacosTheme.of(context);
     final outerColor = theme.brightness.isDark
-        ? MacosColors.systemGrayColor.withOpacity(0.5)
+        ? MacosColors.systemGrayColor.withValues(alpha: 0.5)
         : MacosColors.white;
     return GestureDetector(
       onTap: () async {
diff --git a/lib/src/sheets/macos_sheet.dart b/lib/src/sheets/macos_sheet.dart
@@ -54,13 +54,13 @@ class MacosSheet extends StatelessWidget {
     final brightness = MacosTheme.brightnessOf(context);
 
     final outerBorderColor = brightness.resolve(
-      Colors.black.withOpacity(0.23),
-      Colors.black.withOpacity(0.76),
+      Colors.black.withValues(alpha: 0.23),
+      Colors.black.withValues(alpha: 0.76),
     );
 
     final innerBorderColor = brightness.resolve(
-      Colors.white.withOpacity(0.45),
-      Colors.white.withOpacity(0.15),
+      Colors.white.withValues(alpha: 0.45),
+      Colors.white.withValues(alpha: 0.15),
     );
 
     final EdgeInsets effectivePadding =
@@ -114,7 +114,7 @@ Future<T?> showMacosSheet<T>({
   barrierColor ??= MacosDynamicColor.resolve(
     MacosColors.controlBackgroundColor,
     context,
-  ).withOpacity(0.6);
+  ).withValues(alpha: 0.6);
 
   return Navigator.of(context, rootNavigator: useRootNavigator).push<T>(
     _MacosSheetRoute<T>(
diff --git a/lib/src/theme/help_button_theme.dart b/lib/src/theme/help_button_theme.dart
@@ -99,8 +99,8 @@ class HelpButtonThemeData with Diagnosticable {
     return identical(this, other) ||
         other is HelpButtonThemeData &&
             runtimeType == other.runtimeType &&
-            color?.value == other.color?.value &&
-            disabledColor?.value == other.disabledColor?.value;
+            color == other.color &&
+            disabledColor == other.disabledColor;
   }
 
   @override
diff --git a/lib/src/theme/icon_button_theme.dart b/lib/src/theme/icon_button_theme.dart
@@ -148,9 +148,9 @@ class MacosIconButtonThemeData with Diagnosticable {
       identical(this, other) ||
       other is MacosIconButtonThemeData &&
           runtimeType == other.runtimeType &&
-          backgroundColor?.value == other.backgroundColor?.value &&
-          disabledColor?.value == other.disabledColor?.value &&
-          hoverColor?.value == other.hoverColor?.value &&
+          backgroundColor == other.backgroundColor &&
+          disabledColor == other.disabledColor &&
+          hoverColor == other.hoverColor &&
           shape == other.shape &&
           borderRadius == other.borderRadius &&
           boxConstraints == other.boxConstraints &&
diff --git a/lib/src/theme/icon_theme.dart b/lib/src/theme/icon_theme.dart
@@ -199,7 +199,7 @@ class MacosIconThemeData with Diagnosticable {
   bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) return false;
     return other is MacosIconThemeData &&
-        other.color?.value == color?.value &&
+        other.color == color &&
         other.opacity == opacity &&
         other.size == size;
   }
diff --git a/lib/src/theme/macos_colors.dart b/lib/src/theme/macos_colors.dart
diff --git a/lib/src/theme/macos_dynamic_color.dart b/lib/src/theme/macos_dynamic_color.dart
diff --git a/lib/src/theme/macos_theme.dart b/lib/src/theme/macos_theme.dart
diff --git a/lib/src/theme/overlay_filter.dart b/lib/src/theme/overlay_filter.dart
diff --git a/lib/src/theme/popup_button_theme.dart b/lib/src/theme/popup_button_theme.dart
diff --git a/lib/src/theme/pulldown_button_theme.dart b/lib/src/theme/pulldown_button_theme.dart
diff --git a/lib/src/theme/search_field_theme.dart b/lib/src/theme/search_field_theme.dart
diff --git a/lib/src/theme/tooltip_theme.dart b/lib/src/theme/tooltip_theme.dart
diff --git a/pubspec.yaml b/pubspec.yaml
