Clean up and further merge issues

conceptadev · Feb 2, 2024 · 48be98b · 48be98b
1 parent aa4962a
commit 48be98b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/lib/src/attributes/gradient/gradient_dto.dart b/lib/src/attributes/gradient/gradient_dto.dart
@@ -133,8 +133,8 @@ class LinearGradientDto extends GradientDto<LinearGradient> {
       end: other.end ?? end,
       tileMode: other.tileMode ?? tileMode,
       transform: other.transform ?? transform,
-      colors: colors?.merge(other.colors),
-      stops: stops?.merge(other.stops),
+      colors: colors?.merge(other.colors) ?? other.colors,
+      stops: stops?.merge(other.stops) ?? other.stops,
     );
   }
 

diff --git a/lib/src/attributes/shadow/shadow_dto.dart b/lib/src/attributes/shadow/shadow_dto.dart
@@ -67,7 +67,7 @@ class ShadowDto extends ShadowDtoImpl<ShadowDto, Shadow> {
 
     return ShadowDto(
       blurRadius: other.blurRadius ?? blurRadius,
-      color: other.color ?? color,
+      color: color?.merge(other.color) ?? other.color,
       offset: other.offset ?? offset,
     );
   }

diff --git a/lib/src/attributes/text_style/text_style_dto.dart b/lib/src/attributes/text_style/text_style_dto.dart
@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
 
 import '../../core/attribute.dart';
 import '../../core/extensions/iterable_ext.dart';
-import '../../core/extensions/values_ext.dart';
 import '../../factory/mix_provider_data.dart';
 import '../../theme/tokens/text_style_token.dart';
 import '../color/color_dto.dart';
@@ -108,7 +107,7 @@ class TextStyleData extends Dto<TextStyle> with Mergeable<TextStyleData> {
             height: style.height,
             letterSpacing: style.letterSpacing,
             locale: style.locale,
-            shadows: style.shadows?.map((e) => e.toDto()).toList(),
+            shadows: style.shadows?.map(ShadowDto.from).toList(),
             textBaseline: style.textBaseline,
             wordSpacing: style.wordSpacing,
           );

diff --git a/lib/src/decorators/widget_decorators.dart b/lib/src/decorators/widget_decorators.dart
@@ -138,6 +138,7 @@ class ScaleDecorator extends WidgetDecorator<ScaleDecorator> {
 
 enum ClipType { path, oval, rect, rRect, triangle }
 
+// TODO: Implement BorderRadiusGeometryDto
 class ClipDecorator<T> extends WidgetDecorator<ClipDecorator>
     with Mergeable<ClipDecorator> {
   final ClipType clipType;

diff --git a/lib/src/specs/icon/icon_attribute.dart b/lib/src/specs/icon/icon_attribute.dart
@@ -20,7 +20,7 @@ class IconSpecAttribute extends SpecAttribute<IconSpecAttribute, IconSpec> {
 
     return IconSpecAttribute(
       size: size ?? other.size,
-      color: color ?? other.color,
+      color: color?.merge(other.color) ?? other.color,
     );
   }
 

diff --git a/lib/src/specs/image/image_attribute.dart b/lib/src/specs/image/image_attribute.dart
@@ -48,15 +48,15 @@ class ImageSpecAttribute extends SpecAttribute<ImageSpecAttribute, ImageSpec> {
     if (other == null) return this;
 
     return ImageSpecAttribute(
+      centerSlice: other.centerSlice ?? centerSlice,
       width: other.width ?? width,
       height: other.height ?? height,
-      color: other.color ?? color,
+      color: color?.merge(other.color) ?? other.color,
       repeat: other.repeat ?? repeat,
       fit: other.fit ?? fit,
       alignment: other.alignment ?? alignment,
-      centerSlice: other.centerSlice ?? centerSlice,
-      filterQuality: other.filterQuality ?? filterQuality,
       colorBlendMode: other.colorBlendMode ?? colorBlendMode,
+      filterQuality: other.filterQuality ?? filterQuality,
     );
   }