Merge pull request #236 from conceptadev/chore/box-adjustment

Adjustments
conceptadev · Mar 25, 2024 · a1ddc45 · a1ddc45
2 parents 9d57c86 + 588dc69
commit a1ddc45
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/lib/src/attributes/scalars/scalar_util.dart b/lib/src/attributes/scalars/scalar_util.dart
@@ -465,6 +465,8 @@ class OffsetUtility<T extends StyleAttribute> extends MixUtility<T, Offset> {
   const OffsetUtility(super.builder);
 
   T call(double dx, double dy) => builder(Offset(dx, dy));
+
+  T zero() => builder(Offset.zero);
 }
 
 class FontSizeUtility<T extends StyleAttribute> extends SizingUtility<T> {

diff --git a/lib/src/factory/mix_provider_data.dart b/lib/src/factory/mix_provider_data.dart
@@ -183,11 +183,17 @@ M? _mergeAttributes<M extends StyleAttribute>(Iterable<M> mergeables) {
 class AnimatedData with Comparable {
   final Duration duration;
   final Curve curve;
-
   const AnimatedData({required this.duration, required this.curve});
 
+  factory AnimatedData.withDefaults({Duration? duration, Curve? curve}) {
+    return AnimatedData(
+      duration: duration ?? const Duration(milliseconds: 150),
+      curve: curve ?? Curves.linear,
+    );
+  }
+
   @override
-  List<Object> get props => [duration, curve];
+  get props => [duration, curve];
 }
 
 Iterable<Attribute> _applyStyleBuilder(

diff --git a/lib/src/specs/container/box_spec.dart b/lib/src/specs/container/box_spec.dart
@@ -123,13 +123,13 @@ class BoxSpec extends Spec<BoxSpec> {
       ];
 }
 
-class BoxSpecTween extends Tween<BoxSpec?> {
+class BoxSpecTween extends Tween<BoxSpec> {
   BoxSpecTween({super.begin, super.end});
 
   @override
-  BoxSpec? lerp(double t) {
-    if (begin == null) return end;
-    if (end == null) return begin;
+  BoxSpec lerp(double t) {
+    if (begin == null && end == null) return const BoxSpec.empty();
+    if (begin == null) return end!;
 
     return begin!.lerp(end!, t);
   }

diff --git a/lib/src/specs/container/box_util.dart b/lib/src/specs/container/box_util.dart
@@ -7,6 +7,7 @@ import '../../attributes/constraints/constraints_dto.dart';
 import '../../attributes/constraints/constraints_util.dart';
 import '../../attributes/decoration/decoration_dto.dart';
 import '../../attributes/decoration/decoration_util.dart';
+import '../../attributes/gradient/gradient_util.dart';
 import '../../attributes/scalars/scalar_util.dart';
 import '../../attributes/shadow/shadow_util.dart';
 import '../../attributes/spacing/spacing_dto.dart';
@@ -322,6 +323,8 @@ class BoxSpecUtility extends SpecUtility<BoxSpecAttribute> {
 
   ElevationUtility<BoxSpecAttribute> get elevation => decoration.elevation;
 
+  GradientUtility<BoxSpecAttribute> get gradient => decoration.gradient;
+
   ShapeDecorationUtility<BoxSpecAttribute> get shapeDecoration =>
       ShapeDecorationUtility((decoration) => only(decoration: decoration));
 

diff --git a/lib/src/specs/container/box_widget.dart b/lib/src/specs/container/box_widget.dart
@@ -106,11 +106,18 @@ class MixedBox extends StatelessWidget {
   final MixData mix;
   @override
   Widget build(BuildContext context) {
-    // Get MixData from this widget or the nearest MixProvider.
+    return BoxSpecWidget(spec: BoxSpec.of(mix), child: child);
+  }
+}
 
-    // Retrieve styling properties from MixData. Use default properties if MixData is not provided.
-    final spec = BoxSpec.of(mix);
+class BoxSpecWidget extends StatelessWidget {
+  const BoxSpecWidget({required this.spec, super.key, this.child});
 
+  final Widget? child;
+  final BoxSpec spec;
+
+  @override
+  Widget build(BuildContext context) {
     return Container(
       alignment: spec.alignment,
       padding: spec.padding,