Resolve issues

ZebraDevs · Mar 6, 2024 · bb4827f · bb4827f
1 parent 9e0aec2
commit bb4827f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/example/lib/pages/components/button_example.dart b/example/lib/pages/components/button_example.dart
@@ -191,7 +191,7 @@ class _ButtonExampleState extends State<ButtonExample> {
           label: "Label",
         ),
         GroupButton.dropdown(
-          onPress: () {},
+          onPressed: () {},
           label: "Label",
         ),
       ]),
@@ -204,7 +204,7 @@ class _ButtonExampleState extends State<ButtonExample> {
             label: "Label",
           ),
           GroupButton.dropdown(
-            onPress: () {},
+            onPressed: () {},
             label: "Label",
           ),
           GroupButton.icon(
@@ -220,17 +220,17 @@ class _ButtonExampleState extends State<ButtonExample> {
           GroupButton.icon(
             icon: ZetaIcons.star_round,
             label: "Label",
-            onPress: () {},
+            onPressed: () {},
           ),
           GroupButton.icon(
             icon: ZetaIcons.star_round,
             label: "Label",
-            onPress: () {},
+            onPressed: () {},
           ),
           GroupButton.icon(
             icon: ZetaIcons.star_round,
             label: "Label",
-            onPress: () {},
+            onPressed: () {},
           ),
         ],
       ),

diff --git a/example/widgetbook/pages/components/button_widgetbook.dart b/example/widgetbook/pages/components/button_widgetbook.dart
@@ -70,7 +70,7 @@ Widget buttonGroupUseCase(BuildContext context) => WidgetbookTestWidget(
       buttons: [
         GroupButton(
           label: context.knobs.string(label: 'button1Title'),
-          onPress:
+          onPressed:
               context.knobs.boolean(label: 'button1Dropdown') ? () {} : null,
           icon: context.knobs.listOrNull(
             label: 'button1Icon',
@@ -86,7 +86,7 @@ Widget buttonGroupUseCase(BuildContext context) => WidgetbookTestWidget(
         ),
         GroupButton(
           label: context.knobs.string(label: 'button2Title'),
-          onPress:
+          onPressed:
               context.knobs.boolean(label: 'button2Dropdown') ? () {} : null,
           icon: context.knobs.listOrNull(
             label: 'button2Icon',
@@ -102,7 +102,7 @@ Widget buttonGroupUseCase(BuildContext context) => WidgetbookTestWidget(
         ),
         GroupButton(
           label: context.knobs.string(label: 'button3Title'),
-          onPress:
+          onPressed:
               context.knobs.boolean(label: 'button3Dropdown') ? () {} : null,
           icon: context.knobs.listOrNull(
             label: 'button3Icon',

diff --git a/lib/src/components/buttons/button_group.dart b/lib/src/components/buttons/button_group.dart
@@ -43,6 +43,13 @@ class ZetaButtonGroup extends StatelessWidget {
 
     return buttons;
   }
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+    ..add(DiagnosticsProperty<bool>('isLarge', isLarge))
+    ..add(DiagnosticsProperty<bool>('rounded', rounded));
+  }
 }
 
 /// Group Button item
@@ -53,13 +60,13 @@ class GroupButton extends StatefulWidget {
     super.key,
     this.label,
     this.icon,
-    this.onPress,
+    this.onPressed,
   });
 
   /// Constructs dropdown group button
   GroupButton.dropdown({
     super.key,
-    required this.onPress,
+    required this.onPressed,
     this.icon,
     this.label,
   });
@@ -68,7 +75,7 @@ class GroupButton extends StatefulWidget {
   GroupButton.icon({
     super.key,
     required this.icon,
-    this.onPress,
+    this.onPressed,
     this.label,
   });
 
@@ -79,7 +86,7 @@ class GroupButton extends StatefulWidget {
   final IconData? icon;
 
   /// Function for when [GroupButton] is clicked.
-  final VoidCallback? onPress;
+  final VoidCallback? onPressed;
 
   ///If [GroupButton] is large
   bool _isLarge = false;
@@ -102,9 +109,7 @@ class GroupButton extends StatefulWidget {
       key: key,
       label: label,
       icon: icon,
-      onPress: onPress,
-      // isFinal: isFinal ?? this.isFinal,
-      // isInitial: isInitial ?? this.isInitial,
+      onPressed: onPressed,
     );
   }
 
@@ -114,7 +119,7 @@ class GroupButton extends StatefulWidget {
     properties
       ..add(StringProperty('Label', label))
       ..add(DiagnosticsProperty<IconData?>('icon', icon))
-      ..add(ObjectFlagProperty<VoidCallback?>.has('onPress', onPress));
+      ..add(ObjectFlagProperty<VoidCallback?>.has('onPressed', onPressed));
   }
 }
 
@@ -129,11 +134,13 @@ class _GroupButtonState extends State<GroupButton> {
     controller = MaterialStatesController();
   }
 
-  void onPress() {
-    widget.onPress!();
+  void onPressed() {
+    if(widget.onPressed != null){
+      widget.onPressed?.call();
     setState(() {
       selected = !selected;
     });
+    }
   }
 
   @override
@@ -159,15 +166,15 @@ class _GroupButtonState extends State<GroupButton> {
       padding: EdgeInsets.zero,
       child: FilledButton(
         statesController: controller,
-        onPressed: onPress,
+        onPressed: onPressed,
         style: getStyle(borderType, colors),
         child: SelectionContainer.disabled(
           child: Row(
             mainAxisSize: MainAxisSize.min,
             children: [
               if (widget.icon != null) Icon(widget.icon),
               Text(widget.label!),
-              if (widget.onPress != null)
+              if (widget.onPressed != null)
                 const Icon(ZetaIcons.expand_more_round),
             ],
           ).paddingAll(_padding),
@@ -183,6 +190,7 @@ class _GroupButtonState extends State<GroupButton> {
     ZetaColors colors,
     bool finalButton,
   ) {
+    if(selected) return BorderSide(color: colors.black);
     if (states.contains(MaterialState.disabled)) {
       return BorderSide(color: colors.cool.shade40);
     }
@@ -217,7 +225,8 @@ class _GroupButtonState extends State<GroupButton> {
     return ButtonStyle(
       shape: MaterialStateProperty.all(
         RoundedRectangleBorder(
-          borderRadius: borderType.radius,
+          borderRadius: _getRadius(borderType),
+
         ),
       ),
       backgroundColor: MaterialStateProperty.resolveWith<Color?>((states) {

diff --git a/lib/src/components/progress/progress_bar.dart b/lib/src/components/progress/progress_bar.dart
@@ -148,7 +148,7 @@ class _ZetaProgressBarState extends ZetaProgressState<ZetaProgressBar> {
           width: _weight,
           height: _weight,
           decoration: BoxDecoration(
-              color: colors.surfaceDisabled, borderRadius: ZetaRadius.rounded),
+              color: colors.surfaceDisabled, borderRadius: ZetaRadius.rounded,),
         ),
       ],
     );