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

Make YaruToggleButton subclasses stateful #661

Merged
merged 1 commit into from
Mar 6, 2023
Merged

Make YaruToggleButton subclasses stateful #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions lib/src/widgets/yaru_check_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'yaru_toggle_button.dart';
import 'yaru_toggle_button_theme.dart';

/// A desktop style check button with an interactive label.
class YaruCheckButton extends StatelessWidget {
class YaruCheckButton extends StatefulWidget {
/// Creates a new check button.
const YaruCheckButton({
super.key,
Expand Down Expand Up @@ -47,43 +47,48 @@ class YaruCheckButton extends StatelessWidget {
/// See [Checkbox.mouseCursor].
final MouseCursor? mouseCursor;

@override
State<YaruCheckButton> createState() => _YaruCheckButtonState();
}

class _YaruCheckButtonState extends State<YaruCheckButton> {
@override
Widget build(BuildContext context) {
final states = {
if (onChanged == null) MaterialState.disabled,
if (widget.onChanged == null) MaterialState.disabled,
};
final mouseCursor =
MaterialStateProperty.resolveAs(this.mouseCursor, states) ??
MaterialStateProperty.resolveAs(widget.mouseCursor, states) ??
YaruToggleButtonTheme.of(context)?.mouseCursor?.resolve(states);

return YaruToggleButton(
title: title,
subtitle: subtitle,
contentPadding: contentPadding,
title: widget.title,
subtitle: widget.subtitle,
contentPadding: widget.contentPadding,
leading: YaruCheckbox(
value: value,
onChanged: onChanged,
tristate: tristate,
focusNode: focusNode,
autofocus: autofocus,
value: widget.value,
onChanged: widget.onChanged,
tristate: widget.tristate,
focusNode: widget.focusNode,
autofocus: widget.autofocus,
mouseCursor: mouseCursor,
),
mouseCursor:
mouseCursor ?? MaterialStateMouseCursor.clickable.resolve(states),
onToggled: onChanged == null ? null : _onToggled,
onToggled: widget.onChanged == null ? null : _onToggled,
);
}

void _onToggled() {
switch (value) {
switch (widget.value) {
case false:
onChanged!(true);
widget.onChanged!(true);
break;
case true:
onChanged!(tristate ? null : false);
widget.onChanged!(widget.tristate ? null : false);
break;
case null:
onChanged!(false);
widget.onChanged!(false);
break;
}
}
Expand Down
39 changes: 22 additions & 17 deletions lib/src/widgets/yaru_radio_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'yaru_toggle_button.dart';
import 'yaru_toggle_button_theme.dart';

/// A desktop style radio button with an interactive label.
class YaruRadioButton<T> extends StatelessWidget {
class YaruRadioButton<T> extends StatefulWidget {
/// Creates a new radio button.
const YaruRadioButton({
super.key,
Expand Down Expand Up @@ -51,39 +51,44 @@ class YaruRadioButton<T> extends StatelessWidget {
/// See [Radio.mouseCursor].
final MouseCursor? mouseCursor;

@override
State<YaruRadioButton<T>> createState() => _YaruRadioButtonState<T>();
}

class _YaruRadioButtonState<T> extends State<YaruRadioButton<T>> {
@override
Widget build(BuildContext context) {
final states = {
if (onChanged == null) MaterialState.disabled,
if (widget.onChanged == null) MaterialState.disabled,
};
final mouseCursor =
MaterialStateProperty.resolveAs(this.mouseCursor, states) ??
MaterialStateProperty.resolveAs(widget.mouseCursor, states) ??
YaruToggleButtonTheme.of(context)?.mouseCursor?.resolve(states);

return YaruToggleButton(
title: title,
subtitle: subtitle,
contentPadding: contentPadding,
title: widget.title,
subtitle: widget.subtitle,
contentPadding: widget.contentPadding,
leading: YaruRadio<T>(
value: value,
groupValue: groupValue,
onChanged: onChanged,
toggleable: toggleable,
focusNode: focusNode,
autofocus: autofocus,
value: widget.value,
groupValue: widget.groupValue,
onChanged: widget.onChanged,
toggleable: widget.toggleable,
focusNode: widget.focusNode,
autofocus: widget.autofocus,
mouseCursor: mouseCursor,
),
mouseCursor:
mouseCursor ?? MaterialStateMouseCursor.clickable.resolve(states),
onToggled: onChanged == null ? null : _onToggled,
onToggled: widget.onChanged == null ? null : _onToggled,
);
}

void _onToggled() {
if (groupValue != value || !toggleable) {
onChanged!(value);
} else if (toggleable) {
onChanged!(null);
if (widget.groupValue != widget.value || !widget.toggleable) {
widget.onChanged!(widget.value);
} else if (widget.toggleable) {
widget.onChanged!(null);
}
}
}
29 changes: 18 additions & 11 deletions lib/src/widgets/yaru_switch_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'yaru_toggle_button.dart';
import 'yaru_toggle_button_theme.dart';

/// A desktop style switch button with an interactive label.
class YaruSwitchButton extends StatelessWidget {
class YaruSwitchButton extends StatefulWidget {
/// Creates a new switch button.
const YaruSwitchButton({
super.key,
Expand Down Expand Up @@ -43,29 +43,36 @@ class YaruSwitchButton extends StatelessWidget {
/// See [Switch.mouseCursor].
final MouseCursor? mouseCursor;

@override
State<YaruSwitchButton> createState() => _YaruSwitchButtonState();
}

class _YaruSwitchButtonState extends State<YaruSwitchButton> {
@override
Widget build(BuildContext context) {
final states = {
if (onChanged == null) MaterialState.disabled,
if (widget.onChanged == null) MaterialState.disabled,
};
final mouseCursor =
MaterialStateProperty.resolveAs(this.mouseCursor, states) ??
MaterialStateProperty.resolveAs(widget.mouseCursor, states) ??
YaruToggleButtonTheme.of(context)?.mouseCursor?.resolve(states);

return YaruToggleButton(
title: title,
subtitle: subtitle,
contentPadding: contentPadding,
title: widget.title,
subtitle: widget.subtitle,
contentPadding: widget.contentPadding,
leading: YaruSwitch(
value: value,
onChanged: onChanged,
focusNode: focusNode,
autofocus: autofocus,
value: widget.value,
onChanged: widget.onChanged,
focusNode: widget.focusNode,
autofocus: widget.autofocus,
mouseCursor: mouseCursor,
),
mouseCursor:
mouseCursor ?? MaterialStateMouseCursor.clickable.resolve(states),
onToggled: onChanged != null ? () => onChanged!(!value) : null,
onToggled: widget.onChanged != null
? () => widget.onChanged!(!widget.value)
: null,
);
}
}