chore: Organize files

Author: thelukewalton

example/lib/pages/theme/color_example.dart

@@ -27,9 +27,8 @@ Widget progressBarUseCase(BuildContext context) => WidgetbookScaffold(
 Widget progressCircleUseCase(BuildContext context) => WidgetbookScaffold(
       builder: (context, _) => Column(
         children: [
-          // CircularProgressIndicator(),
           ZetaProgressCircle(
-            // progress: context.knobs.double.slider(label: 'Progress', min: 0, max: 1, initialValue: 0.5).toDouble(),
+            progress: context.knobs.double.slider(label: 'Progress', min: 0, max: 1, initialValue: 0.5).toDouble(),
             size: context.knobs.list(
               initialOption: ZetaCircleSizes.xl,
               label: 'Size',

example/widgetbook/pages/components/progress_widgetbook.dart

@@ -3,7 +3,46 @@ import 'package:path_drawing/path_drawing.dart';
 
 import 'package:zeta_flutter/zeta_flutter.dart';
 
-Widget spacingUseCase(BuildContext context) => SingleChildScrollView(
+Widget spacingUseCase(BuildContext context) {
+  Map<String, double> semanticSpacings = {
+    'none': Zeta.of(context).spacing.none,
+    'minimum': Zeta.of(context).spacing.minimum,
+    'small': Zeta.of(context).spacing.small,
+    'medium': Zeta.of(context).spacing.medium,
+    'large': Zeta.of(context).spacing.large,
+    'xl': Zeta.of(context).spacing.xl,
+    '2xl': Zeta.of(context).spacing.xl_2,
+    '3xl': Zeta.of(context).spacing.xl_3,
+    '4xl': Zeta.of(context).spacing.xl_4,
+    '5xl': Zeta.of(context).spacing.xl_5,
+    '6xl': Zeta.of(context).spacing.xl_6,
+    '7xl': Zeta.of(context).spacing.xl_7,
+    '8xl': Zeta.of(context).spacing.xl_8,
+    '9xl': Zeta.of(context).spacing.xl_9,
+    '10xl': Zeta.of(context).spacing.xl_10,
+    '11xl': Zeta.of(context).spacing.xl_11,
+  };
+  Map<String, double> baseSpacings = {
+    'x1': Zeta.of(context).spacing.primitives.x1,
+    'x2': Zeta.of(context).spacing.primitives.x2,
+    'x3': Zeta.of(context).spacing.primitives.x3,
+    'x4': Zeta.of(context).spacing.primitives.x4,
+    'x5': Zeta.of(context).spacing.primitives.x5,
+    'x6': Zeta.of(context).spacing.primitives.x6,
+    'x7': Zeta.of(context).spacing.primitives.x7,
+    'x8': Zeta.of(context).spacing.primitives.x8,
+    'x9': Zeta.of(context).spacing.primitives.x9,
+    'x10': Zeta.of(context).spacing.primitives.x10,
+    'x11': Zeta.of(context).spacing.primitives.x11,
+    'x12': Zeta.of(context).spacing.primitives.x12,
+    'x13': Zeta.of(context).spacing.primitives.x13,
+    'x14': Zeta.of(context).spacing.primitives.x14,
+    'x15': Zeta.of(context).spacing.primitives.x15,
+  };
+
+  return SingleChildScrollView(
+    child: SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -17,46 +56,9 @@ Widget spacingUseCase(BuildContext context) => SingleChildScrollView(
           )
         ],
       ),
-    );
-
-Map<String, double> semanticSpacings = {
-  // 'none': Zeta.of(context).spacing.none,
-  // 'minimum': Zeta.of(context).spacing.minimum,
-  // 'small': Zeta.of(context).spacing.small,
-  // 'medium': Zeta.of(context).spacing.medium,
-  // 'large': Zeta.of(context).spacing.large,
-  // 'xl': Zeta.of(context).spacing.xl,
-  // '2xl': Zeta.of(context).spacing.xl_2,
-  // '3xl': Zeta.of(context).spacing.xl_3,
-  // '4xl': Zeta.of(context).spacing.xl_4,
-  // '5xl': Zeta.of(context).spacing.xl_5,
-  // '6xl': Zeta.of(context).spacing.xl_6,
-  // '7xl': Zeta.of(context).spacing.xl_7,
-  // '8xl': Zeta.of(context).spacing.xl_8,
-  // '9xl': Zeta.of(context).spacing.xl_9,
-  // '10xl': Zeta.of(context).spacing.xl_10,
-  // '11xl': Zeta.of(context).spacing.xl_11,
-};
-Map<String, double> baseSpacings = {
-  // 'x1': ZetaSpacingBase.x1,
-  // 'x2': ZetaSpacingBase.x2,
-  // 'x3': ZetaSpacingBase.x3,
-  // 'x3.5': ZetaSpacingBase.x3_5,
-  // 'x4': ZetaSpacingBase.x4,
-  // 'x5': ZetaSpacingBase.x5,
-  // 'x6': ZetaSpacingBase.x6,
-  // 'x7': ZetaSpacingBase.x7,
-  // 'x8': ZetaSpacingBase.x8,
-  // 'x9': ZetaSpacingBase.x9,
-  // 'x10': ZetaSpacingBase.x10,
-  // 'x11': ZetaSpacingBase.x11,
-  // 'x12': ZetaSpacingBase.x12,
-  // 'x13': ZetaSpacingBase.x13,
-  // 'x14': ZetaSpacingBase.x14,
-  // 'x15': ZetaSpacingBase.x15,
-  // 'x30': ZetaSpacingBase.x30,
-  // 'x50': ZetaSpacingBase.x50,
-};
+    ),
+  );
+}
 
 class _SpacingDemo extends StatelessWidget {
   final MapEntry<String, double> size;

example/widgetbook/pages/theme/spacing_widgetbook.dart

@@ -1,3 +1,3 @@
-// export 'icons/icons.dart';
+export 'icons/icons.dart';
 export 'tokens/primitives.g.dart';
 export 'tokens/semantics.g.dart';

lib/src/assets/flags/ad.png renamed to lib/assets/flags/ad.png

@@ -1,17 +1,25 @@
-// ignore_for_file: public_member_api_docs, constant_identifier_names
+// ignore_for_file: constant_identifier_names
 import 'package:flutter/material.dart';
 
 // This file is automatically generated by the zeta-icons repository
 // DO NOT MODIFY
 
+/// Current version of Zeta Icons
 const zetaIconsVersion = '0.5.3';
 
 /// Zeta Icons. Full list of icons can be found at [Zeta Icons](https://zeta-icons.web.app/).
 /// {@category Assets}
-abstract class ZetaIcons {
+abstract final class ZetaIcons {
+  /// Default icon font name
   static const String family = 'zeta-icons';
+
+  /// Icon font name for round icons
   static const String familyRound = 'zeta-icons-round';
+
+  /// Icon font name for sharp icons
   static const String familySharp = 'zeta-icons-sharp';
+
+  /// Package name for zeta flutter
   static const String package = 'zeta_flutter';
 
   // Icons

lib/src/assets/flags/ae.png renamed to lib/assets/flags/ae.png

@@ -323,7 +323,7 @@ extension on ZetaAvatarSize {
       case ZetaAvatarSize.xs:
       case ZetaAvatarSize.xxs:
       case ZetaAvatarSize.xxxs:
-        return Zeta.of(context).spacing.minimum / 2; //2dp
+        return ZetaBorders.borderWidth;
     }
   }
 

lib/src/assets/flags/af.png renamed to lib/assets/flags/af.png

@@ -113,7 +113,10 @@ class ZetaIndicator extends ZetaStatelessWidget {
         width: sizePixels + Zeta.of(context).spacing.minimum,
         height: sizePixels + Zeta.of(context).spacing.minimum,
         decoration: BoxDecoration(
-          border: Border.fromBorderSide(ZetaBorderTemp.indicatorBorder(context)),
+          border: Border.all(
+            width: ZetaBorders.borderWidth,
+            color: Zeta.of(context).colors.border.pure,
+          ),
           color: (inverse ? foregroundColor : Colors.transparent),
           borderRadius: Zeta.of(context).radii.full,
         ),

lib/src/assets/flags/ag.png renamed to lib/assets/flags/ag.png

@@ -122,7 +122,6 @@ class ZetaPriorityPill extends ZetaStatelessWidget {
     final Color badgeColor = customColor?.shade60 ?? type.badgeColor(context);
     final Color lozengeColor = customColor?.shade10 ?? type.lozengeColor(context);
 
-    // final ZetaColorSwatch color = customColor ?? type.color(context);
     final size = this.size == ZetaPriorityPillSize.small ? Zeta.of(context).spacing.xl : Zeta.of(context).spacing.xl_3;
     final label = (this.label ?? priority) ?? type.name.capitalize();
     final rounded = context.rounded;

lib/src/assets/flags/ai.png renamed to lib/assets/flags/ai.png

@@ -36,11 +36,11 @@ class ZetaStatusLabel extends ZetaStatelessWidget {
   Widget build(BuildContext context) {
     final colors = Zeta.of(context).colors;
 
-    // final Color colors = status.colorSwatch(context);
     final Color backgroundColor = status.backgroundColor(colors);
     final Color borderColor = status.borderColor(colors);
     final Color iconColor = status.foregroundColor(colors);
     final Color textColor = colors.main.defaultColor;
+
     return Semantics(
       value: semanticLabel ?? label,
       child: DecoratedBox(

lib/src/assets/flags/al.png renamed to lib/assets/flags/al.png

@@ -320,7 +320,7 @@ class _BreadCrumbsTruncatedState extends State<_BreadCrumbsTruncated> {
                 ),
                 side: WidgetStateProperty.resolveWith((states) {
                   if (states.contains(WidgetState.focused)) {
-                    return ZetaBorderTemp.focusBorder(context);
+                    return ZetaBorders.focusBorder(context);
                   }
                   if (states.contains(WidgetState.hovered)) {
                     return BorderSide(color: colors.border.hover, width: 0.5);

lib/src/assets/flags/am.png renamed to lib/assets/flags/am.png

@@ -239,7 +239,7 @@ class _ZetaGroupButtonState extends State<ZetaGroupButton> {
   ) {
     // TODO(UX-1200): Focus border does not work as expected.
     if (_controller.value.contains(WidgetState.focused)) {
-      return ZetaBorderTemp.focusBorder(context);
+      return ZetaBorders.focusBorder(context);
     }
     if (_controller.value.contains(WidgetState.disabled)) {
       return BorderSide(color: colors.border.disabled);

lib/src/assets/flags/an.png renamed to lib/assets/flags/an.png

@@ -119,7 +119,6 @@ ButtonStyle buttonStyle(
   BuildContext context,
 ) {
   final ZetaColorSemantics colors = Zeta.of(context).colors;
-  // final Color color = backgroundColor != null ? ZetaColorSwatch.fromColor(backgroundColor) : type.color(colors);
   final Color backgroundColor = type.backgroundColor(colors);
   final Color backgroundColorHover = type.hoverColor(colors);
   final Color backgroundColorPressed = type.pressedColor(colors);
@@ -171,7 +170,7 @@ ButtonStyle buttonStyle(
       }
       // TODO(UX-1134): This removes a defualt border when focused, rather than adding a second border when focused.
       if (states.contains(WidgetState.focused)) {
-        return ZetaBorderTemp.focusBorder(context);
+        return ZetaBorders.focusBorder(context);
       }
       if (type.border) {
         return BorderSide(

lib/src/assets/flags/ao.png renamed to lib/assets/flags/ao.png

@@ -227,7 +227,7 @@ class _ZetaChipState extends State<ZetaChip> {
                       ? colors.border.primary
                       : colors.border.defaultColor,
                   width: _controller.value.contains(WidgetState.focused)
-                      ? ZetaBorderTemp.borderWidth
+                      ? ZetaBorders.borderWidth
                       : !selected
                           ? 1
                           : 0,

lib/src/assets/flags/aq.png renamed to lib/assets/flags/aq.png

@@ -140,7 +140,7 @@ class _ZetaFABState extends State<ZetaFAB> {
           (Set<WidgetState> states) {
             if (states.contains(WidgetState.focused)) {
               // TODO(UX-1134): This removes a defualt border when focused, rather than adding a second border when focused.
-              return ZetaBorderTemp.focusBorder(context);
+              return ZetaBorders.focusBorder(context);
             }
             return null;
           },

lib/src/assets/flags/ar.png renamed to lib/assets/flags/ar.png

@@ -139,12 +139,11 @@ class _ZetaNavigationRailItemContent extends ZetaStatelessWidget {
   final EdgeInsets? padding;
   final bool? wordWrap;
 
+  // TODO(UX-1173): No hover state for navigation rail items
   @override
   Widget build(BuildContext context) {
     final zeta = Zeta.of(context);
 
-    // TODO(thelukewalton): No hover state for navigation rail items
-
     final Color foregroundColor = disabled
         ? zeta.colors.main.disabled
         : selected

lib/src/assets/flags/as.png renamed to lib/assets/flags/as.png

@@ -109,7 +109,7 @@ class _ZetaRadioState<T> extends State<ZetaRadio<T>> with TickerProviderStateMix
                           color: states.contains(WidgetState.disabled)
                               ? zetaColors.main.disabled
                               : zetaColors.main.defaultColor,
-                          height: 1.33,
+                          height: 4 / 3,
                         ),
                         child: widget.label!,
                       ).paddingEnd(Zeta.of(context).spacing.minimum),
@@ -175,7 +175,7 @@ class _RadioPainter extends ToggleablePainter {
     final Paint paint = Paint()
       ..color = colors.surface.primary
       ..style = PaintingStyle.stroke
-      ..strokeWidth = Zeta.of(context).spacing.small + ZetaBorderTemp.borderWidth;
+      ..strokeWidth = Zeta.of(context).spacing.small + ZetaBorders.borderWidth;
     if (isFocused) canvas.drawCircle(center, _kInnerRadius, paint);
 
     // Outer circle
@@ -186,7 +186,7 @@ class _RadioPainter extends ToggleablePainter {
               ? inactiveColor
               : activeColor
       ..style = PaintingStyle.stroke
-      ..strokeWidth = ZetaBorderTemp.borderWidth;
+      ..strokeWidth = ZetaBorders.borderWidth;
     canvas.drawCircle(center, _kOuterRadius, paint);
 
     // Inner circle

lib/src/assets/flags/at.png renamed to lib/assets/flags/at.png

@@ -309,7 +309,7 @@ class _ZetaStepperState extends State<ZetaStepper> with TickerProviderStateMixin
                           right: Zeta.of(context).spacing.large,
                           left: Zeta.of(context).spacing.large,
                         ),
-                        height: ZetaBorderTemp.borderWidth,
+                        height: ZetaBorders.borderWidth,
                         decoration: BoxDecoration(
                           borderRadius: Zeta.of(context).radii.full,
                           color: getLineColor(index),

lib/src/assets/flags/au.png renamed to lib/assets/flags/au.png

@@ -279,12 +279,12 @@ class InternalTextInputState extends State<InternalTextInput> {
       );
 
   OutlineInputBorder _focusedBorder(bool rounded) => _baseBorder(rounded).copyWith(
-        borderSide: ZetaBorderTemp.focusBorder(context),
+        borderSide: ZetaBorders.focusBorder(context),
       );
   OutlineInputBorder _errorBorder(bool rounded) => _baseBorder(rounded).copyWith(
         borderSide: BorderSide(
           color: _colors.border.negative,
-          width: ZetaBorderTemp.borderWidth,
+          width: ZetaBorders.borderWidth,
         ),
       );
 

lib/src/assets/flags/aw.png renamed to lib/assets/flags/aw.png

@@ -182,7 +182,7 @@ class _ZetaTopAppBarState extends State<ZetaTopAppBar> {
                   if (widget.onSearchMicrophoneIconPressed != null) ...[
                     SizedBox(
                       height: Zeta.of(context).spacing.xl_2,
-                      child: VerticalDivider(width: ZetaBorderTemp.borderWidth, color: colors.main.subtle),
+                      child: VerticalDivider(width: ZetaBorders.borderWidth, color: colors.main.subtle),
                     ),
                     IconButton(
                       onPressed: widget.onSearchMicrophoneIconPressed,

lib/src/assets/flags/ax.png renamed to lib/assets/flags/ax.png

@@ -16,13 +16,13 @@ class ZetaPureColorSwatch extends ColorSwatch<int> with EquatableMixin {
   }) : super(primary, swatch);
 
   /// Lightest shade of the color.
-  Color get shade0 => this[0]!;
+  Color get shade0 => this[0] ?? Colors.white;
 
   /// Medium shade of the color.
-  Color get shade500 => this[0]!;
+  Color get shade500 => this[500] ?? Colors.grey;
 
   /// Darkest shade of the color.
-  Color get shade1000 => this[0]!;
+  Color get shade1000 => this[1000] ?? Colors.white;
 
   @override
   List<Object?> get props => [super.value, shade0, shade500, shade1000];

lib/src/assets/flags/az.png renamed to lib/assets/flags/az.png

@@ -313,19 +313,13 @@ class ZetaAnimationLength {
 
 /// Temporary class to hold border values.
 // TODO(Tokens): Remove this class and design / develop  Zeta.of(context).border instead.
-class ZetaBorderTemp {
+class ZetaBorders {
   /// Border width
   static double get borderWidth => 2;
 
-  /// Indicator Border
-  static BorderSide indicatorBorder(BuildContext context) => BorderSide(
-        width: Zeta.of(context).spacing.minimum / 2,
-        color: Zeta.of(context).colors.border.pure,
-      );
-
   /// Border applied when the widget is focused.
   static BorderSide focusBorder(BuildContext context) => BorderSide(
+        width: ZetaBorders.borderWidth,
         color: Zeta.of(context).colors.border.primary,
-        width: Zeta.of(context).spacing.minimum / 2,
       );
 }

lib/src/assets/flags/ba.png renamed to lib/assets/flags/ba.png

@@ -149,6 +149,8 @@ class ZetaProvider extends StatefulWidget with Diagnosticable {
 /// The state associated with [ZetaProvider].
 /// {@category Utils}
 class ZetaProviderState extends State<ZetaProvider> with Diagnosticable, WidgetsBindingObserver {
+  bool _gotTheme = false;
+
   // Fields for ZetaThemeManager.
 
   /// Represents the late initialization of the ZetaContrast value.
@@ -223,6 +225,9 @@ class ZetaProviderState extends State<ZetaProvider> with Diagnosticable, Widgets
 
     // Apply the initial contrast to the theme data.
     _zetaThemeData = widget.initialZetaThemeData.apply(contrast: _contrast);
+
+    // Ensure this is only triggered once.
+    _gotTheme = true;
   }
 
   /// Clean up function to be called when this object is removed from the tree.
@@ -272,7 +277,7 @@ class ZetaProviderState extends State<ZetaProvider> with Diagnosticable, Widgets
 
   @override
   Widget build(BuildContext context) {
-    if (widget.initialContrast != null && widget.initialThemeMode != null) {
+    if ((widget.initialContrast != null && widget.initialThemeMode != null) || _gotTheme) {
       return _getChild();
     }
     return FutureBuilder<dynamic>(
@@ -282,6 +287,7 @@ class ZetaProviderState extends State<ZetaProvider> with Diagnosticable, Widgets
         if (snapshot.connectionState == ConnectionState.waiting) {
           return const Center(child: CircularProgressIndicator());
         }
+
         return _getChild();
       },
     );

lib/src/assets/flags/bb.png renamed to lib/assets/flags/bb.png

@@ -2,7 +2,6 @@
 library zeta_flutter;
 
 export 'generated/generated.dart';
-export 'src/assets/assets.dart';
 export 'src/components/components.dart';
 export 'src/temp_colors.dart';
 export 'src/theme/theme.dart';