diff --git a/lib/src/Toggles/Checkbox/checkbox.toggle.dart b/lib/src/Toggles/Checkbox/checkbox.toggle.dart index 5f6ad5a..0737ce3 100644 --- a/lib/src/Toggles/Checkbox/checkbox.toggle.dart +++ b/lib/src/Toggles/Checkbox/checkbox.toggle.dart @@ -5,7 +5,6 @@ //s2 CORE import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; -import 'dart:ui' as ui; //s2 3RD-PARTY // @@ -28,7 +27,7 @@ class AstromicCheckboxToggle extends StatefulWidget { //s1 -- Configuration final bool? isEnabled; final bool? isLabelTapable; - final ui.TextDirection textDirection; + final TextDirection textDirection; //s1 -- Style final double? itemSize; final double? labelSpacing; @@ -47,7 +46,7 @@ class AstromicCheckboxToggle extends StatefulWidget { //s1 -- Configuration this.isEnabled = true, this.isLabelTapable = true, - this.textDirection = ui.TextDirection.ltr, + this.textDirection = TextDirection.ltr, //s1 -- Style this.itemSize = 24, this.labelSpacing = 6, @@ -142,12 +141,12 @@ class _AstromicCheckboxToggleState extends State { SizedBox( width: widget.itemSize, height: widget.itemSize, - child: widget.itemBuilder(isChecked, widget.isEnabled!, () => _onTap), + child: widget.itemBuilder(isChecked, widget.isEnabled!, () => _onTap()), ), //S1 -- Label Spacing if (widget.labelBuilder != null) SizedBox(width: widget.labelSpacing), //S1 -- Label - if (widget.labelBuilder != null) widget.labelBuilder!(isChecked, widget.isEnabled!, () => _onTap), + if (widget.labelBuilder != null) widget.labelBuilder!(isChecked, widget.isEnabled!, () => _onTap()), ], ), ); diff --git a/lib/src/Toggles/toggles.astromic.dart b/lib/src/Toggles/toggles.astromic.dart index 53989d3..194aac4 100644 --- a/lib/src/Toggles/toggles.astromic.dart +++ b/lib/src/Toggles/toggles.astromic.dart @@ -25,11 +25,11 @@ class AstromicToggles { stateVariable: stateVariable, initialState: initialState, onStateChanged: onStateChanged, - isEnabled: isEnabled, - isLabelTapable: isLabelTapable, + isEnabled: isEnabled ?? true, + isLabelTapable: isLabelTapable ?? true, textDirection: textDirection ?? TextDirection.ltr, - itemSize: itemSize, - labelSpacing: labelSpacing, + itemSize: itemSize ?? 24.0, + labelSpacing: labelSpacing ?? 8.0, itemBuilder: itemBuilder, labelBuilder: labelBuilder, );