Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref: Refactor Mirai Container #284

Merged
merged 1 commit into from
Mar 2, 2024
Merged

ref: Refactor Mirai Container #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions examples/mirai_gallery/assets/json/container_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
{
"type": "container",
"color": "#672BFF",
"clipBehavior": "hardEdge",
"height": 250,
"width": 200,
"decoration": {
}
"width": 200
},
{
"type": "sizedBox",
Expand All @@ -32,7 +29,6 @@
{
"type": "container",
"color": "#FC5632",
"clipBehavior": "hardEdge",
"height": 250,
"width": 200,
"child": {
Expand Down
9 changes: 4 additions & 5 deletions packages/mirai/lib/src/parsers/mirai_box_decoration/mirai_box_decoration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/src/parsers/mirai_border/mirai_border.dart';
import 'package:mirai/src/parsers/mirai_border_radius/mirai_border_radius.dart';
import 'package:mirai/src/parsers/mirai_box_shadow/mirai_box_shadow.dart';
import 'package:mirai/src/parsers/mirai_container_image/mirai_container_image.dart';
import 'package:mirai/src/parsers/mirai_decoration_image/mirai_decoration_image.dart';
import 'package:mirai/src/parsers/mirai_gradient/mirai_gradient.dart';
import 'package:mirai/src/utils/color_utils.dart';

Expand All @@ -14,13 +14,12 @@ part 'mirai_box_decoration.g.dart';
class MiraiBoxDecoration with _$MiraiBoxDecoration {
const factory MiraiBoxDecoration({
String? color,
@Default(BorderStyle.none) BorderStyle borderStyle,
BlendMode? blendMode,
BlendMode? backgroundBlendMode,
List<MiraiBoxShadow?>? boxShadow,
@Default(BoxShape.rectangle) BoxShape shape,
MiraiBorder? border,
MiraiBorderRadius? borderRadius,
MiraiContainerImage? image,
MiraiDecorationImage? image,
MiraiGradient? gradient,
}) = _MiraiBoxDecoration;

Expand All @@ -32,7 +31,7 @@ extension MiraiBoxDecorationParser on MiraiBoxDecoration? {
BoxDecoration? parse(BuildContext context) {
return BoxDecoration(
color: this?.color.toColor(context),
backgroundBlendMode: this?.blendMode,
backgroundBlendMode: this?.backgroundBlendMode,
boxShadow: this?.boxShadow?.map((elem) => elem.parse(context)).toList(),
shape: this?.shape ?? BoxShape.rectangle,
border: this?.border?.parse(context),
Expand Down
85 changes: 31 additions & 54 deletions packages/mirai/lib/src/parsers/mirai_box_decoration/mirai_box_decoration.freezed.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ MiraiBoxDecoration _$MiraiBoxDecorationFromJson(Map<String, dynamic> json) {
/// @nodoc
mixin _$MiraiBoxDecoration {
String? get color => throw _privateConstructorUsedError;
BorderStyle get borderStyle => throw _privateConstructorUsedError;
BlendMode? get blendMode => throw _privateConstructorUsedError;
BlendMode? get backgroundBlendMode => throw _privateConstructorUsedError;
List<MiraiBoxShadow?>? get boxShadow => throw _privateConstructorUsedError;
BoxShape get shape => throw _privateConstructorUsedError;
MiraiBorder? get border => throw _privateConstructorUsedError;
MiraiBorderRadius? get borderRadius => throw _privateConstructorUsedError;
MiraiContainerImage? get image => throw _privateConstructorUsedError;
MiraiDecorationImage? get image => throw _privateConstructorUsedError;
MiraiGradient? get gradient => throw _privateConstructorUsedError;

Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
Expand All @@ -44,18 +43,17 @@ abstract class $MiraiBoxDecorationCopyWith<$Res> {
@useResult
$Res call(
{String? color,
BorderStyle borderStyle,
BlendMode? blendMode,
BlendMode? backgroundBlendMode,
List<MiraiBoxShadow?>? boxShadow,
BoxShape shape,
MiraiBorder? border,
MiraiBorderRadius? borderRadius,
MiraiContainerImage? image,
MiraiDecorationImage? image,
MiraiGradient? gradient});

$MiraiBorderCopyWith<$Res>? get border;
$MiraiBorderRadiusCopyWith<$Res>? get borderRadius;
$MiraiContainerImageCopyWith<$Res>? get image;
$MiraiDecorationImageCopyWith<$Res>? get image;
$MiraiGradientCopyWith<$Res>? get gradient;
}

Expand All @@ -73,8 +71,7 @@ class _$MiraiBoxDecorationCopyWithImpl<$Res, $Val extends MiraiBoxDecoration>
@override
$Res call({
Object? color = freezed,
Object? borderStyle = null,
Object? blendMode = freezed,
Object? backgroundBlendMode = freezed,
Object? boxShadow = freezed,
Object? shape = null,
Object? border = freezed,
Expand All @@ -87,13 +84,9 @@ class _$MiraiBoxDecorationCopyWithImpl<$Res, $Val extends MiraiBoxDecoration>
? _value.color
: color // ignore: cast_nullable_to_non_nullable
as String?,
borderStyle: null == borderStyle
? _value.borderStyle
: borderStyle // ignore: cast_nullable_to_non_nullable
as BorderStyle,
blendMode: freezed == blendMode
? _value.blendMode
: blendMode // ignore: cast_nullable_to_non_nullable
backgroundBlendMode: freezed == backgroundBlendMode
? _value.backgroundBlendMode
: backgroundBlendMode // ignore: cast_nullable_to_non_nullable
as BlendMode?,
boxShadow: freezed == boxShadow
? _value.boxShadow
Expand All @@ -114,7 +107,7 @@ class _$MiraiBoxDecorationCopyWithImpl<$Res, $Val extends MiraiBoxDecoration>
image: freezed == image
? _value.image
: image // ignore: cast_nullable_to_non_nullable
as MiraiContainerImage?,
as MiraiDecorationImage?,
gradient: freezed == gradient
? _value.gradient
: gradient // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -148,12 +141,12 @@ class _$MiraiBoxDecorationCopyWithImpl<$Res, $Val extends MiraiBoxDecoration>

@override
@pragma('vm:prefer-inline')
$MiraiContainerImageCopyWith<$Res>? get image {
$MiraiDecorationImageCopyWith<$Res>? get image {
if (_value.image == null) {
return null;
}

return $MiraiContainerImageCopyWith<$Res>(_value.image!, (value) {
return $MiraiDecorationImageCopyWith<$Res>(_value.image!, (value) {
return _then(_value.copyWith(image: value) as $Val);
});
}
Expand Down Expand Up @@ -181,21 +174,20 @@ abstract class _$$MiraiBoxDecorationImplCopyWith<$Res>
@useResult
$Res call(
{String? color,
BorderStyle borderStyle,
BlendMode? blendMode,
BlendMode? backgroundBlendMode,
List<MiraiBoxShadow?>? boxShadow,
BoxShape shape,
MiraiBorder? border,
MiraiBorderRadius? borderRadius,
MiraiContainerImage? image,
MiraiDecorationImage? image,
MiraiGradient? gradient});

@override
$MiraiBorderCopyWith<$Res>? get border;
@override
$MiraiBorderRadiusCopyWith<$Res>? get borderRadius;
@override
$MiraiContainerImageCopyWith<$Res>? get image;
$MiraiDecorationImageCopyWith<$Res>? get image;
@override
$MiraiGradientCopyWith<$Res>? get gradient;
}
Expand All @@ -212,8 +204,7 @@ class __$$MiraiBoxDecorationImplCopyWithImpl<$Res>
@override
$Res call({
Object? color = freezed,
Object? borderStyle = null,
Object? blendMode = freezed,
Object? backgroundBlendMode = freezed,
Object? boxShadow = freezed,
Object? shape = null,
Object? border = freezed,
Expand All @@ -226,13 +217,9 @@ class __$$MiraiBoxDecorationImplCopyWithImpl<$Res>
? _value.color
: color // ignore: cast_nullable_to_non_nullable
as String?,
borderStyle: null == borderStyle
? _value.borderStyle
: borderStyle // ignore: cast_nullable_to_non_nullable
as BorderStyle,
blendMode: freezed == blendMode
? _value.blendMode
: blendMode // ignore: cast_nullable_to_non_nullable
backgroundBlendMode: freezed == backgroundBlendMode
? _value.backgroundBlendMode
: backgroundBlendMode // ignore: cast_nullable_to_non_nullable
as BlendMode?,
boxShadow: freezed == boxShadow
? _value._boxShadow
Expand All @@ -253,7 +240,7 @@ class __$$MiraiBoxDecorationImplCopyWithImpl<$Res>
image: freezed == image
? _value.image
: image // ignore: cast_nullable_to_non_nullable
as MiraiContainerImage?,
as MiraiDecorationImage?,
gradient: freezed == gradient
? _value.gradient
: gradient // ignore: cast_nullable_to_non_nullable
Expand All @@ -267,8 +254,7 @@ class __$$MiraiBoxDecorationImplCopyWithImpl<$Res>
class _$MiraiBoxDecorationImpl implements _MiraiBoxDecoration {
const _$MiraiBoxDecorationImpl(
{this.color,
this.borderStyle = BorderStyle.none,
this.blendMode,
this.backgroundBlendMode,
final List<MiraiBoxShadow?>? boxShadow,
this.shape = BoxShape.rectangle,
this.border,
Expand All @@ -283,10 +269,7 @@ class _$MiraiBoxDecorationImpl implements _MiraiBoxDecoration {
@override
final String? color;
@override
@JsonKey()
final BorderStyle borderStyle;
@override
final BlendMode? blendMode;
final BlendMode? backgroundBlendMode;
final List<MiraiBoxShadow?>? _boxShadow;
@override
List<MiraiBoxShadow?>? get boxShadow {
Expand All @@ -305,13 +288,13 @@ class _$MiraiBoxDecorationImpl implements _MiraiBoxDecoration {
@override
final MiraiBorderRadius? borderRadius;
@override
final MiraiContainerImage? image;
final MiraiDecorationImage? image;
@override
final MiraiGradient? gradient;

@override
String toString() {
return 'MiraiBoxDecoration(color: $color, borderStyle: $borderStyle, blendMode: $blendMode, boxShadow: $boxShadow, shape: $shape, border: $border, borderRadius: $borderRadius, image: $image, gradient: $gradient)';
return 'MiraiBoxDecoration(color: $color, backgroundBlendMode: $backgroundBlendMode, boxShadow: $boxShadow, shape: $shape, border: $border, borderRadius: $borderRadius, image: $image, gradient: $gradient)';
}

@override
Expand All @@ -320,10 +303,8 @@ class _$MiraiBoxDecorationImpl implements _MiraiBoxDecoration {
(other.runtimeType == runtimeType &&
other is _$MiraiBoxDecorationImpl &&
(identical(other.color, color) || other.color == color) &&
(identical(other.borderStyle, borderStyle) ||
other.borderStyle == borderStyle) &&
(identical(other.blendMode, blendMode) ||
other.blendMode == blendMode) &&
(identical(other.backgroundBlendMode, backgroundBlendMode) ||
other.backgroundBlendMode == backgroundBlendMode) &&
const DeepCollectionEquality()
.equals(other._boxShadow, _boxShadow) &&
(identical(other.shape, shape) || other.shape == shape) &&
Expand All @@ -340,8 +321,7 @@ class _$MiraiBoxDecorationImpl implements _MiraiBoxDecoration {
int get hashCode => Object.hash(
runtimeType,
color,
borderStyle,
blendMode,
backgroundBlendMode,
const DeepCollectionEquality().hash(_boxShadow),
shape,
border,
Expand All @@ -367,13 +347,12 @@ class _$MiraiBoxDecorationImpl implements _MiraiBoxDecoration {
abstract class _MiraiBoxDecoration implements MiraiBoxDecoration {
const factory _MiraiBoxDecoration(
{final String? color,
final BorderStyle borderStyle,
final BlendMode? blendMode,
final BlendMode? backgroundBlendMode,
final List<MiraiBoxShadow?>? boxShadow,
final BoxShape shape,
final MiraiBorder? border,
final MiraiBorderRadius? borderRadius,
final MiraiContainerImage? image,
final MiraiDecorationImage? image,
final MiraiGradient? gradient}) = _$MiraiBoxDecorationImpl;

factory _MiraiBoxDecoration.fromJson(Map<String, dynamic> json) =
Expand All @@ -382,9 +361,7 @@ abstract class _MiraiBoxDecoration implements MiraiBoxDecoration {
@override
String? get color;
@override
BorderStyle get borderStyle;
@override
BlendMode? get blendMode;
BlendMode? get backgroundBlendMode;
@override
List<MiraiBoxShadow?>? get boxShadow;
@override
Expand All @@ -394,7 +371,7 @@ abstract class _MiraiBoxDecoration implements MiraiBoxDecoration {
@override
MiraiBorderRadius? get borderRadius;
@override
MiraiContainerImage? get image;
MiraiDecorationImage? get image;
@override
MiraiGradient? get gradient;
@override
Expand Down
17 changes: 5 additions & 12 deletions packages/mirai/lib/src/parsers/mirai_box_decoration/mirai_box_decoration.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_container/mirai_container.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'dart:ui';

import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/src/parsers/mirai_alignment/mirai_alignment.dart';
import 'package:mirai/src/parsers/mirai_box_constraints/mirai_box_constraints.dart';
import 'package:mirai/src/parsers/mirai_box_decoration/mirai_box_decoration.dart';
import 'package:mirai/src/parsers/mirai_edge_insets/mirai_edge_insets.dart';

Expand All @@ -15,9 +17,11 @@ class MiraiContainer with _$MiraiContainer {
MiraiAlignment? alignment,
MiraiEdgeInsets? padding,
MiraiBoxDecoration? decoration,
MiraiBoxDecoration? foregroundDecoration,
String? color,
double? width,
double? height,
MiraiBoxConstraints? constraints,
MiraiEdgeInsets? margin,
Map<String, dynamic>? child,
@Default(Clip.none) Clip clipBehavior,
Expand Down
Loading
Loading