Skip to content

Commit 709125c

Browse files
Version 2.1.5 #540 (#544)
* 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
1 parent cb46183 commit 709125c

32 files changed

+115
-112
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [2.1.5]
2+
### 🛻 Migrated 🛻
3+
* Migrate to Flutter’s new Color API.
4+
15
## [2.1.4]
26
### 🛠️ Fixed 🛠️
37
* Fix incorrect barrier color when calling `showMacosAlertDialog` when dark mode is enabled.

example/lib/widgets/widget_text_title1.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class WidgetTextTitle1 extends StatelessWidget {
1111
Widget build(BuildContext context) {
1212
return DecoratedBox(
1313
decoration: BoxDecoration(
14-
color: MacosColors.systemGrayColor.withOpacity(0.5),
14+
color: MacosColors.systemGrayColor.withValues(alpha: 0.5),
1515
borderRadius: BorderRadius.circular(4.0),
1616
),
1717
child: Padding(

example/lib/widgets/widget_text_title2.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class WidgetTextTitle2 extends StatelessWidget {
1111
Widget build(BuildContext context) {
1212
return DecoratedBox(
1313
decoration: BoxDecoration(
14-
color: MacosColors.systemGrayColor.withOpacity(0.5),
14+
color: MacosColors.systemGrayColor.withValues(alpha: 0.5),
1515
borderRadius: BorderRadius.circular(4.0),
1616
),
1717
child: Padding(

example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ packages:
182182
path: ".."
183183
relative: true
184184
source: path
185-
version: "2.1.3"
185+
version: "2.1.4"
186186
macos_window_utils:
187187
dependency: transitive
188188
description:

lib/src/buttons/popup_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class _MacosPopupMenuState<T> extends State<_MacosPopupMenu<T>> {
261261
return true;
262262
},
263263
child: MacosOverlayFilter(
264-
color: popupColor?.withOpacity(0.25),
264+
color: popupColor?.withValues(alpha: 0.25),
265265
borderRadius: _kBorderRadius,
266266
child: Column(
267267
mainAxisSize: MainAxisSize.min,

lib/src/buttons/pulldown_button.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class _MacosPulldownMenuState extends State<_MacosPulldownMenu> {
202202
child: MacosOverlayFilter(
203203
color: MacosPulldownButtonTheme.of(context)
204204
.pulldownColor
205-
?.withOpacity(0.25),
205+
?.withValues(alpha: 0.25),
206206
borderRadius: _kBorderRadius,
207207
child: Padding(
208208
padding: const EdgeInsets.all(6.0),
@@ -1042,7 +1042,7 @@ _ButtonStyles _getButtonStyles(
10421042
);
10431043
break;
10441044
case PulldownButtonState.pressed:
1045-
textColor = caretColor = iconColor.withOpacity(0.85);
1045+
textColor = caretColor = iconColor.withValues(alpha: 0.85);
10461046
bgColor = brightness.resolve(
10471047
const Color.fromRGBO(0, 0, 0, 0.1),
10481048
const Color.fromRGBO(255, 255, 255, 0.1),
@@ -1061,8 +1061,8 @@ _ButtonStyles _getButtonStyles(
10611061
case PulldownButtonState.hovered:
10621062
break;
10631063
case PulldownButtonState.pressed:
1064-
bgColor = pulldownTheme.backgroundColor!.withOpacity(0.4);
1065-
caretBgColor = pulldownTheme.highlightColor!.withOpacity(0.9);
1064+
bgColor = pulldownTheme.backgroundColor!.withValues(alpha: 0.4);
1065+
caretBgColor = pulldownTheme.highlightColor!.withValues(alpha: 0.9);
10661066
break;
10671067
}
10681068
}

lib/src/buttons/push_button.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,12 +298,12 @@ class PushButtonState extends State<PushButton>
298298
final blendedBackgroundColor = Color.lerp(
299299
theme.canvasColor,
300300
backgroundColor,
301-
backgroundColor.opacity,
301+
backgroundColor.a,
302302
)!;
303303

304304
return widget.enabled
305305
? textLuminance(blendedBackgroundColor)
306-
: textLuminance(blendedBackgroundColor).withOpacity(0.25);
306+
: textLuminance(blendedBackgroundColor).withValues(alpha: 0.25);
307307
}
308308

309309
BoxDecoration _getClickEffectBoxDecoration() {

lib/src/buttons/switch.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,16 @@ class _MacosSwitchState extends State<MacosSwitch>
281281
final MacosThemeData theme = MacosTheme.of(context);
282282
MacosColor borderColor =
283283
MacosDynamicColor.resolve(_kDefaultBorderColor, context).toMacosColor();
284-
MacosColor activeColor = MacosColor(MacosDynamicColor.resolve(
284+
final resolvedActiveColor = MacosDynamicColor.resolve(
285285
widget.activeColor ?? theme.primaryColor,
286286
context,
287-
).value);
287+
);
288+
MacosColor activeColor = MacosColor.fromRGBO(
289+
(resolvedActiveColor.r * 255).toInt(),
290+
(resolvedActiveColor.g * 255).toInt(),
291+
(resolvedActiveColor.b * 255).toInt(),
292+
resolvedActiveColor.a,
293+
);
288294
MacosColor trackColor = widget.trackColor ??
289295
MacosDynamicColor.resolve(_kDefaultTrackColor, context).toMacosColor();
290296
MacosColor knobColor = widget.knobColor ??

lib/src/dialogs/macos_alert_dialog.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ class MacosAlertDialog extends StatelessWidget {
126126
final brightness = MacosTheme.brightnessOf(context);
127127

128128
final outerBorderColor = brightness.resolve(
129-
Colors.black.withOpacity(0.23),
130-
Colors.black.withOpacity(0.76),
129+
Colors.black.withValues(alpha: 0.23),
130+
Colors.black.withValues(alpha: 0.76),
131131
);
132132

133133
final innerBorderColor = brightness.resolve(
134-
Colors.white.withOpacity(0.45),
135-
Colors.white.withOpacity(0.15),
134+
Colors.white.withValues(alpha: 0.45),
135+
Colors.white.withValues(alpha: 0.15),
136136
);
137137

138138
return Dialog(

lib/src/fields/text_field.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ class _MacosTextFieldState extends State<MacosTextField>
10461046
? const Color.fromRGBO(255, 255, 255, 0.55)
10471047
: const Color.fromRGBO(0, 0, 0, 0.5);
10481048
if (widget.enabled != null && widget.enabled == false) {
1049-
iconsColor = iconsColor.withOpacity(0.2);
1049+
iconsColor = iconsColor.withValues(alpha: 0.2);
10501050
}
10511051

10521052
// Otherwise, listen to the current state of the text entry.
@@ -1251,8 +1251,8 @@ class _MacosTextFieldState extends State<MacosTextField>
12511251

12521252
final placeholderStyle = textStyle.merge(enabled
12531253
? resolvedPlaceholderStyle
1254-
: resolvedPlaceholderStyle!
1255-
.copyWith(color: resolvedPlaceholderStyle.color!.withOpacity(0.2)));
1254+
: resolvedPlaceholderStyle!.copyWith(
1255+
color: resolvedPlaceholderStyle.color!.withValues(alpha: 0.2)));
12561256

12571257
final Brightness keyboardAppearance =
12581258
widget.keyboardAppearance ?? MacosTheme.brightnessOf(context);
@@ -1315,7 +1315,7 @@ class _MacosTextFieldState extends State<MacosTextField>
13151315
if (focusedDecoration.border is Border) {
13161316
BorderSide borderSide(BorderSide fromSide) {
13171317
return BorderSide(
1318-
color: fromSide.color.withOpacity(0.0),
1318+
color: fromSide.color.withValues(alpha: 0.0),
13191319
style: fromSide.style,
13201320
width: fromSide.width,
13211321
);
@@ -1334,7 +1334,7 @@ class _MacosTextFieldState extends State<MacosTextField>
13341334
);
13351335

13361336
final Color selectionColor =
1337-
MacosTheme.of(context).primaryColor.withOpacity(0.2);
1337+
MacosTheme.of(context).primaryColor.withValues(alpha: 0.2);
13381338

13391339
final Widget paddedEditable = Padding(
13401340
padding: widget.padding,

0 commit comments

Comments
 (0)