Add themes and various enhancements to togglables

lib/src/widgets/yaru_checkbox.dart

@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'yaru_check_button.dart';
+import 'yaru_checkbox_theme.dart';
 import 'yaru_radio.dart';
 import 'yaru_switch.dart';
 import 'yaru_togglable.dart';
@@ -106,13 +107,11 @@ class YaruCheckbox extends StatefulWidget implements YaruTogglable<bool?> {
   /// The color to use when this checkbox is checked.
   ///
   /// Defaults to [ColorScheme.primary].
-  @override
   final Color? selectedColor;
 
   /// The color to use for the checkmark when this checkbox is checked.
   ///
   /// Defaults to [ColorScheme.onPrimary].
-  @override
   final Color? checkmarkColor;
 
   @override
@@ -183,7 +182,74 @@ class _YaruCheckboxState extends YaruTogglableState<YaruCheckbox> {
 
   @override
   Widget build(BuildContext context) {
-    return buildToggleable(_YaruCheckboxPainter());
+    final checkboxTheme = YaruCheckboxTheme.of(context);
+    final painter = _YaruCheckboxPainter();
+    fillPainterDefaults(painter);
+
+    const unselectedState = <MaterialState>{};
+    const selectedState = {MaterialState.selected};
+    const disabledState = {MaterialState.disabled};
+    const selectedDisabledState = {
+      MaterialState.selected,
+      MaterialState.disabled
+    };
+
+    // Normal colors
+    final uncheckedColor =
+        checkboxTheme.color?.resolve(unselectedState) ?? painter.uncheckedColor;
+    final uncheckedBorderColor =
+        checkboxTheme.borderColor?.resolve(unselectedState) ??
+            painter.uncheckedBorderColor;
+    final checkedColor = widget.selectedColor ??
+        checkboxTheme.color?.resolve(selectedState) ??
+        painter.checkedColor;
+    final checkedBorderColor =
+        checkboxTheme.borderColor?.resolve(selectedState) ??
+            painter.checkedBorderColor;
+    final checkmarkColor = widget.checkmarkColor ??
+        checkboxTheme.checkmarkColor?.resolve(selectedState) ??
+        painter.checkmarkColor;
+
+    // Disabled colors
+    final disabledUncheckedColor =
+        checkboxTheme.color?.resolve(disabledState) ??
+            painter.disabledUncheckedColor;
+    final disabledUncheckedBorderColor =
+        checkboxTheme.borderColor?.resolve(disabledState) ??
+            painter.disabledUncheckedBorderColor;
+    final disabledCheckedColor =
+        checkboxTheme.color?.resolve(selectedDisabledState) ??
+            painter.disabledCheckedColor;
+    final disabledCheckedBorderColor =
+        checkboxTheme.borderColor?.resolve(selectedDisabledState) ??
+            painter.disabledCheckedBorderColor;
+    final disabledCheckmarkColor =
+        checkboxTheme.checkmarkColor?.resolve(selectedDisabledState) ??
+            painter.disabledCheckmarkColor;
+
+    // Indicator colors
+    final hoverIndicatorColor =
+        checkboxTheme.indicatorColor?.resolve({MaterialState.hovered}) ??
+            painter.hoverIndicatorColor;
+    final focusIndicatorColor =
+        checkboxTheme.indicatorColor?.resolve({MaterialState.focused}) ??
+            painter.focusIndicatorColor;
+
+    return buildToggleable(
+      painter
+        ..uncheckedColor = uncheckedColor
+        ..uncheckedBorderColor = uncheckedBorderColor
+        ..checkedColor = checkedColor
+        ..checkedBorderColor = checkedBorderColor
+        ..checkmarkColor = checkmarkColor
+        ..disabledUncheckedColor = disabledUncheckedColor
+        ..disabledUncheckedBorderColor = disabledUncheckedBorderColor
+        ..disabledCheckedColor = disabledCheckedColor
+        ..disabledCheckedBorderColor = disabledCheckedBorderColor
+        ..disabledCheckmarkColor = disabledCheckmarkColor
+        ..hoverIndicatorColor = hoverIndicatorColor
+        ..focusIndicatorColor = focusIndicatorColor,
+    );
   }
 }
 
@@ -257,8 +323,12 @@ class _YaruCheckboxPainter extends YaruTogglablePainter {
       ),
       Paint()
         ..color = interactive
-            ? Color.lerp(uncheckedBorderColor, checkedColor, t)!
-            : Color.lerp(disabledUncheckedBorderColor, Colors.transparent, t)!
+            ? Color.lerp(uncheckedBorderColor, checkedBorderColor, t)!
+            : Color.lerp(
+                disabledUncheckedBorderColor,
+                disabledCheckedBorderColor,
+                t,
+              )!
         ..style = PaintingStyle.stroke,
     );
   }

lib/src/widgets/yaru_checkbox_theme.dart

@@ -0,0 +1,126 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+@immutable
+class YaruCheckboxThemeData extends ThemeExtension<YaruCheckboxThemeData>
+    with Diagnosticable {
+  const YaruCheckboxThemeData({
+    this.color,
+    this.borderColor,
+    this.checkmarkColor,
+    this.indicatorColor,
+  });
+
+  final MaterialStateProperty<Color?>? color;
+  final MaterialStateProperty<Color?>? borderColor;
+  final MaterialStateProperty<Color?>? checkmarkColor;
+  final MaterialStateProperty<Color?>? indicatorColor;
+
+  @override
+  YaruCheckboxThemeData copyWith({
+    MaterialStateProperty<Color?>? color,
+    MaterialStateProperty<Color?>? borderColor,
+    MaterialStateProperty<Color?>? checkmarkColor,
+    MaterialStateProperty<Color?>? indicatorColor,
+  }) {
+    return YaruCheckboxThemeData(
+      color: color ?? this.color,
+      borderColor: borderColor ?? this.borderColor,
+      checkmarkColor: checkmarkColor ?? this.checkmarkColor,
+      indicatorColor: indicatorColor ?? this.indicatorColor,
+    );
+  }
+
+  @override
+  ThemeExtension<YaruCheckboxThemeData> lerp(
+    ThemeExtension<YaruCheckboxThemeData>? other,
+    double t,
+  ) {
+    final o = other as YaruCheckboxThemeData?;
+    return YaruCheckboxThemeData(
+      color: MaterialStateProperty.lerp<Color?>(
+        color,
+        o?.color,
+        t,
+        Color.lerp,
+      ),
+      borderColor: MaterialStateProperty.lerp<Color?>(
+        borderColor,
+        o?.borderColor,
+        t,
+        Color.lerp,
+      ),
+      checkmarkColor: MaterialStateProperty.lerp<Color?>(
+        checkmarkColor,
+        o?.checkmarkColor,
+        t,
+        Color.lerp,
+      ),
+      indicatorColor: MaterialStateProperty.lerp<Color?>(
+        indicatorColor,
+        o?.indicatorColor,
+        t,
+        Color.lerp,
+      ),
+    );
+  }
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties.add(DiagnosticsProperty('color', color));
+    properties.add(
+      DiagnosticsProperty('borderColor', borderColor),
+    );
+    properties.add(DiagnosticsProperty('checkmarkColor', checkmarkColor));
+    properties.add(DiagnosticsProperty('indicatorColor', indicatorColor));
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is YaruCheckboxThemeData &&
+        other.color == color &&
+        other.borderColor == borderColor &&
+        other.checkmarkColor == checkmarkColor &&
+        other.indicatorColor == indicatorColor;
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(
+      color,
+      borderColor,
+      checkmarkColor,
+      indicatorColor,
+    );
+  }
+}
+
+class YaruCheckboxTheme extends InheritedTheme {
+  const YaruCheckboxTheme({
+    super.key,
+    required this.data,
+    required super.child,
+  });
+
+  final YaruCheckboxThemeData data;
+
+  static YaruCheckboxThemeData of(BuildContext context) {
+    final theme =
+        context.dependOnInheritedWidgetOfExactType<YaruCheckboxTheme>();
+    return theme?.data ??
+        Theme.of(context).extension<YaruCheckboxThemeData>() ??
+        const YaruCheckboxThemeData();
+  }
+
+  @override
+  Widget wrap(BuildContext context, Widget child) {
+    return YaruCheckboxTheme(data: data, child: child);
+  }
+
+  @override
+  bool updateShouldNotify(YaruCheckboxTheme oldWidget) {
+    return data != oldWidget.data;
+  }
+}

lib/src/widgets/yaru_radio.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 
 import 'yaru_checkbox.dart';
 import 'yaru_radio_button.dart';
+import 'yaru_radio_theme.dart';
 import 'yaru_switch.dart';
 import 'yaru_togglable.dart';
 
@@ -116,13 +117,11 @@ class YaruRadio<T> extends StatefulWidget implements YaruTogglable<T?> {
   /// The color to use when this radio is checked.
   ///
   /// Defaults to [ColorScheme.primary].
-  @override
   final Color? selectedColor;
 
   /// The color to use for the checkmark when this radio is checked.
   ///
   /// Defaults to [ColorScheme.onPrimary].
-  @override
   final Color? checkmarkColor;
 
   @override
@@ -184,7 +183,65 @@ class _YaruRadioState<T> extends YaruTogglableState<YaruRadio<T?>> {
 
   @override
   Widget build(BuildContext context) {
-    return buildToggleable(_YaruRadioPainter());
+    final radioTheme = YaruRadioTheme.of(context);
+    final painter = _YaruRadioPainter();
+    fillPainterDefaults(painter);
+
+    const unselectedState = <MaterialState>{};
+    const selectedState = {MaterialState.selected};
+    const disabledState = {MaterialState.disabled};
+    const selectedDisabledState = {
+      MaterialState.selected,
+      MaterialState.disabled
+    };
+
+    // Normal colors
+    final uncheckedColor =
+        radioTheme.color?.resolve(unselectedState) ?? painter.uncheckedColor;
+    final uncheckedBorderColor =
+        radioTheme.borderColor?.resolve(unselectedState) ??
+            painter.uncheckedBorderColor;
+    final checkedColor = widget.selectedColor ??
+        radioTheme.color?.resolve(selectedState) ??
+        painter.checkedColor;
+    final checkmarkColor = widget.checkmarkColor ??
+        radioTheme.checkmarkColor?.resolve(selectedState) ??
+        painter.checkmarkColor;
+
+    // Disabled colors
+    final disabledUncheckedColor = radioTheme.color?.resolve(disabledState) ??
+        painter.disabledUncheckedColor;
+    final disabledUncheckedBorderColor =
+        radioTheme.borderColor?.resolve(disabledState) ??
+            painter.disabledUncheckedBorderColor;
+    final disabledCheckedColor =
+        radioTheme.color?.resolve(selectedDisabledState) ??
+            painter.disabledCheckedColor;
+    final disabledCheckmarkColor =
+        radioTheme.checkmarkColor?.resolve(selectedDisabledState) ??
+            painter.disabledCheckmarkColor;
+
+    // Indicator colors
+    final hoverIndicatorColor =
+        radioTheme.indicatorColor?.resolve({MaterialState.hovered}) ??
+            painter.hoverIndicatorColor;
+    final focusIndicatorColor =
+        radioTheme.indicatorColor?.resolve({MaterialState.focused}) ??
+            painter.focusIndicatorColor;
+
+    return buildToggleable(
+      painter
+        ..uncheckedColor = uncheckedColor
+        ..uncheckedBorderColor = uncheckedBorderColor
+        ..checkedColor = checkedColor
+        ..checkmarkColor = checkmarkColor
+        ..disabledUncheckedColor = disabledUncheckedColor
+        ..disabledUncheckedBorderColor = disabledUncheckedBorderColor
+        ..disabledCheckedColor = disabledCheckedColor
+        ..disabledCheckmarkColor = disabledCheckmarkColor
+        ..hoverIndicatorColor = hoverIndicatorColor
+        ..focusIndicatorColor = focusIndicatorColor,
+    );
   }
 }
 
@@ -226,8 +283,12 @@ class _YaruRadioPainter extends YaruTogglablePainter {
       ),
       Paint()
         ..color = interactive
-            ? Color.lerp(uncheckedBorderColor, checkedColor, t)!
-            : Color.lerp(disabledUncheckedBorderColor, Colors.transparent, t)!
+            ? Color.lerp(uncheckedBorderColor, checkedBorderColor, t)!
+            : Color.lerp(
+                disabledUncheckedBorderColor,
+                disabledCheckedBorderColor,
+                t,
+              )!
         ..style = PaintingStyle.stroke,
     );
   }