Improve togglable widget style (#402)

* Improve togglable widget style

Fixes #377

* Update goldens

* Adjustements

* Fix analysing

* Update goldens

lib/src/controls/yaru_checkbox.dart

@@ -199,9 +199,26 @@ class _YaruCheckboxPainter extends YaruTogglablePainter {
       Paint()
         ..color = interactive
             ? Color.lerp(uncheckedColor, checkedColor, t)!
-            : Color.lerp(uncheckedDisabledColor, checkedDisabledColor, t)!
+            : Color.lerp(disabledUncheckedColor, disabledCheckedColor, t)!
         ..style = PaintingStyle.fill,
     );
+
+    canvas.drawRRect(
+      RRect.fromRectAndRadius(
+        Rect.fromLTWH(
+          origin.dx + 0.5,
+          origin.dy + 0.5,
+          size.width - 1.0,
+          size.height - 1.0,
+        ),
+        _kCheckboxBorderRadius,
+      ),
+      Paint()
+        ..color = interactive
+            ? Color.lerp(uncheckedBorderColor, checkedColor, t)!
+            : Color.lerp(disabledUncheckedBorderColor, Colors.transparent, t)!
+        ..style = PaintingStyle.stroke,
+    );
   }
 
   void _drawCheckMark(Canvas canvas, Size size, Offset origin, double t) {
@@ -252,7 +269,7 @@ class _YaruCheckboxPainter extends YaruTogglablePainter {
 
   Paint _getCheckmarkPaint() {
     return Paint()
-      ..color = interactive ? checkmarkColor : checkmarkDisabledColor
+      ..color = interactive ? checkmarkColor : disabledCheckmarkColor
       ..style = PaintingStyle.stroke
       ..strokeWidth = _kCheckboxDashStroke;
   }

lib/src/controls/yaru_radio.dart

@@ -175,9 +175,23 @@ class _YaruRadioPainter extends YaruTogglablePainter {
       Paint()
         ..color = interactive
             ? Color.lerp(uncheckedColor, checkedColor, t)!
-            : Color.lerp(uncheckedDisabledColor, checkedDisabledColor, t)!
+            : Color.lerp(disabledUncheckedColor, disabledCheckedColor, t)!
         ..style = PaintingStyle.fill,
     );
+
+    canvas.drawOval(
+      Rect.fromLTWH(
+        origin.dx + 0.5,
+        origin.dy + 0.5,
+        size.width - 1.0,
+        size.height - 1.0,
+      ),
+      Paint()
+        ..color = interactive
+            ? Color.lerp(uncheckedBorderColor, checkedColor, t)!
+            : Color.lerp(disabledUncheckedBorderColor, Colors.transparent, t)!
+        ..style = PaintingStyle.stroke,
+    );
   }
 
   void _drawDot(Canvas canvas, Size size, Offset origin, double t) {
@@ -191,7 +205,7 @@ class _YaruRadioPainter extends YaruTogglablePainter {
         height: dotSize.height * t,
       ),
       Paint()
-        ..color = interactive ? checkmarkColor : checkmarkDisabledColor
+        ..color = interactive ? checkmarkColor : disabledCheckmarkColor
         ..style = PaintingStyle.fill,
     );
   }

lib/src/controls/yaru_switch.dart

@@ -111,11 +111,26 @@ class _YaruSwitchState extends YaruTogglableState<YaruSwitch> {
 
   @override
   Widget build(BuildContext context) {
-    return buildToggleable(_YaruSwitchPainter());
+    final colorScheme = Theme.of(context).colorScheme;
+
+    final uncheckedSwitchColor = colorScheme.onSurface.withOpacity(.25);
+    const uncheckedDotColor = Colors.white;
+    final disabledDotColor = colorScheme.onSurface.withOpacity(.4);
+
+    return buildToggleable(
+      _YaruSwitchPainter()
+        ..uncheckedSwitchColor = uncheckedSwitchColor
+        ..uncheckedDotColor = uncheckedDotColor
+        ..disabledDotColor = disabledDotColor,
+    );
   }
 }
 
 class _YaruSwitchPainter extends YaruTogglablePainter {
+  late Color uncheckedSwitchColor;
+  late Color uncheckedDotColor;
+  late Color disabledDotColor;
+
   @override
   void paintTogglable(
     Canvas canvas,
@@ -136,8 +151,8 @@ class _YaruSwitchPainter extends YaruTogglablePainter {
       ),
       Paint()
         ..color = interactive
-            ? Color.lerp(uncheckedColor, checkedColor, t)!
-            : Color.lerp(uncheckedDisabledColor, checkedDisabledColor, t)!
+            ? Color.lerp(uncheckedSwitchColor, checkedColor, t)!
+            : Color.lerp(disabledUncheckedColor, disabledCheckedColor, t)!
         ..style = PaintingStyle.fill,
     );
   }
@@ -155,7 +170,9 @@ class _YaruSwitchPainter extends YaruTogglablePainter {
     final center = Offset.lerp(start, end, t)! + origin;
 
     final paint = Paint()
-      ..color = interactive ? checkmarkColor : checkmarkDisabledColor
+      ..color = interactive
+          ? Color.lerp(uncheckedDotColor, checkmarkColor, t)!
+          : disabledDotColor
       ..style = PaintingStyle.fill;
 
     drawStateIndicator(canvas, size, center);

lib/src/controls/yaru_togglable.dart

@@ -233,12 +233,14 @@ abstract class YaruTogglableState<S extends YaruTogglable> extends State<S>
     final colorScheme = Theme.of(context).colorScheme;
 
     // Normal colors
-    final uncheckedColor = colorScheme.onSurface.withOpacity(.3);
+    const uncheckedColor = Colors.transparent;
+    final uncheckedBorderColor = colorScheme.onSurface.withOpacity(.25);
     final checkedColor = colorScheme.primary;
     final checkmarkColor = colorScheme.onPrimary;
 
     // Disabled colors
     final uncheckedDisabledColor = colorScheme.onSurface.withOpacity(.1);
+    final uncheckedDisabledBorderColor = colorScheme.onSurface.withOpacity(.1);
     final checkedDisabledColor = colorScheme.onSurface.withOpacity(.2);
     final checkmarkDisabledColor = colorScheme.onSurface.withOpacity(.5);
 
@@ -266,11 +268,13 @@ abstract class YaruTogglableState<S extends YaruTogglable> extends State<S>
                 ..sizePosition = _sizePosition
                 ..indicatorPosition = _indicatorPosition
                 ..uncheckedColor = uncheckedColor
+                ..uncheckedBorderColor = uncheckedBorderColor
                 ..checkedColor = checkedColor
                 ..checkmarkColor = checkmarkColor
-                ..uncheckedDisabledColor = uncheckedDisabledColor
-                ..checkedDisabledColor = checkedDisabledColor
-                ..checkmarkDisabledColor = checkmarkDisabledColor
+                ..disabledUncheckedColor = uncheckedDisabledColor
+                ..disabledUncheckedBorderColor = uncheckedDisabledBorderColor
+                ..disabledCheckedColor = checkedDisabledColor
+                ..disabledCheckmarkColor = checkmarkDisabledColor
                 ..hoverIndicatorColor = hoverIndicatorColor
                 ..focusIndicatorColor = focusIndicatorColor,
             ),
@@ -291,11 +295,15 @@ abstract class YaruTogglablePainter extends ChangeNotifier
   late bool? oldChecked;
 
   late Color uncheckedColor;
+  late Color uncheckedBorderColor;
   late Color checkedColor;
   late Color checkmarkColor;
-  late Color uncheckedDisabledColor;
-  late Color checkedDisabledColor;
-  late Color checkmarkDisabledColor;
+
+  late Color disabledUncheckedColor;
+  late Color disabledUncheckedBorderColor;
+  late Color disabledCheckedColor;
+  late Color disabledCheckmarkColor;
+
   late Color hoverIndicatorColor;
   late Color focusIndicatorColor;