fix: [MDS-513] Replace BorderRadius with BorderRadiusGeometry (#158)

coingaming · Apr 28, 2023 · d91418f · d91418f
1 parent 59aa4a6
commit d91418f
Show file tree

Hide file tree

Showing 43 changed files with 179 additions and 157 deletions.
diff --git a/example/lib/src/storybook/stories/modal.dart b/example/lib/src/storybook/stories/modal.dart
@@ -42,11 +42,11 @@ class ModalStory extends Story {
                 useRootNavigator: false,
                 barrierColor: barrierColor,
                 builder: (_) {
-                  return MoonModal(
-                    backgroundColor: backgroundColor,
-                    borderRadius: borderRadiusKnob != null ? BorderRadius.circular(borderRadiusKnob.toDouble()) : null,
-                    child: Directionality(
-                      textDirection: Directionality.of(context),
+                  return Directionality(
+                    textDirection: Directionality.of(context),
+                    child: MoonModal(
+                      backgroundColor: backgroundColor,
+                      borderRadius: borderRadiusKnob != null ? BorderRadius.circular(borderRadiusKnob.toDouble()) : null,
                       child: SizedBox(
                         width: 300,
                         child: Column(

diff --git a/lib/src/theme/accordion/accordion_item_properties.dart b/lib/src/theme/accordion/accordion_item_properties.dart
@@ -12,7 +12,7 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
   );
 
   /// Accordion item border radius.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Accordion item transition duration.
   final Duration transitionDuration;
@@ -28,7 +28,7 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
 
   @override
   MoonAccordionItemProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     Duration? transitionDuration,
     Curve? transitionCurve,
   }) {
@@ -44,7 +44,7 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
     if (other is! MoonAccordionItemProperties) return this;
 
     return MoonAccordionItemProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       transitionDuration: lerpDuration(transitionDuration, other.transitionDuration, t),
       transitionCurve: other.transitionCurve,
     );
@@ -55,7 +55,7 @@ class MoonAccordionItemProperties extends ThemeExtension<MoonAccordionItemProper
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonAccordionItemProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DiagnosticsProperty<Duration>("transitionDuration", transitionDuration))
       ..add(DiagnosticsProperty<Curve>("transitionCurve", transitionCurve));
   }

diff --git a/lib/src/theme/alert/alert_properties.dart b/lib/src/theme/alert/alert_properties.dart
@@ -22,7 +22,7 @@ class MoonAlertProperties extends ThemeExtension<MoonAlertProperties> with Diagn
   );
 
   /// Border radius for alert.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Horizontal space between alert leading, trailing and title.
   final double horizontalGap;
@@ -62,7 +62,7 @@ class MoonAlertProperties extends ThemeExtension<MoonAlertProperties> with Diagn
 
   @override
   MoonAlertProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     double? horizontalGap,
     double? minimumHeight,
     double? verticalGap,
@@ -90,7 +90,7 @@ class MoonAlertProperties extends ThemeExtension<MoonAlertProperties> with Diagn
     if (other is! MoonAlertProperties) return this;
 
     return MoonAlertProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       horizontalGap: lerpDouble(horizontalGap, other.horizontalGap, t)!,
       minimumHeight: lerpDouble(minimumHeight, other.minimumHeight, t)!,
       verticalGap: lerpDouble(verticalGap, other.verticalGap, t)!,
@@ -107,7 +107,7 @@ class MoonAlertProperties extends ThemeExtension<MoonAlertProperties> with Diagn
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonAlertProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DoubleProperty("horizontalGap", horizontalGap))
       ..add(DoubleProperty("minimumHeight", minimumHeight))
       ..add(DoubleProperty("verticalGap", verticalGap))

diff --git a/lib/src/theme/authcode/authcode_properties.dart b/lib/src/theme/authcode/authcode_properties.dart
@@ -24,7 +24,7 @@ class MoonAuthCodeProperties extends ThemeExtension<MoonAuthCodeProperties> with
   );
 
   /// Border radius of the auth input field.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Horizontal space between auth input fields.
   final double gap;
@@ -72,7 +72,7 @@ class MoonAuthCodeProperties extends ThemeExtension<MoonAuthCodeProperties> with
 
   @override
   MoonAuthCodeProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     double? gap,
     double? height,
     double? width,
@@ -104,7 +104,7 @@ class MoonAuthCodeProperties extends ThemeExtension<MoonAuthCodeProperties> with
     if (other is! MoonAuthCodeProperties) return this;
 
     return MoonAuthCodeProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       gap: lerpDouble(gap, other.gap, t)!,
       height: lerpDouble(height, other.height, t)!,
       width: lerpDouble(width, other.width, t)!,
@@ -123,7 +123,7 @@ class MoonAuthCodeProperties extends ThemeExtension<MoonAuthCodeProperties> with
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonAuthCodeProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DoubleProperty("gap", gap))
       ..add(DoubleProperty("height", height))
       ..add(DoubleProperty("width", width))

diff --git a/lib/src/theme/avatar/avatar_size_properties.dart b/lib/src/theme/avatar/avatar_size_properties.dart
@@ -61,7 +61,7 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
   );
 
   /// Avatar border radius.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Avatar size value.
   final double avatarSizeValue;
@@ -85,7 +85,7 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
 
   @override
   MoonAvatarSizeProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     double? avatarSizeValue,
     double? badgeMarginValue,
     double? badgeSizeValue,
@@ -105,7 +105,7 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
     if (other is! MoonAvatarSizeProperties) return this;
 
     return MoonAvatarSizeProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       avatarSizeValue: lerpDouble(avatarSizeValue, other.avatarSizeValue, t)!,
       badgeMarginValue: lerpDouble(badgeMarginValue, other.badgeMarginValue, t)!,
       badgeSizeValue: lerpDouble(badgeSizeValue, other.badgeSizeValue, t)!,
@@ -118,7 +118,7 @@ class MoonAvatarSizeProperties extends ThemeExtension<MoonAvatarSizeProperties>
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonAvatarSizeProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DoubleProperty("avatarSizeValue", avatarSizeValue))
       ..add(DoubleProperty("badgeMarginValue", badgeMarginValue))
       ..add(DoubleProperty("badgeSizeValue", badgeSizeValue))

diff --git a/lib/src/theme/borders.dart b/lib/src/theme/borders.dart
@@ -17,25 +17,25 @@ class MoonBorders extends ThemeExtension<MoonBorders> with DiagnosticableTreeMix
   );
 
   /// Interactive radius XS.
-  final BorderRadius interactiveXs;
+  final BorderRadiusGeometry interactiveXs;
 
   /// Interactive radius SM.
-  final BorderRadius interactiveSm;
+  final BorderRadiusGeometry interactiveSm;
 
   /// Interactive radius MD.
-  final BorderRadius interactiveMd;
+  final BorderRadiusGeometry interactiveMd;
 
   /// Surface radius XS.
-  final BorderRadius surfaceXs;
+  final BorderRadiusGeometry surfaceXs;
 
   /// Surface radius SM.
-  final BorderRadius surfaceSm;
+  final BorderRadiusGeometry surfaceSm;
 
   /// Surface radius MD.
-  final BorderRadius surfaceMd;
+  final BorderRadiusGeometry surfaceMd;
 
   /// Surface radius LG.
-  final BorderRadius surfaceLg;
+  final BorderRadiusGeometry surfaceLg;
 
   /// Default border width.
   final double borderWidth;
@@ -53,13 +53,13 @@ class MoonBorders extends ThemeExtension<MoonBorders> with DiagnosticableTreeMix
 
   @override
   MoonBorders copyWith({
-    BorderRadius? interactiveXs,
-    BorderRadius? interactiveSm,
-    BorderRadius? interactiveMd,
-    BorderRadius? surfaceXs,
-    BorderRadius? surfaceSm,
-    BorderRadius? surfaceMd,
-    BorderRadius? surfaceLg,
+    BorderRadiusGeometry? interactiveXs,
+    BorderRadiusGeometry? interactiveSm,
+    BorderRadiusGeometry? interactiveMd,
+    BorderRadiusGeometry? surfaceXs,
+    BorderRadiusGeometry? surfaceSm,
+    BorderRadiusGeometry? surfaceMd,
+    BorderRadiusGeometry? surfaceLg,
     double? borderWidth,
   }) {
     return MoonBorders(
@@ -79,13 +79,13 @@ class MoonBorders extends ThemeExtension<MoonBorders> with DiagnosticableTreeMix
     if (other is! MoonBorders) return this;
 
     return MoonBorders(
-      interactiveXs: BorderRadius.lerp(interactiveXs, other.interactiveXs, t)!,
-      interactiveSm: BorderRadius.lerp(interactiveSm, other.interactiveSm, t)!,
-      interactiveMd: BorderRadius.lerp(interactiveMd, other.interactiveMd, t)!,
-      surfaceXs: BorderRadius.lerp(surfaceXs, other.surfaceXs, t)!,
-      surfaceSm: BorderRadius.lerp(surfaceSm, other.surfaceSm, t)!,
-      surfaceMd: BorderRadius.lerp(surfaceMd, other.surfaceMd, t)!,
-      surfaceLg: BorderRadius.lerp(surfaceLg, other.surfaceLg, t)!,
+      interactiveXs: BorderRadiusGeometry.lerp(interactiveXs, other.interactiveXs, t)!,
+      interactiveSm: BorderRadiusGeometry.lerp(interactiveSm, other.interactiveSm, t)!,
+      interactiveMd: BorderRadiusGeometry.lerp(interactiveMd, other.interactiveMd, t)!,
+      surfaceXs: BorderRadiusGeometry.lerp(surfaceXs, other.surfaceXs, t)!,
+      surfaceSm: BorderRadiusGeometry.lerp(surfaceSm, other.surfaceSm, t)!,
+      surfaceMd: BorderRadiusGeometry.lerp(surfaceMd, other.surfaceMd, t)!,
+      surfaceLg: BorderRadiusGeometry.lerp(surfaceLg, other.surfaceLg, t)!,
       borderWidth: lerpDouble(borderWidth, other.borderWidth, t)!,
     );
   }
@@ -95,13 +95,13 @@ class MoonBorders extends ThemeExtension<MoonBorders> with DiagnosticableTreeMix
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonBorders"))
-      ..add(DiagnosticsProperty<BorderRadius>("interactiveXs", interactiveXs))
-      ..add(DiagnosticsProperty<BorderRadius>("interactiveSm", interactiveSm))
-      ..add(DiagnosticsProperty<BorderRadius>("interactiveMd", interactiveMd))
-      ..add(DiagnosticsProperty<BorderRadius>("surfaceXs", surfaceXs))
-      ..add(DiagnosticsProperty<BorderRadius>("surfaceSm", surfaceSm))
-      ..add(DiagnosticsProperty<BorderRadius>("surfaceMd", surfaceMd))
-      ..add(DiagnosticsProperty<BorderRadius>("surfaceLg", surfaceLg))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("interactiveXs", interactiveXs))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("interactiveSm", interactiveSm))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("interactiveMd", interactiveMd))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("surfaceXs", surfaceXs))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("surfaceSm", surfaceSm))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("surfaceMd", surfaceMd))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("surfaceLg", surfaceLg))
       ..add(DoubleProperty("borderWidth", borderWidth));
   }
 }
diff --git a/lib/src/theme/button/button_size_properties.dart b/lib/src/theme/button/button_size_properties.dart
@@ -55,7 +55,7 @@ class MoonButtonSizeProperties extends ThemeExtension<MoonButtonSizeProperties>
   );
 
   /// Button border radius.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Space between button children.
   final double gap;
@@ -83,7 +83,7 @@ class MoonButtonSizeProperties extends ThemeExtension<MoonButtonSizeProperties>
 
   @override
   MoonButtonSizeProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     double? gap,
     double? height,
     double? iconSizeValue,
@@ -105,7 +105,7 @@ class MoonButtonSizeProperties extends ThemeExtension<MoonButtonSizeProperties>
     if (other is! MoonButtonSizeProperties) return this;
 
     return MoonButtonSizeProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       gap: lerpDouble(gap, other.gap, t)!,
       height: lerpDouble(height, other.height, t)!,
       iconSizeValue: lerpDouble(iconSizeValue, other.iconSizeValue, t)!,
@@ -119,7 +119,7 @@ class MoonButtonSizeProperties extends ThemeExtension<MoonButtonSizeProperties>
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonButtonSizeProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DoubleProperty("gap", gap))
       ..add(DoubleProperty("height", height))
       ..add(DoubleProperty("iconSizeValue", iconSizeValue))

diff --git a/lib/src/theme/checkbox/checkbox_properties.dart b/lib/src/theme/checkbox/checkbox_properties.dart
@@ -10,15 +10,15 @@ class MoonCheckboxProperties extends ThemeExtension<MoonCheckboxProperties> with
   );
 
   /// Checkbox border radius.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   const MoonCheckboxProperties({
     required this.borderRadius,
   });
 
   @override
   MoonCheckboxProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
   }) {
     return MoonCheckboxProperties(
       borderRadius: borderRadius ?? this.borderRadius,
@@ -30,7 +30,7 @@ class MoonCheckboxProperties extends ThemeExtension<MoonCheckboxProperties> with
     if (other is! MoonCheckboxProperties) return this;
 
     return MoonCheckboxProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
     );
   }
 
@@ -39,6 +39,6 @@ class MoonCheckboxProperties extends ThemeExtension<MoonCheckboxProperties> with
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonCheckboxProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius));
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius));
   }
 }
diff --git a/lib/src/theme/chip/chip_size_properties.dart b/lib/src/theme/chip/chip_size_properties.dart
@@ -28,7 +28,7 @@ class MoonChipSizeProperties extends ThemeExtension<MoonChipSizeProperties> with
   );
 
   /// Chip border radius.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Space between chip children.
   final double gap;
@@ -56,7 +56,7 @@ class MoonChipSizeProperties extends ThemeExtension<MoonChipSizeProperties> with
 
   @override
   MoonChipSizeProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     double? gap,
     double? height,
     double? iconSizeValue,
@@ -78,7 +78,7 @@ class MoonChipSizeProperties extends ThemeExtension<MoonChipSizeProperties> with
     if (other is! MoonChipSizeProperties) return this;
 
     return MoonChipSizeProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       gap: lerpDouble(gap, other.gap, t)!,
       height: lerpDouble(height, other.height, t)!,
       iconSizeValue: lerpDouble(iconSizeValue, other.iconSizeValue, t)!,
@@ -92,7 +92,7 @@ class MoonChipSizeProperties extends ThemeExtension<MoonChipSizeProperties> with
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonChipSizeProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DoubleProperty("gap", gap))
       ..add(DoubleProperty("height", height))
       ..add(DoubleProperty("iconSizeValue", iconSizeValue))

diff --git a/lib/src/theme/loaders/linear_loader/linear_loader_size_properties.dart b/lib/src/theme/loaders/linear_loader/linear_loader_size_properties.dart
@@ -35,7 +35,7 @@ class MoonLinearLoaderSizeProperties extends ThemeExtension<MoonLinearLoaderSize
   );
 
   /// Linear loader border radius.
-  final BorderRadius borderRadius;
+  final BorderRadiusGeometry borderRadius;
 
   /// Linear loader height.
   final double loaderHeight;
@@ -47,7 +47,7 @@ class MoonLinearLoaderSizeProperties extends ThemeExtension<MoonLinearLoaderSize
 
   @override
   MoonLinearLoaderSizeProperties copyWith({
-    BorderRadius? borderRadius,
+    BorderRadiusGeometry? borderRadius,
     double? loaderHeight,
   }) {
     return MoonLinearLoaderSizeProperties(
@@ -61,7 +61,7 @@ class MoonLinearLoaderSizeProperties extends ThemeExtension<MoonLinearLoaderSize
     if (other is! MoonLinearLoaderSizeProperties) return this;
 
     return MoonLinearLoaderSizeProperties(
-      borderRadius: BorderRadius.lerp(borderRadius, other.borderRadius, t)!,
+      borderRadius: BorderRadiusGeometry.lerp(borderRadius, other.borderRadius, t)!,
       loaderHeight: lerpDouble(loaderHeight, other.loaderHeight, t)!,
     );
   }
@@ -71,7 +71,7 @@ class MoonLinearLoaderSizeProperties extends ThemeExtension<MoonLinearLoaderSize
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty("type", "MoonLinearLoaderSizeProperties"))
-      ..add(DiagnosticsProperty<BorderRadius>("borderRadius", borderRadius))
+      ..add(DiagnosticsProperty<BorderRadiusGeometry>("borderRadius", borderRadius))
       ..add(DoubleProperty("loaderHeight", loaderHeight));
   }
 }