Skip to content

Commit

Permalink
normalize styles' class name
Browse files Browse the repository at this point in the history
  • Loading branch information
tilucasoli committed Feb 23, 2024
1 parent 0f19b62 commit 0b82902
Show file tree
Hide file tree
Showing 18 changed files with 120 additions and 122 deletions.
6 changes: 3 additions & 3 deletions demo/lib/components/avatar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
RemixAvatar(
style: RemixAvatarStyles(
style: RemixAvatarStyle(
container: Style(
box.height(60),
box.width(60),
Expand All @@ -31,7 +31,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
),
const SizedBox(width: 10),
RemixAvatar(
style: RemixAvatarStyles.base().copyWith(
style: RemixAvatarStyle.base().copyWith(
container: Style(
box.height(50),
box.width(50),
Expand All @@ -45,7 +45,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
image: NetworkImage(
'https://avatars.githubusercontent.com/u/14010287?v=4',
),
style: RemixAvatarStyles.base().copyWith(
style: RemixAvatarStyle.base().copyWith(
container: Style(
box.height(40),
box.width(40),
Expand Down
2 changes: 1 addition & 1 deletion demo/lib/components/list_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
return Center(
child: RemixListTile(
leading: RemixAvatar(
style: RemixAvatarStyles.base().copyWith(
style: RemixAvatarStyle.base().copyWith(
container: Style(
height(60),
width(60),
Expand Down
12 changes: 6 additions & 6 deletions lib/components/avatar/avatar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'avatar.style.dart';
import '../../utils/component_recipe.dart';

class RemixAvatar extends StatelessWidget
implements RemixComponentRecipe<RemixAvatarStyles> {
implements RemixComponentRecipe<RemixAvatarStyle> {
const RemixAvatar({
super.key,
this.image,
Expand All @@ -19,17 +19,17 @@ class RemixAvatar extends StatelessWidget

final ImageProvider<Object>? image;
final String? fallbackLabel;
final RemixWidgetBuilder<RemixAvatarStyles>? fallbackLabelBuilder;
final RemixWidgetBuilder<RemixAvatarStyles>? imageBuilder;
final RemixWidgetBuilder<RemixAvatarStyle>? fallbackLabelBuilder;
final RemixWidgetBuilder<RemixAvatarStyle>? imageBuilder;

@override
final RemixAvatarStyles? style;
final RemixAvatarStyle? style;

@override
final List<Variant> variants;

RemixAvatarStyles buildStyle(List<Variant> variants) {
var styles = style == null ? RemixAvatarStyles.base() : style!;
RemixAvatarStyle buildStyle(List<Variant> variants) {
var styles = style == null ? RemixAvatarStyle.base() : style!;

return styles.applyVariants(variants);
}
Expand Down
18 changes: 9 additions & 9 deletions lib/components/avatar/avatar.style.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:mix/mix.dart';

class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
const RemixAvatarStyles({
class RemixAvatarStyle extends StyleRecipe<RemixAvatarStyle> {
const RemixAvatarStyle({
this.container = const Style.empty(),
this.fallbackLabel = const Style.empty(),
this.image = const Style.empty(),
Expand All @@ -11,38 +11,38 @@ class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
final Style fallbackLabel;
final Style image;

factory RemixAvatarStyles.base() {
return RemixAvatarStyles(
factory RemixAvatarStyle.base() {
return RemixAvatarStyle(
container: _container(),
fallbackLabel: _label(),
image: _image(),
);
}

@override
RemixAvatarStyles applyVariants(List<Variant> variants) {
return RemixAvatarStyles(
RemixAvatarStyle applyVariants(List<Variant> variants) {
return RemixAvatarStyle(
container: container.applyVariants(variants),
fallbackLabel: fallbackLabel.applyVariants(variants),
image: image.applyVariants(variants),
);
}

@override
RemixAvatarStyles copyWith({
RemixAvatarStyle copyWith({
Style? container,
Style? fallbackLabel,
Style? image,
}) {
return RemixAvatarStyles(
return RemixAvatarStyle(
container: this.container.merge(container),
fallbackLabel: this.fallbackLabel.merge(fallbackLabel),
image: this.image.merge(image),
);
}

@override
RemixAvatarStyles merge(RemixAvatarStyles? other) {
RemixAvatarStyle merge(RemixAvatarStyle? other) {
return copyWith(
container: other?.container,
fallbackLabel: other?.fallbackLabel,
Expand Down
8 changes: 4 additions & 4 deletions lib/components/badge/badge.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'badge.style.dart';
import '../../utils/component_recipe.dart';

class RemixBadge extends StatelessWidget
implements RemixComponentRecipe<RemixBadgeStyles> {
implements RemixComponentRecipe<RemixBadgeStyle> {
const RemixBadge({
super.key,
required this.label,
Expand All @@ -16,13 +16,13 @@ class RemixBadge extends StatelessWidget
final String label;

@override
final RemixBadgeStyles? style;
final RemixBadgeStyle? style;

@override
final List<Variant> variants;

RemixBadgeStyles buildStyle(List<Variant> variants) {
var styles = style == null ? RemixBadgeStyles.base() : style!;
RemixBadgeStyle buildStyle(List<Variant> variants) {
var styles = style == null ? RemixBadgeStyle.base() : style!;
return styles.applyVariants(variants);
}

Expand Down
18 changes: 9 additions & 9 deletions lib/components/badge/badge.style.dart
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
import 'package:flutter/material.dart';
import 'package:mix/mix.dart';

class RemixBadgeStyles extends StyleRecipe<RemixBadgeStyles> {
const RemixBadgeStyles({
class RemixBadgeStyle extends StyleRecipe<RemixBadgeStyle> {
const RemixBadgeStyle({
this.container = const Style.empty(),
this.label = const Style.empty(),
});

final Style container;
final Style label;

factory RemixBadgeStyles.base() {
return RemixBadgeStyles(
factory RemixBadgeStyle.base() {
return RemixBadgeStyle(
container: _container(),
label: _label(),
);
}

@override
RemixBadgeStyles applyVariants(List<Variant> variants) {
return RemixBadgeStyles(
RemixBadgeStyle applyVariants(List<Variant> variants) {
return RemixBadgeStyle(
container: container.applyVariants(variants),
label: label.applyVariants(variants),
);
}

@override
RemixBadgeStyles copyWith({
RemixBadgeStyle copyWith({
Style? container,
Style? label,
}) {
return RemixBadgeStyles(
return RemixBadgeStyle(
container: this.container.merge(container),
label: this.label.merge(label),
);
}

@override
RemixBadgeStyles merge(RemixBadgeStyles? other) {
RemixBadgeStyle merge(RemixBadgeStyle? other) {
return copyWith(
container: other?.container,
label: other?.label,
Expand Down
22 changes: 10 additions & 12 deletions lib/components/button/button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:remix_ui/components/button/button.variants.dart';
import '../../utils/component_recipe.dart';

class RemixButton extends StatelessWidget
implements RemixComponentRecipe<RemixButtonStyles> {
implements RemixComponentRecipe<RemixButtonStyle> {
const RemixButton({
super.key,
this.label,
Expand All @@ -33,27 +33,25 @@ class RemixButton extends StatelessWidget
final VoidCallback? onPressed;

@override
final RemixButtonStyles? style;
final RemixButtonStyle? style;

@override
final List<Variant> variants;

RemixButtonStyles buildStyle(List<Variant> variants) {
final result = style == null ? RemixButtonStyles.baseForm() : style!;
RemixButtonStyle buildStyle(List<Variant> variants) {
final result = style == null ? RemixButtonStyle.baseForm() : style!;
return result.applyVariants(variants);
}


List<Widget> _buildChildren(BuildContext context, RemixButtonStyles style) {
if (isLoading) {
return _buildLoadingChildren(context, style);
}
return _buildDefaultChildren(style);
List<Widget> _buildChildren(BuildContext context, RemixButtonStyle style) {
return loading
? _buildLoadingChildren(context, style)
: _buildDefaultChildren(style);
}

List<Widget> _buildLoadingChildren(
BuildContext context,
RemixButtonStyles buttonStyle,
RemixButtonStyle buttonStyle,
) =>
[
_buildLoadingIndicator(MixData.create(context, buttonStyle.icon)),
Expand All @@ -78,7 +76,7 @@ class RemixButton extends StatelessWidget
);
}

List<Widget> _buildDefaultChildren(RemixButtonStyles style) => [
List<Widget> _buildDefaultChildren(RemixButtonStyle style) => [
if (iconLeft != null) StyledIcon(iconLeft, style: style.icon),
if (label != null) StyledText(label!, style: style.label),
if (iconRight != null) StyledIcon(iconRight, style: style.icon),
Expand Down
24 changes: 12 additions & 12 deletions lib/components/button/button.style.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:mix/mix.dart';
import 'package:remix_ui/components/button/button.variants.dart';

class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
const RemixButtonStyles({
class RemixButtonStyle extends StyleRecipe<RemixButtonStyle> {
const RemixButtonStyle({
this.container = const Style.empty(),
this.icon = const Style.empty(),
this.label = const Style.empty(),
Expand All @@ -13,49 +13,49 @@ class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
final Style icon;
final Style label;

factory RemixButtonStyles.baseForm() {
return RemixButtonStyles(
factory RemixButtonStyle.baseForm() {
return RemixButtonStyle(
container: _container(),
icon: _icon(),
label: _label(),
);
}

factory RemixButtonStyles.build([
RemixButtonStyles? other,
factory RemixButtonStyle.build([
RemixButtonStyle? other,
List<Variant> variants = const [],
]) {
return RemixButtonStyles(
return RemixButtonStyle(
container: _container(),
icon: _icon(),
label: _label(),
).merge(other).applyVariants(variants);
}

@override
RemixButtonStyles applyVariants(List<Variant> variants) {
return RemixButtonStyles(
RemixButtonStyle applyVariants(List<Variant> variants) {
return RemixButtonStyle(
container: container.applyVariants(variants),
icon: icon.applyVariants(variants),
label: label.applyVariants(variants),
);
}

@override
RemixButtonStyles copyWith({
RemixButtonStyle copyWith({
Style? container,
Style? icon,
Style? label,
}) {
return RemixButtonStyles(
return RemixButtonStyle(
container: this.container.merge(container),
icon: this.icon.merge(icon),
label: this.label.merge(label),
);
}

@override
RemixButtonStyles merge(RemixButtonStyles? other) {
RemixButtonStyle merge(RemixButtonStyle? other) {
return copyWith(
container: other?.container,
icon: other?.icon,
Expand Down
10 changes: 5 additions & 5 deletions lib/components/card/card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class PresableRemixCard extends RemixCard {
}

class RemixCard extends StatelessWidget
implements RemixComponentRecipe<RemixCardStyles> {
implements RemixComponentRecipe<RemixCardStyle> {
const RemixCard({
super.key,
required this.child,
Expand All @@ -35,7 +35,7 @@ class RemixCard extends StatelessWidget
factory RemixCard.pressable(
Widget child, {
void Function()? onTap,
RemixCardStyles? style,
RemixCardStyle? style,
}) {
return PresableRemixCard(
style: style,
Expand All @@ -47,13 +47,13 @@ class RemixCard extends StatelessWidget
final Widget child;

@override
final RemixCardStyles? style;
final RemixCardStyle? style;

@override
final List<Variant> variants;

RemixCardStyles buildStyle(List<Variant> variants) {
final result = style == null ? RemixCardStyles.base() : style!;
RemixCardStyle buildStyle(List<Variant> variants) {
final result = style == null ? RemixCardStyle.base() : style!;

return result.applyVariants(variants);
}
Expand Down
Loading

0 comments on commit 0b82902

Please sign in to comment.