Skip to content

[material_ui] Migrate M3 FilterChip template to use new gen_defaults #12849

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

Draft
QuncCccccc wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[material_ui] Migrate M3 FilterChip template to use new gen_defaults #12849

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
133 changes: 2 additions & 131 deletions packages/material_ui/lib/src/filter_chip.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import 'text_theme.dart';
import 'theme.dart';
import 'theme_data.dart';

part 'generated/filter_chip_defaults_m3.g.dart';

enum _ChipVariant { flat, elevated }

/// A Material Design filter chip.
Expand Down Expand Up @@ -299,134 +301,3 @@ class FilterChip extends StatelessWidget
);
}
}

// BEGIN GENERATED TOKEN PROPERTIES - FilterChip

// Do not edit by hand. The code between the "BEGIN GENERATED" and
// "END GENERATED" comments are generated from data in the Material
// Design token database by the script:
// dev/tools/gen_defaults/bin/gen_defaults.dart.

// dart format off
class _FilterChipDefaultsM3 extends ChipThemeData {
_FilterChipDefaultsM3(
this.context,
this.isEnabled,
this.isSelected,
this._chipVariant,
) : super(
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
showCheckmark: true,
);

final BuildContext context;
final bool isEnabled;
final bool isSelected;
final _ChipVariant _chipVariant;
late final ColorScheme _colors = Theme.of(context).colorScheme;
late final TextTheme _textTheme = Theme.of(context).textTheme;

@override
double? get elevation => _chipVariant == _ChipVariant.flat
? 0.0
: isEnabled ? 1.0 : 0.0;

@override
double? get pressElevation => 1.0;

@override
TextStyle? get labelStyle => _textTheme.labelLarge?.copyWith(
color: isEnabled
? isSelected
? _colors.onSecondaryContainer
: _colors.onSurfaceVariant
: _colors.onSurface,
);

@override
WidgetStateProperty<Color?>? get color =>
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
if (states.contains(WidgetState.selected) && states.contains(WidgetState.disabled)) {
return _chipVariant == _ChipVariant.flat
? _colors.onSurface.withOpacity(0.12)
: _colors.onSurface.withOpacity(0.12);
}
if (states.contains(WidgetState.disabled)) {
return _chipVariant == _ChipVariant.flat
? null
: _colors.onSurface.withOpacity(0.12);
}
if (states.contains(WidgetState.selected)) {
return _chipVariant == _ChipVariant.flat
? _colors.secondaryContainer
: _colors.secondaryContainer;
}
return _chipVariant == _ChipVariant.flat
? null
: _colors.surfaceContainerLow;
});

@override
Color? get shadowColor => _chipVariant == _ChipVariant.flat
? Colors.transparent
: _colors.shadow;

@override
Color? get surfaceTintColor => Colors.transparent;

@override
Color? get checkmarkColor => isEnabled
? isSelected
? _colors.onSecondaryContainer
: _colors.primary
: _colors.onSurface;

@override
Color? get deleteIconColor => isEnabled
? isSelected
? _colors.onSecondaryContainer
: _colors.onSurfaceVariant
: _colors.onSurface;

@override
BorderSide? get side => _chipVariant == _ChipVariant.flat && !isSelected
? isEnabled
? BorderSide(color: _colors.outlineVariant)
: BorderSide(color: _colors.onSurface.withOpacity(0.12))
: const BorderSide(color: Colors.transparent);

@override
IconThemeData? get iconTheme => IconThemeData(
color: isEnabled
? isSelected
? _colors.onSecondaryContainer
: _colors.primary
: _colors.onSurface,
size: 18.0,
);

@override
EdgeInsetsGeometry? get padding => const EdgeInsets.all(8.0);

/// The label padding of the chip scales with the font size specified in the
/// [labelStyle], and the system font size settings that scale font sizes
/// globally.
///
/// The chip at effective font size 14.0 starts with 8px on each side and as
/// the font size scales up to closer to 28.0, the label padding is linearly
/// interpolated from 8px to 4px. Once the label has a font size of 2 or
/// higher, label padding remains 4px.
@override
EdgeInsetsGeometry? get labelPadding {
final double fontSize = labelStyle?.fontSize ?? 14.0;
final double fontSizeRatio = MediaQuery.textScalerOf(context).scale(fontSize) / 14.0;
return EdgeInsets.lerp(
const EdgeInsets.symmetric(horizontal: 8.0),
const EdgeInsets.symmetric(horizontal: 4.0),
clampDouble(fontSizeRatio - 1.0, 0.0, 1.0),
)!;
}
}
// dart format on

// END GENERATED TOKEN PROPERTIES - FilterChip
5 changes: 5 additions & 0 deletions ...ded/generated/filter_chip_defaults.g.dart → .../generated/filter_chip_defaults_m3.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// Do not edit by hand. The code is generated from data in the Material
// Design token database by the script:
// packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart.
part of '../filter_chip.dart';

class _FilterChipDefaultsM3 extends ChipThemeData {
_FilterChipDefaultsM3(this.context, this.isEnabled, this.isSelected, this._chipVariant)
: super(
Expand Down
5 changes: 3 additions & 2 deletions packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import '../templates/card_template.dart';
// import '../templates/drawer_template.dart';
// import '../templates/expansion_tile_template.dart';
// import '../templates/fab_template.dart';
// import '../templates/filter_chip_template.dart';
import '../templates/filter_chip_template.dart';

// import '../templates/icon_button_template.dart';
// import '../templates/input_chip_template.dart';
// import '../templates/input_decorator_template.dart';
Expand Down Expand Up @@ -87,7 +88,7 @@ Future<void> main(List<String> args) async {
// const DrawerTemplateM3().generateFile(verbose: verbose);
// const ExpansionTileTemplateM3().generateFile(verbose: verbose);
// const FabTemplateM3().generateFile(verbose: verbose);
// const FilterChipTemplateM3().generateFile(verbose: verbose);
const FilterChipTemplateM3().generateFile(verbose: verbose);
// const IconButtonTemplateM3().generateFile(verbose: verbose);
// const InputChipTemplateM3().generateFile(verbose: verbose);
// const InputDecoratorTemplateM3().generateFile(verbose: verbose);
Expand Down
140 changes: 140 additions & 0 deletions packages/material_ui/tool/gen_defaults/templates/filter_chip_template.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
// Copyright 2013 The Flutter Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import '../data/filter_chip.dart';
import 'template.dart';

class FilterChipTemplateM3 extends TokenTemplateM3 {
const FilterChipTemplateM3();

@override
String get name => 'Filter Chip';

@override
String get parentFilePath => 'filter_chip.dart';

@override
String generateContents(String className) =>
'''
class $className extends ChipThemeData {
$className(
this.context,
this.isEnabled,
this.isSelected,
this._chipVariant,
) : super(
shape: ${shape(TokenFilterChip.containerShape)},
showCheckmark: true,
);

final BuildContext context;
final bool isEnabled;
final bool isSelected;
final _ChipVariant _chipVariant;
late final ColorScheme _colors = Theme.of(context).colorScheme;
late final TextTheme _textTheme = Theme.of(context).textTheme;

@override
double? get elevation => _chipVariant == _ChipVariant.flat
? ${TokenFilterChip.flatContainerElevation}
: isEnabled ? ${TokenFilterChip.elevatedContainerElevation} : ${TokenFilterChip.elevatedDisabledContainerElevation};

@override
double? get pressElevation => ${TokenFilterChip.elevatedPressedContainerElevation};

@override
TextStyle? get labelStyle => ${textStyle(TokenFilterChip.labelTextType, '_textTheme')}?.copyWith(
color: isEnabled
? isSelected
? ${color(TokenFilterChip.selectedLabelTextColor)}
: ${color(TokenFilterChip.unselectedLabelTextColor)}
: ${color(TokenFilterChip.disabledLabelTextColor)},
);

@override
WidgetStateProperty<Color?>? get color =>
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
if (states.contains(WidgetState.selected) && states.contains(WidgetState.disabled)) {
return _chipVariant == _ChipVariant.flat
? ${colorWithOpacity(TokenFilterChip.flatDisabledSelectedContainerColor, TokenFilterChip.flatDisabledSelectedContainerOpacity)}
: ${colorWithOpacity(TokenFilterChip.elevatedDisabledContainerColor, TokenFilterChip.elevatedDisabledContainerOpacity)};
}
if (states.contains(WidgetState.disabled)) {
return _chipVariant == _ChipVariant.flat
? null
: ${colorWithOpacity(TokenFilterChip.elevatedDisabledContainerColor, TokenFilterChip.elevatedDisabledContainerOpacity)};
}
if (states.contains(WidgetState.selected)) {
return _chipVariant == _ChipVariant.flat
? ${color(TokenFilterChip.flatSelectedContainerColor)}
: ${color(TokenFilterChip.elevatedSelectedContainerColor)};
}
return _chipVariant == _ChipVariant.flat
? null
: ${color(TokenFilterChip.elevatedUnselectedContainerColor)};
});

@override
Color? get shadowColor => _chipVariant == _ChipVariant.flat
? Colors.transparent
: ${color(TokenFilterChip.elevatedContainerShadowColor)};

@override
Color? get surfaceTintColor => Colors.transparent;

@override
Color? get checkmarkColor => isEnabled
? isSelected
? ${color(TokenFilterChip.withLeadingIconSelectedLeadingIconColor)}
: ${color(TokenFilterChip.withLeadingIconUnselectedLeadingIconColor)}
: ${color(TokenFilterChip.withLeadingIconDisabledLeadingIconColor)};

@override
Color? get deleteIconColor => isEnabled
? isSelected
? ${color(TokenFilterChip.withTrailingIconSelectedTrailingIconColor)}
: ${color(TokenFilterChip.withTrailingIconUnselectedTrailingIconColor)}
: ${color(TokenFilterChip.withTrailingIconDisabledTrailingIconColor)};

@override
BorderSide? get side => _chipVariant == _ChipVariant.flat && !isSelected
? isEnabled
? ${border(color(TokenFilterChip.flatUnselectedOutlineColor), width: TokenFilterChip.flatUnselectedOutlineWidth)}
: ${border(colorWithOpacity(TokenFilterChip.flatDisabledUnselectedOutlineColor, TokenFilterChip.flatDisabledUnselectedOutlineOpacity))}
: const BorderSide(color: Colors.transparent);

@override
IconThemeData? get iconTheme => IconThemeData(
color: isEnabled
? isSelected
? ${color(TokenFilterChip.withLeadingIconSelectedLeadingIconColor)}
: ${color(TokenFilterChip.withLeadingIconUnselectedLeadingIconColor)}
: ${color(TokenFilterChip.withLeadingIconDisabledLeadingIconColor)},
size: ${TokenFilterChip.withIconIconSize},
);

@override
EdgeInsetsGeometry? get padding => const EdgeInsets.all(8.0);

/// The label padding of the chip scales with the font size specified in the
/// [labelStyle], and the system font size settings that scale font sizes
/// globally.
///
/// The chip at effective font size 14.0 starts with 8px on each side and as
/// the font size scales up to closer to 28.0, the label padding is linearly
/// interpolated from 8px to 4px. Once the label has a font size of 2 or
/// higher, label padding remains 4px.
@override
EdgeInsetsGeometry? get labelPadding {
final double fontSize = labelStyle?.fontSize ?? 14.0;
final double fontSizeRatio = MediaQuery.textScalerOf(context).scale(fontSize) / 14.0;
return EdgeInsets.lerp(
const EdgeInsets.symmetric(horizontal: 8.0),
const EdgeInsets.symmetric(horizontal: 4.0),
clampDouble(fontSizeRatio - 1.0, 0.0, 1.0),
)!;
}
}
''';
}
Loading
Loading