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.

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

chore: Dart lint fixes #347

Merged
merged 1 commit into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ scripts:
steps:
- melos exec --category="mix_deps" dart analyze --fatal-infos .
- melos exec --category="mix_deps" --depends-on="dart_code_metrics_presets" dcm analyze --fatal-warnings --fatal-style --fatal-performance .
- melos exec --category="mix_deps" --depends-on="dart_code_metrics_presets" dcm analyze .
- melos run custom_lint_analyze

verify_version_pubspec_changelog:
Expand Down
67 changes: 25 additions & 42 deletions packages/mix/lib/src/attributes/border/shape_border_dto.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ sealed class ShapeBorderDto<T extends ShapeBorder> extends Dto<T> {
BorderSideDto? get _side =>
this is OutlinedBorderDto ? (this as OutlinedBorderDto).side : null;

BeveledRectangleBorderDto toBeveledRectangleBorder();
RoundedRectangleBorderDto toRoundedRectangleBorder();
ContinuousRectangleBorderDto toContinuousRectangleBorder();
CircleBorderDto toCircleBorder();
BeveledRectangleBorderDto toBeveled();
RoundedRectangleBorderDto toRoundedRectangle();
ContinuousRectangleBorderDto toContinuous();
CircleBorderDto toCircle();
StadiumBorderDto toStadiumBorder();
StarBorderDto toStarBorder();
LinearBorderDto toLinearBorder();
StarBorderDto toStar();
LinearBorderDto toLinear();

@override
ShapeBorderDto<T> merge(covariant ShapeBorderDto<T>? other);
Expand All @@ -71,36 +71,19 @@ sealed class OutlinedBorderDto<T extends OutlinedBorder>
return _exhaustiveMerge(a, b);
}

static OutlinedBorderDto _exhaustiveMerge(
OutlinedBorderDto a,
OutlinedBorderDto b,
) {
if (a.runtimeType == b.runtimeType) return a.merge(b);

switch (b.runtimeType) {
case BeveledRectangleBorderDto:
return a
.toBeveledRectangleBorder()
.merge(b as BeveledRectangleBorderDto);
case RoundedRectangleBorderDto:
return a
.toRoundedRectangleBorder()
.merge(b as RoundedRectangleBorderDto);
case ContinuousRectangleBorderDto:
return a
.toContinuousRectangleBorder()
.merge(b as ContinuousRectangleBorderDto);
case CircleBorderDto:
return a.toCircleBorder().merge(b as CircleBorderDto);
case StadiumBorderDto:
return a.toStadiumBorder().merge(b as StadiumBorderDto);
case StarBorderDto:
return a.toStarBorder().merge(b as StarBorderDto);
case LinearBorderDto:
return a.toLinearBorder().merge(b as LinearBorderDto);
default:
throw ArgumentError('Unknown OutlinedBorderDto type: ${b.runtimeType}');
}
static B _exhaustiveMerge<A extends OutlinedBorderDto,
B extends OutlinedBorderDto>(A a, B b) {
if (a.runtimeType == b.runtimeType) return a.merge(b) as B;

return switch (b) {
(BeveledRectangleBorderDto g) => a.toBeveled().merge(g) as B,
(RoundedRectangleBorderDto g) => a.toRoundedRectangle().merge(g) as B,
(ContinuousRectangleBorderDto g) => a.toContinuous().merge(g) as B,
(CircleBorderDto g) => a.toCircle().merge(g) as B,
(StadiumBorderDto g) => a.toStadiumBorder().merge(g) as B,
(StarBorderDto g) => a.toStar().merge(g) as B,
(LinearBorderDto g) => a.toLinear().merge(g) as B,
};
}

BoxShape? _toBoxShape() {
Expand All @@ -118,7 +101,7 @@ sealed class OutlinedBorderDto<T extends OutlinedBorder>
/// Tries to get borderRadius if available for [OutlineBorderDto]

@override
BeveledRectangleBorderDto toBeveledRectangleBorder() {
BeveledRectangleBorderDto toBeveled() {
if (this is BeveledRectangleBorderDto) {
return this as BeveledRectangleBorderDto;
}
Expand All @@ -130,15 +113,15 @@ sealed class OutlinedBorderDto<T extends OutlinedBorder>
}

@override
ContinuousRectangleBorderDto toContinuousRectangleBorder() {
ContinuousRectangleBorderDto toContinuous() {
return ContinuousRectangleBorderDto(
borderRadius: _borderRadius,
side: _side,
);
}

@override
RoundedRectangleBorderDto toRoundedRectangleBorder() {
RoundedRectangleBorderDto toRoundedRectangle() {
if (this is RoundedRectangleBorderDto) {
return this as RoundedRectangleBorderDto;
}
Expand All @@ -150,7 +133,7 @@ sealed class OutlinedBorderDto<T extends OutlinedBorder>
}

@override
CircleBorderDto toCircleBorder() {
CircleBorderDto toCircle() {
if (this is CircleBorderDto) return this as CircleBorderDto;

return CircleBorderDto(side: _side);
Expand All @@ -164,14 +147,14 @@ sealed class OutlinedBorderDto<T extends OutlinedBorder>
}

@override
LinearBorderDto toLinearBorder() {
LinearBorderDto toLinear() {
if (this is LinearBorderDto) return this as LinearBorderDto;

return LinearBorderDto(side: _side);
}

@override
StarBorderDto toStarBorder() {
StarBorderDto toStar() {
if (this is StarBorderDto) return this as StarBorderDto;

return StarBorderDto(side: _side);
Expand Down
6 changes: 3 additions & 3 deletions packages/mix/lib/src/core/factory/style_mix.dart
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,10 @@ class AnimatedStyle extends Style {
final AnimatedData animated;

const AnimatedStyle._({
required AttributeMap<StyledAttribute> styles,
required AttributeMap<VariantAttribute> variants,
required super.styles,
required super.variants,
required this.animated,
}) : super._(styles: styles, variants: variants);
}) : super._();

factory AnimatedStyle(
Style style, {
Expand Down
8 changes: 4 additions & 4 deletions packages/mix/lib/src/specs/icon/icon_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ class AnimatedIconSpecWidget extends ImplicitlyAnimatedWidget {
this.semanticLabel,
this.textDirection,
this.modifierOrder = const [],
Curve curve = Curves.linear,
required Duration duration,
VoidCallback? onEnd,
}) : super(curve: curve, duration: duration, onEnd: onEnd);
super.curve,
required super.duration,
super.onEnd,
});

final IconData? icon;
final IconSpec spec;
Expand Down
4 changes: 2 additions & 2 deletions packages/mix/test/bechmarks/widget_build_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:mix/mix.dart';
import '../helpers/testing_utils.dart';

class _StyledContainerExample extends StatelessWidget {
const _StyledContainerExample({Key? key}) : super(key: key);
const _StyledContainerExample();

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -164,7 +164,7 @@ void main() {
}

class StyleWidgetExpensiveAttributge extends StatelessWidget {
const StyleWidgetExpensiveAttributge({Key? key}) : super(key: key);
const StyleWidgetExpensiveAttributge({super.key});

@override
Widget build(BuildContext context) {
Expand Down
2 changes: 1 addition & 1 deletion packages/mix/test/empty_widget.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/widgets.dart';

class Empty extends StatelessWidget {
const Empty({Key? key}) : super(key: key);
const Empty({super.key});

@override
Widget build(BuildContext context) {
Expand Down
3 changes: 1 addition & 2 deletions packages/mix/test/helpers/testing_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ extension WidgetTesterExt on WidgetTester {
const FillWidget = SizedBox(width: 25, height: 25);

class WrapMixThemeWidget extends StatelessWidget {
const WrapMixThemeWidget({required this.child, this.theme, Key? key})
: super(key: key);
const WrapMixThemeWidget({required this.child, this.theme, super.key});

final Widget child;
final MixThemeData? theme;
Expand Down
Loading