chore: update from internal (#70)

Update to `b25a469dcd4025fb3f4bb564086eb61ac2edc8dd` feat: Global Header (zebrafed#38) fix: Button update (zebrafed#42) Authored-by: Osman [email protected]
ZebraDevs · May 9, 2024 · 0822d4f · 0822d4f
1 parent ca51b1f
commit 0822d4f
Show file tree

Hide file tree

Showing 15 changed files with 543 additions and 116 deletions.
diff --git a/example/lib/home.dart b/example/lib/home.dart
@@ -16,6 +16,7 @@ import 'package:zeta_example/pages/components/date_input_example.dart';
 import 'package:zeta_example/pages/components/dialog_example.dart';
 import 'package:zeta_example/pages/components/dialpad_example.dart';
 import 'package:zeta_example/pages/components/dropdown_example.dart';
+import 'package:zeta_example/pages/components/global_header_example.dart';
 import 'package:zeta_example/pages/components/filter_selection_example.dart';
 import 'package:zeta_example/pages/components/list_item_example.dart';
 import 'package:zeta_example/pages/components/navigation_bar_example.dart';
@@ -67,6 +68,7 @@ final List<Component> components = [
   Component(NavigationBarExample.name, (context) => const NavigationBarExample()),
   Component(PaginationExample.name, (context) => const PaginationExample()),
   Component(PasswordInputExample.name, (context) => const PasswordInputExample()),
+  Component(GroupHeaderExample.name, (context) => const GroupHeaderExample()),
   Component(DropdownExample.name, (context) => const DropdownExample()),
   Component(ProgressExample.name, (context) => const ProgressExample()),
   Component(SegmentedControlExample.name, (context) => const SegmentedControlExample()),

diff --git a/example/lib/pages/components/global_header_example.dart b/example/lib/pages/components/global_header_example.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:zeta_example/widgets.dart';
+import 'package:zeta_flutter/zeta_flutter.dart';
+
+class GroupHeaderExample extends StatefulWidget {
+  static final name = "GlobalHeader";
+  const GroupHeaderExample({super.key});
+
+  @override
+  State<GroupHeaderExample> createState() => _GroupHeaderExampleState();
+}
+
+class _GroupHeaderExampleState extends State<GroupHeaderExample> {
+  final childrenOne = List.filled(5, ZetaGlobalHeaderItem(label: 'Button'));
+  final childrenTwo = List.filled(10, ZetaGlobalHeaderItem(label: 'Button'));
+
+  @override
+  Widget build(BuildContext context) {
+    return ExampleScaffold(
+      name: "Global Header",
+      child: LayoutBuilder(builder: (context, constraints) {
+        return Center(
+          child: SingleChildScrollView(
+            child: Column(children: [
+              Text(constraints.maxWidth.toString()),
+              ZetaGlobalHeader(
+                title: "Title",
+                tabItems: childrenOne,
+                searchBar: ZetaSearchBar(shape: ZetaWidgetBorder.full, size: ZetaWidgetSize.large),
+                onAppsButton: () {},
+                actionButtons: [
+                  IconButton(
+                    onPressed: () {},
+                    icon: const Icon(
+                      ZetaIcons.alert_round,
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () {},
+                    icon: const Icon(
+                      ZetaIcons.help_round,
+                    ),
+                  ),
+                ],
+                avatar: const ZetaAvatar(initials: 'PS'),
+              ),
+              const SizedBox(
+                height: ZetaSpacing.x5,
+              ),
+              ZetaGlobalHeader(title: "Title", tabItems: childrenTwo),
+            ]),
+          ),
+        );
+      }),
+    );
+  }
+}
diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock
@@ -29,7 +29,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7

diff --git a/example/widgetbook/main.dart b/example/widgetbook/main.dart
@@ -19,6 +19,7 @@ import 'pages/components/date_input_widgetbook.dart';
 import 'pages/components/dial_pad_widgetbook.dart';
 import 'pages/components/dialog_widgetbook.dart';
 import 'pages/components/dropdown_widgetbook.dart';
+import 'pages/components/global_header_widgetbook.dart';
 import 'pages/components/filter_selection_widgetbook.dart';
 import 'pages/components/in_page_banner_widgetbook.dart';
 import 'pages/components/list_item_widgetbook.dart';
@@ -62,14 +63,8 @@ class HotReload extends StatelessWidget {
             WidgetbookComponent(
               name: 'App Bar',
               useCases: [
-                WidgetbookUseCase(
-                  name: 'Default',
-                  builder: (context) => defaultAppBarUseCase(context),
-                ),
-                WidgetbookUseCase(
-                  name: 'Search',
-                  builder: (context) => searchAppBarUseCase(context),
-                ),
+                WidgetbookUseCase(name: 'Default', builder: (context) => defaultAppBarUseCase(context)),
+                WidgetbookUseCase(name: 'Search', builder: (context) => searchAppBarUseCase(context)),
               ],
             ),
             WidgetbookComponent(
@@ -99,11 +94,6 @@ class HotReload extends StatelessWidget {
                 WidgetbookUseCase(name: 'Group Button', builder: (context) => buttonGroupUseCase(context)),
               ],
             ),
-            WidgetbookUseCase(name: 'BreadCrumbs', builder: (context) => breadCrumbsUseCase(context)),
-            WidgetbookUseCase(name: 'Banners', builder: (context) => bannerUseCase(context)),
-            WidgetbookUseCase(name: "Dropdown", builder: (context) => dropdownUseCase(context)),
-            WidgetbookUseCase(name: 'In Page Banners', builder: (context) => inPageBannerUseCase(context)),
-            WidgetbookUseCase(name: 'Accordion', builder: (context) => accordionUseCase(context)),
             WidgetbookComponent(
               name: 'Chips',
               useCases: [
@@ -112,40 +102,36 @@ class HotReload extends StatelessWidget {
                 WidgetbookUseCase(name: 'Assist Chip', builder: (context) => assistChipUseCase(context)),
               ],
             ),
-            WidgetbookUseCase(name: 'Password Input', builder: (context) => passwordInputUseCase(context)),
-            WidgetbookUseCase(name: 'Content', builder: (context) => bottomSheetContentUseCase(context)),
-            WidgetbookUseCase(name: 'Dial Pad', builder: (context) => dialPadUseCase(context)),
-            WidgetbookUseCase(name: 'List Item', builder: (context) => listItemUseCase(context)),
-            WidgetbookUseCase(name: 'Navigation Bar', builder: (context) => navigationBarUseCase(context)),
-            WidgetbookUseCase(name: 'Pagination', builder: (context) => paginationUseCase(context)),
             WidgetbookComponent(
               name: 'Progress',
               useCases: [
                 WidgetbookUseCase(name: 'Bar', builder: (context) => progressBarUseCase(context)),
                 WidgetbookUseCase(name: 'Circle', builder: (context) => progressCircleUseCase(context))
               ],
             ),
+            WidgetbookUseCase(name: 'Accordion', builder: (context) => accordionUseCase(context)),
+            WidgetbookUseCase(name: 'Avatar', builder: (context) => avatarUseCase(context)),
+            WidgetbookUseCase(name: 'BreadCrumbs', builder: (context) => breadCrumbsUseCase(context)),
+            WidgetbookUseCase(name: 'Banners', builder: (context) => bannerUseCase(context)),
+            WidgetbookUseCase(name: 'Checkbox', builder: (context) => checkboxUseCase(context)),
+            WidgetbookUseCase(name: "Dropdown", builder: (context) => dropdownUseCase(context)),
+            WidgetbookUseCase(name: 'In Page Banners', builder: (context) => inPageBannerUseCase(context)),
+            WidgetbookUseCase(name: 'Password Input', builder: (context) => passwordInputUseCase(context)),
+            WidgetbookUseCase(name: 'Content', builder: (context) => bottomSheetContentUseCase(context)),
+            WidgetbookUseCase(name: 'Dial Pad', builder: (context) => dialPadUseCase(context)),
+            WidgetbookUseCase(name: 'Global Header', builder: (context) => globalHeaderUseCase(context)),
+            WidgetbookUseCase(name: 'List Item', builder: (context) => listItemUseCase(context)),
+            WidgetbookUseCase(name: 'Navigation Bar', builder: (context) => navigationBarUseCase(context)),
+            WidgetbookUseCase(name: 'Pagination', builder: (context) => paginationUseCase(context)),
             WidgetbookUseCase(name: 'Radio Button', builder: (context) => radioButtonUseCase(context)),
-            WidgetbookUseCase(
-              name: 'Segmented Control',
-              builder: (context) => segmentedControlUseCase(context),
-            ),
+            WidgetbookUseCase(name: 'Segmented Control', builder: (context) => segmentedControlUseCase(context)),
             WidgetbookUseCase(name: 'Switch', builder: (context) => switchUseCase(context)),
-            WidgetbookUseCase(
-              name: 'Snack Bar',
-              builder: (context) => snackBarUseCase(context),
-            ),
+            WidgetbookUseCase(name: 'Snack Bar', builder: (context) => snackBarUseCase(context)),
             WidgetbookUseCase(name: 'Date Input', builder: (context) => dateInputUseCase(context)),
             WidgetbookUseCase(name: 'Tabs', builder: (context) => tabsUseCase(context)),
             WidgetbookUseCase(name: 'Phone Input', builder: (context) => phoneInputUseCase(context)),
-            WidgetbookUseCase(
-              name: 'Stepper',
-              builder: (context) => stepperUseCase(context),
-            ),
-            WidgetbookUseCase(
-              name: 'Stepper Input',
-              builder: (context) => stepperInputUseCase(context),
-            ),
+            WidgetbookUseCase(name: 'Stepper', builder: (context) => stepperUseCase(context)),
+            WidgetbookUseCase(name: 'Stepper Input', builder: (context) => stepperInputUseCase(context)),
             WidgetbookUseCase(name: 'Dialog', builder: (context) => dialogUseCase(context)),
             WidgetbookUseCase(name: 'Search Bar', builder: (context) => searchBarUseCase(context)),
             WidgetbookUseCase(name: 'Navigation Rail', builder: (context) => navigationRailUseCase(context)),
@@ -177,7 +163,6 @@ class HotReload extends StatelessWidget {
         DeviceFrameAddon(
           devices: [
             Devices.windows.wideMonitor,
-            Devices.macOS.wideMonitor,
             Devices.ios.iPad,
             Devices.ios.iPhone13,
             Zebra.ec30,

diff --git a/example/widgetbook/pages/components/button_widgetbook.dart b/example/widgetbook/pages/components/button_widgetbook.dart
@@ -5,27 +5,34 @@ import 'package:zeta_flutter/zeta_flutter.dart';
 import '../../test/test_components.dart';
 import '../../utils/utils.dart';
 
-Widget buttonUseCase(BuildContext context) => WidgetbookTestWidget(
-      widget: ZetaButton(
-        label: context.knobs.string(label: 'Text', initialValue: 'Button'),
-        onPressed: context.knobs.boolean(label: 'Disabled') ? null : () {},
-        borderType: context.knobs.list(
-          label: 'Border type',
-          labelBuilder: enumLabelBuilder,
-          options: ZetaWidgetBorder.values,
-        ),
-        size: context.knobs.list(
-          label: 'Size',
-          options: ZetaWidgetSize.values,
-          labelBuilder: enumLabelBuilder,
-        ),
-        type: context.knobs.list(
-          label: 'Type',
-          options: ZetaButtonType.values,
-          labelBuilder: enumLabelBuilder,
-        ),
+Widget buttonUseCase(BuildContext context) {
+  final borderType = context.knobs.list(
+    label: 'Border type',
+    labelBuilder: enumLabelBuilder,
+    options: ZetaWidgetBorder.values,
+  );
+  return WidgetbookTestWidget(
+    widget: ZetaButton(
+      label: context.knobs.string(label: 'Text', initialValue: 'Button'),
+      onPressed: context.knobs.boolean(label: 'Disabled') ? null : () {},
+      borderType: borderType,
+      size: context.knobs.list(
+        label: 'Size',
+        options: ZetaWidgetSize.values,
+        labelBuilder: enumLabelBuilder,
       ),
-    );
+      type: context.knobs.list(
+        label: 'Type',
+        options: ZetaButtonType.values,
+        labelBuilder: enumLabelBuilder,
+      ),
+      leadingIcon:
+          iconKnob(context, rounded: borderType != ZetaWidgetBorder.sharp, nullable: true, name: "Leading Icon"),
+      trailingIcon:
+          iconKnob(context, rounded: borderType != ZetaWidgetBorder.sharp, nullable: true, name: "Trailing Icon"),
+    ),
+  );
+}
 
 Widget iconButtonUseCase(BuildContext context) {
   final borderType = context.knobs.list(

diff --git a/example/widgetbook/pages/components/global_header_widgetbook.dart b/example/widgetbook/pages/components/global_header_widgetbook.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:widgetbook/widgetbook.dart';
+import 'package:zeta_flutter/zeta_flutter.dart';
+
+import '../../test/test_components.dart';
+
+Widget globalHeaderUseCase(BuildContext context) {
+  final actionButtons = [
+    IconButton(
+      onPressed: () {},
+      icon: const Icon(
+        ZetaIcons.alert_round,
+      ),
+    ),
+    IconButton(
+      onPressed: () {},
+      icon: const Icon(
+        ZetaIcons.help_round,
+      ),
+    ),
+  ];
+
+  return WidgetbookTestWidget(
+    widget: ZetaGlobalHeader(
+      title: context.knobs.string(label: "Title", initialValue: "Title"),
+      tabItems: List.generate(
+          context.knobs.int.slider(label: "Tabs"), (index) => ZetaGlobalHeaderItem(label: 'Button ${index + 1}')),
+      searchBar: context.knobs.boolean(label: 'Search bar', initialValue: true)
+          ? ZetaSearchBar(shape: ZetaWidgetBorder.full, size: ZetaWidgetSize.large)
+          : null,
+      actionButtons: context.knobs.boolean(label: "Menu buttons", initialValue: true) ? actionButtons : [],
+      avatar: context.knobs.boolean(label: "Show Avatar", initialValue: true)
+          ? const ZetaAvatar(initials: 'PS', size: ZetaAvatarSize.s)
+          : null,
+      onAppsButton: context.knobs.boolean(label: "Apps menu", initialValue: true) ? () => {} : null,
+    ),
+  );
+}
diff --git a/lib/src/components/app_bar/app_bar.dart b/lib/src/components/app_bar/app_bar.dart
@@ -85,6 +85,7 @@ class ZetaAppBar extends StatefulWidget implements PreferredSizeWidget {
       )
       ..add(StringProperty('searchHintText', searchHintText))
       ..add(EnumProperty<ZetaAppBarType>('type', type))
+      ..add(EnumProperty<ZetaAppBarType>('type', type))
       ..add(DoubleProperty('titleSpacing', titleSpacing))
       ..add(DiagnosticsProperty<TextStyle?>('titleTextStyle', titleTextStyle));
   }