fix: [MDS-508] Props check and ordering

lib/src/theme/accordion/accordion_item_properties.dart

@@ -6,20 +6,20 @@ import 'package:moon_design/src/theme/borders.dart';
 @immutable
 class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProperties> with DiagnosticableTreeMixin {
   static final properties = MoonAccordionItemProperties(
+    borderRadius: MoonBorders.borders.interactiveSm,
     transitionDuration: const Duration(milliseconds: 200),
     transitionCurve: Curves.easeInOutCubic,
-    borderRadius: MoonBorders.borders.interactiveSm,
   );
 
+  /// Accordion item border radius.
+  final BorderRadius borderRadius;
+
   /// Accordion item transition duration.
   final Duration transitionDuration;
 
   /// Accordion item transition curve.
   final Curve transitionCurve;
 
-  /// Accordion item border radius.
-  final BorderRadius borderRadius;
-
   const MoonAccordionItemProperties({
     required this.borderRadius,
     required this.transitionDuration,
@@ -28,14 +28,14 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
 
   @override
   MoonAccordionItemProperties copyWith({
+    BorderRadius? borderRadius,
     Duration? transitionDuration,
     Curve? transitionCurve,
-    BorderRadius? borderRadius,
   }) {
     return MoonAccordionItemProperties(
+      borderRadius: borderRadius ?? this.borderRadius,
       transitionDuration: transitionDuration ?? this.transitionDuration,
       transitionCurve: transitionCurve ?? this.transitionCurve,
-      borderRadius: borderRadius ?? this.borderRadius,
     );
   }
 
@@ -44,9 +44,9 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
     if (other is! MoonAccordionItemProperties) return this;
 
     return MoonAccordionItemProperties(
+      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
       transitionDuration: lerpDuration(transitionDuration, other.transitionDuration, t),
       transitionCurve: other.transitionCurve,
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
     );
   }
 
@@ -55,8 +55,8 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonAccordionItemProperties"))
+      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
       ..add(DiagnosticsProperty<Duration>("transitionDuration", transitionDuration))
-      ..add(DiagnosticsProperty<Curve>("transitionCurve", transitionCurve))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius));
+      ..add(DiagnosticsProperty<Curve>("transitionCurve", transitionCurve));
   }
 }

lib/src/theme/accordion/accordion_theme.dart

@@ -11,15 +11,15 @@ class MoonAccordionTheme extends ThemeExtension<MoonAccordionTheme> with Diagnos
   static final light = MoonAccordionTheme(
     itemColors: MoonAccordionItemColors.light,
     itemProperties: MoonAccordionItemProperties.properties,
-    itemSizes: MoonAccordionItemSizes.sizes,
     itemShadows: MoonAccordionItemShadows.light,
+    itemSizes: MoonAccordionItemSizes.sizes,
   );
 
   static final dark = MoonAccordionTheme(
     itemColors: MoonAccordionItemColors.dark,
     itemProperties: MoonAccordionItemProperties.properties,
-    itemSizes: MoonAccordionItemSizes.sizes,
     itemShadows: MoonAccordionItemShadows.dark,
+    itemSizes: MoonAccordionItemSizes.sizes,
   );
 
   /// Accordion item colors.
@@ -28,31 +28,31 @@ class MoonAccordionTheme extends ThemeExtension<MoonAccordionTheme> with Diagnos
   /// Accordion item properties.
   final MoonAccordionItemProperties itemProperties;
 
-  /// Accordion item sizes.
-  final MoonAccordionItemSizes itemSizes;
-
   /// Accordion item shadows.
   final MoonAccordionItemShadows itemShadows;
 
+  /// Accordion item sizes.
+  final MoonAccordionItemSizes itemSizes;
+
   const MoonAccordionTheme({
     required this.itemColors,
     required this.itemProperties,
-    required this.itemSizes,
     required this.itemShadows,
+    required this.itemSizes,
   });
 
   @override
   MoonAccordionTheme copyWith({
     MoonAccordionItemColors? itemColors,
     MoonAccordionItemProperties? itemProperties,
-    MoonAccordionItemSizes? itemSizes,
     MoonAccordionItemShadows? itemShadows,
+    MoonAccordionItemSizes? itemSizes,
   }) {
     return MoonAccordionTheme(
       itemColors: itemColors ?? this.itemColors,
       itemProperties: itemProperties ?? this.itemProperties,
-      itemSizes: itemSizes ?? this.itemSizes,
       itemShadows: itemShadows ?? this.itemShadows,
+      itemSizes: itemSizes ?? this.itemSizes,
     );
   }
 
@@ -63,8 +63,8 @@ class MoonAccordionTheme extends ThemeExtension<MoonAccordionTheme> with Diagnos
     return MoonAccordionTheme(
       itemColors: itemColors.lerp(other.itemColors, t),
       itemProperties: itemProperties.lerp(other.itemProperties, t),
-      itemSizes: itemSizes.lerp(other.itemSizes, t),
       itemShadows: itemShadows.lerp(other.itemShadows, t),
+      itemSizes: itemSizes.lerp(other.itemSizes, t),
     );
   }
 
@@ -75,7 +75,7 @@ class MoonAccordionTheme extends ThemeExtension<MoonAccordionTheme> with Diagnos
       ..add(DiagnosticsProperty("type", "MoonAccordionTheme"))
       ..add(DiagnosticsProperty<MoonAccordionItemColors>("itemColors", itemColors))
       ..add(DiagnosticsProperty<MoonAccordionItemProperties>("itemProperties", itemProperties))
-      ..add(DiagnosticsProperty<MoonAccordionItemSizes>("itemSizes", itemSizes))
-      ..add(DiagnosticsProperty<MoonAccordionItemShadows>("itemShadows", itemShadows));
+      ..add(DiagnosticsProperty<MoonAccordionItemShadows>("itemShadows", itemShadows))
+      ..add(DiagnosticsProperty<MoonAccordionItemSizes>("itemSizes", itemSizes));
   }
 }

lib/src/theme/alert/alert_properties.dart

@@ -1,4 +1,5 @@
 import 'dart:ui';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -107,9 +108,9 @@ class MoonAlertProperties extends ThemeExtension<MoonAlertProperties> with Diagn
     properties
       ..add(DiagnosticsProperty("type", "MoonAlertProperties"))
       ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
-      ..add(DiagnosticsProperty<double>("horizontalGap", horizontalGap))
-      ..add(DiagnosticsProperty<double>("minimumHeight", minimumHeight))
-      ..add(DiagnosticsProperty<double>("verticalGap", verticalGap))
+      ..add(DoubleProperty("horizontalGap", horizontalGap))
+      ..add(DoubleProperty("minimumHeight", minimumHeight))
+      ..add(DoubleProperty("verticalGap", verticalGap))
       ..add(DiagnosticsProperty<Duration>("transitionDuration", transitionDuration))
       ..add(DiagnosticsProperty<Curve>("transitionCurve", transitionCurve))
       ..add(DiagnosticsProperty<EdgeInsetsGeometry>("padding", padding))

lib/src/theme/authcode/authcode_properties.dart

@@ -124,9 +124,9 @@ class MoonAuthCodeProperties extends ThemeExtension<MoonAuthCodeProperties> with
     properties
       ..add(DiagnosticsProperty("type", "MoonAuthCodeProperties"))
       ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
-      ..add(DiagnosticsProperty<double>("gap", gap))
-      ..add(DiagnosticsProperty<double>("height", height))
-      ..add(DiagnosticsProperty<double>("width", width))
+      ..add(DoubleProperty("gap", gap))
+      ..add(DoubleProperty("height", height))
+      ..add(DoubleProperty("width", width))
       ..add(DiagnosticsProperty<Duration>("animationDuration", animationDuration))
       ..add(DiagnosticsProperty<Duration>("errorAnimationDuration", errorAnimationDuration))
       ..add(DiagnosticsProperty<Duration>("peekDuration", peekDuration))

lib/src/theme/avatar/avatar_size_properties.dart

@@ -13,64 +13,64 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
   static final _badgeMarginValueToAvatarRatio = MoonSizes.sizes.x5s / MoonSizes.sizes.x2l;
 
   static final xs = MoonAvatarSizeProperties(
+    borderRadius: MoonBorders.borders.interactiveXs,
     avatarSizeValue: MoonSizes.sizes.xs,
-    badgeSizeValue: MoonSizes.sizes.xs * _badgeToAvatarRatio,
     badgeMarginValue: MoonSizes.sizes.xs * _badgeMarginValueToAvatarRatio,
-    borderRadius: MoonBorders.borders.interactiveXs,
+    badgeSizeValue: MoonSizes.sizes.xs * _badgeToAvatarRatio,
     textStyle: MoonTextStyles.heading.text10,
   );
 
   static final sm = MoonAvatarSizeProperties(
+    borderRadius: MoonBorders.borders.interactiveSm,
     avatarSizeValue: MoonSizes.sizes.sm,
-    badgeSizeValue: MoonSizes.sizes.sm * _badgeToAvatarRatio,
     badgeMarginValue: MoonSizes.sizes.sm * _badgeMarginValueToAvatarRatio,
-    borderRadius: MoonBorders.borders.interactiveSm,
+    badgeSizeValue: MoonSizes.sizes.sm * _badgeToAvatarRatio,
     textStyle: MoonTextStyles.heading.text12,
   );
 
   static final md = MoonAvatarSizeProperties(
+    borderRadius: MoonBorders.borders.interactiveSm,
     avatarSizeValue: MoonSizes.sizes.md,
-    badgeSizeValue: MoonSizes.sizes.md * _badgeToAvatarRatio,
     badgeMarginValue: MoonSizes.sizes.md * _badgeMarginValueToAvatarRatio,
-    borderRadius: MoonBorders.borders.interactiveSm,
+    badgeSizeValue: MoonSizes.sizes.md * _badgeToAvatarRatio,
     textStyle: MoonTextStyles.heading.text14,
   );
 
   static final lg = MoonAvatarSizeProperties(
+    borderRadius: MoonBorders.borders.interactiveSm,
     avatarSizeValue: MoonSizes.sizes.lg,
-    badgeSizeValue: MoonSizes.sizes.lg * _badgeToAvatarRatio,
     badgeMarginValue: MoonSizes.sizes.lg * _badgeMarginValueToAvatarRatio,
-    borderRadius: MoonBorders.borders.interactiveSm,
+    badgeSizeValue: MoonSizes.sizes.lg * _badgeToAvatarRatio,
     textStyle: MoonTextStyles.heading.text16,
   );
 
   static final xl = MoonAvatarSizeProperties(
+    borderRadius: MoonBorders.borders.interactiveMd,
     avatarSizeValue: MoonSizes.sizes.xl,
-    badgeSizeValue: MoonSizes.sizes.xl * _badgeToAvatarRatio,
     badgeMarginValue: MoonSizes.sizes.xl * _badgeMarginValueToAvatarRatio,
-    borderRadius: MoonBorders.borders.interactiveMd,
+    badgeSizeValue: MoonSizes.sizes.xl * _badgeToAvatarRatio,
     textStyle: MoonTextStyles.heading.text16,
   );
 
   static final x2l = MoonAvatarSizeProperties(
+    borderRadius: MoonBorders.borders.interactiveMd,
     avatarSizeValue: MoonSizes.sizes.x2l,
-    badgeSizeValue: MoonSizes.sizes.x2l * _badgeToAvatarRatio,
     badgeMarginValue: MoonSizes.sizes.x2l * _badgeMarginValueToAvatarRatio,
-    borderRadius: MoonBorders.borders.interactiveMd,
+    badgeSizeValue: MoonSizes.sizes.x2l * _badgeToAvatarRatio,
     textStyle: MoonTextStyles.heading.text20,
   );
 
+  /// Avatar border radius.
+  final BorderRadius borderRadius;
+
   /// Avatar size value.
   final double avatarSizeValue;
 
-  /// Avatar badge size value.
-  final double badgeSizeValue;
-
   /// Avatar badge margin value.
   final double badgeMarginValue;
 
-  /// Avatar border radius.
-  final BorderRadius borderRadius;
+  /// Avatar badge size value.
+  final double badgeSizeValue;
 
   /// Avatar text style.
   final TextStyle textStyle;
@@ -85,17 +85,17 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
 
   @override
   MoonAvatarSizeProperties copyWith({
+    BorderRadius? borderRadius,
     double? avatarSizeValue,
-    double? badgeSizeValue,
     double? badgeMarginValue,
-    BorderRadius? borderRadius,
+    double? badgeSizeValue,
     TextStyle? textStyle,
   }) {
     return MoonAvatarSizeProperties(
+      borderRadius: borderRadius ?? this.borderRadius,
       avatarSizeValue: avatarSizeValue ?? this.avatarSizeValue,
-      badgeSizeValue: badgeSizeValue ?? this.badgeSizeValue,
       badgeMarginValue: badgeMarginValue ?? this.badgeMarginValue,
-      borderRadius: borderRadius ?? this.borderRadius,
+      badgeSizeValue: badgeSizeValue ?? this.badgeSizeValue,
       textStyle: textStyle ?? this.textStyle,
     );
   }
@@ -105,10 +105,10 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
     if (other is! MoonAvatarSizeProperties) return this;
 
     return MoonAvatarSizeProperties(
+      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
       avatarSizeValue: lerpDouble(avatarSizeValue, other.avatarSizeValue, t)!,
-      badgeSizeValue: lerpDouble(badgeSizeValue, other.badgeSizeValue, t)!,
       badgeMarginValue: lerpDouble(badgeMarginValue, other.badgeMarginValue, t)!,
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      badgeSizeValue: lerpDouble(badgeSizeValue, other.badgeSizeValue, t)!,
       textStyle: TextStyle.lerp(textStyle, other.textStyle, t)!,
     );
   }
@@ -118,10 +118,10 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonAvatarSizeProperties"))
+      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
       ..add(DoubleProperty("avatarSizeValue", avatarSizeValue))
-      ..add(DoubleProperty("badgeSizeValue", badgeSizeValue))
       ..add(DoubleProperty("badgeMarginValue", badgeMarginValue))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DoubleProperty("badgeSizeValue", badgeSizeValue))
       ..add(DiagnosticsProperty<TextStyle>("textStyle", textStyle));
   }
 }

lib/src/theme/button/button_colors.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
 import 'package:moon_design/src/theme/colors.dart';
 
 @immutable