Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick 2.2-dev into main #647

Merged
merged 2 commits into from
Mar 2, 2023
Merged

Cherry pick 2.2-dev into main #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ee58d
Drop deprecated YaruSwitch.checkmarkColor property (#633)
Jupi007 Feb 24, 2023
9e83720
Merge branch 'main' into new-main
Jupi007 Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions lib/src/widgets/yaru_switch.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class YaruSwitch extends StatefulWidget implements YaruTogglable<bool> {
required this.onChanged,
this.selectedColor,
this.thumbColor,
this.checkmarkColor,
this.focusNode,
this.autofocus = false,
});
Expand Down Expand Up @@ -91,14 +90,6 @@ class YaruSwitch extends StatefulWidget implements YaruTogglable<bool> {
/// Defaults to [ColorScheme.onPrimary].
final Color? thumbColor;

// TODO: Drop this in 2.2.0 release.
//
/// The color to use for the thumb when this switch is on.
///
/// Defaults to [ColorScheme.onPrimary].
@Deprecated('Use `thumbColor` instead. Will be removed in yaru_widgets 2.2.0')
final Color? checkmarkColor;

@override
bool get interactive => onChanged != null;

Expand Down Expand Up @@ -182,8 +173,6 @@ class _YaruSwitchState extends YaruTogglableState<YaruSwitch> {
final checkedBorderColor =
switchTheme.borderColor?.resolve(selectedState) ?? Colors.transparent;
final checkedThumbColor = widget.thumbColor ??
// ignore: deprecated_member_use_from_same_package
widget.checkmarkColor ??
switchTheme.thumbColor?.resolve(selectedState) ??
painter.checkmarkColor;

Expand Down