checkbox

conceptadev · Nov 14, 2024 · 5995f55 · 5995f55
1 parent ef1d96c
commit 5995f55
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 31 deletions.
diff --git a/packages/remix/lib/src/components/checkbox/checkbox.dart b/packages/remix/lib/src/components/checkbox/checkbox.dart
@@ -14,7 +14,7 @@ part 'checkbox_widget.dart';
 @MixableSpec()
 base class CheckboxSpec extends Spec<CheckboxSpec>
     with _$CheckboxSpec, Diagnosticable {
-  final FlexSpec layout;
+  final FlexBoxSpec flexContainer;
   final BoxSpec indicatorContainer;
   final IconSpec indicatorIcon;
   final TextSpec label;
@@ -27,13 +27,13 @@ base class CheckboxSpec extends Spec<CheckboxSpec>
   const CheckboxSpec({
     BoxSpec? indicatorContainer,
     IconSpec? indicatorIcon,
-    FlexSpec? layout,
+    FlexBoxSpec? flexContainer,
     TextSpec? label,
     super.modifiers,
     super.animated,
   })  : indicatorContainer = indicatorContainer ?? const BoxSpec(),
         indicatorIcon = indicatorIcon ?? const IconSpec(),
-        layout = layout ?? const FlexSpec(),
+        flexContainer = flexContainer ?? const FlexBoxSpec(),
         label = label ?? const TextSpec();
 
   @override

diff --git a/packages/remix/lib/src/components/checkbox/checkbox.g.dart b/packages/remix/lib/src/components/checkbox/checkbox.g.dart
diff --git a/packages/remix/lib/src/components/checkbox/checkbox_style.dart b/packages/remix/lib/src/components/checkbox/checkbox_style.dart
@@ -31,7 +31,7 @@ class CheckboxStyle extends SpecStyle<CheckboxSpecUtility> {
       ..style.fontWeight.w500()
       ..textHeightBehavior.heightToFirstAscent.off();
 
-    final layoutStyle = $.layout.chain
+    final flexContainerStyle = $.flexContainer.flex.chain
       ..crossAxisAlignment.center()
       ..mainAxisAlignment.start()
       ..mainAxisSize.min()
@@ -47,7 +47,7 @@ class CheckboxStyle extends SpecStyle<CheckboxSpecUtility> {
       ...containerStyle,
       ...indicatorStyle,
       labelStyle,
-      layoutStyle,
+      flexContainerStyle,
       disabledStyle,
     ]);
   }
@@ -64,6 +64,7 @@ class CheckboxDarkStyle extends CheckboxStyle {
       super.makeStyle(spec).call(),
       $.indicatorContainer.border.all.color.white(),
       $.indicatorIcon.color.black(),
+      $.label.style.color.white(),
       spec.on.selected(
         $.indicatorContainer.color.white(),
         $.indicatorIcon.color.black(),

diff --git a/packages/remix/lib/src/components/checkbox/checkbox_theme.dart b/packages/remix/lib/src/components/checkbox/checkbox_theme.dart
@@ -13,17 +13,12 @@ class FortalezaCheckboxStyle extends CheckboxStyle {
 
     final baseStyle = super.makeStyle(spec);
     final baseOverrides = Style(
+      $.indicatorIcon.wrap.scale(0.5),
       $.indicatorContainer.chain
         ..border.all.width(0)
         ..border.all.style.none(),
-      $.indicatorContainer.chain
-        ..wrap.opacity(0)
-        ..wrap.scale(0.5),
       $.label.style.color.$neutral(12),
-      spec.on.selected(
-        $.indicatorContainer.wrap.opacity(1),
-        $.indicatorContainer.wrap.scale(1),
-      ),
+      spec.on.selected($.indicatorIcon.wrap.scale(0.9)),
     );
 
     final surfaceVariant = Style(

diff --git a/packages/remix/lib/src/components/checkbox/checkbox_widget.dart b/packages/remix/lib/src/components/checkbox/checkbox_widget.dart
@@ -93,11 +93,11 @@ class _CheckboxState extends State<Checkbox> {
         builder: (context) {
           final spec = CheckboxSpec.of(context);
 
+          final FlexContainerLayout = spec.flexContainer;
           final ContainerWidget = spec.indicatorContainer;
-          final ContainerLayout = spec.layout;
           final IconWidget = spec.indicatorIcon;
 
-          return ContainerLayout(
+          return FlexContainerLayout(
             direction: Axis.horizontal,
             children: [
               ContainerWidget(