• Taha Tesser's avatar
    Introduce MaterialState `color` property for chips (#128584) · 467c970b
    Taha Tesser authored
    fixes https://github.com/flutter/flutter/issues/115827
    fixes https://github.com/flutter/flutter/issues/101325
    
    ### Description
    1. This PR adds a new MaterialState `color` property to all the chips (this makes it possible to customize chips in all states from the M3 specs).
    2. Updated defaults to use the new  MaterialState `color` property.
    3. Updated and added new tests to all the chip test classes.
    
    <details> 
    <summary>code sample</summary> 
    
    ```dart
    import 'package:flutter/material.dart';
    
    const Color disabledColor = Colors.black26;
    const Color backgroundColor = Colors.cyan;
    final Color disabledSelectedColor = Colors.red.shade100;
    const Color selectedColor = Colors.amber;
    final MaterialStateProperty<Color> color =
        MaterialStateProperty.resolveWith((Set<MaterialState> states) {
      if (states.contains(MaterialState.disabled) &&
          states.contains(MaterialState.selected)) {
        return disabledSelectedColor;
      }
      if (states.contains(MaterialState.disabled)) {
        return disabledColor;
      }
      if (states.contains(MaterialState.selected)) {
        return selectedColor;
      }
      return backgroundColor;
    });
    
    void main() => runApp(const MyApp());
    
    class MyApp extends StatelessWidget {
      const MyApp({super.key});
    
      @override
      Widget build(BuildContext context) {
        return MaterialApp(
          debugShowCheckedModeBanner: false,
          theme: ThemeData(
            useMaterial3: true,
            // chipTheme: ChipThemeData(color: color),
          ),
          home: const Example(),
        );
      }
    }
    
    class Example extends StatefulWidget {
      const Example({super.key});
    
      @override
      State<Example> createState() => _ExampleState();
    }
    
    class _ExampleState extends State<Example> {
      bool enabled = false;
      bool selected = true;
    
      @override
      Widget build(BuildContext context) {
        const Widget verticalSpace = SizedBox(height: 20);
    
        return Scaffold(
          body: Center(
            child: Column(
              children: <Widget>[
                const SizedBox(height: 25),
                Row(
                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                  children: <Widget>[
                    const Card(
                      elevation: 0.0,
                      color: disabledColor,
                      child: Padding(
                        padding: EdgeInsets.all(8.0),
                        child: Text('disabledColor'),
                      ),
                    ),
                    const Card(
                      elevation: 0.0,
                      color: backgroundColor,
                      child: Padding(
                        padding: EdgeInsets.all(8.0),
                        child: Text('backgroundColor'),
                      ),
                    ),
                    Card(
                      elevation: 0.0,
                      color: disabledSelectedColor,
                      child: const Padding(
                        padding: EdgeInsets.all(8.0),
                        child: Text('disabledSelectedColor'),
                      ),
                    ),
                    const Card(
                      elevation: 0.0,
                      color: selectedColor,
                      child: Padding(
                        padding: EdgeInsets.all(8.0),
                        child: Text('selectedColor'),
                      ),
                    ),
                  ],
                ),
                const Spacer(),
                Row(
                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                  children: <Widget>[
                    Column(
                      mainAxisSize: MainAxisSize.min,
                      mainAxisAlignment: MainAxisAlignment.center,
                      children: <Widget>[
                        RawChip(
                          selected: selected,
                          selectedColor: selectedColor,
                          color: color,
                          label: const Text('RawChip'),
                          isEnabled: enabled,
                          onSelected: enabled ? (bool value) {} : null,
                        ),
                        verticalSpace,
                        InputChip(
                          isEnabled: enabled,
                          selected: selected,
                          selectedColor: selectedColor,
                          color: color,
                          label: const Text('InputChip'),
                          onSelected: enabled ? (bool value) {} : null,
                        ),
                      ],
                    ),
                    Column(
                      mainAxisSize: MainAxisSize.min,
                      children: <Widget>[
                        FilterChip(
                          selected: selected,
                          selectedColor: selectedColor,
                          color: color,
                          label: const Text('FilterChip'),
                          onSelected: enabled ? (bool value) {} : null,
                        ),
                        verticalSpace,
                        FilterChip.elevated(
                          selected: selected,
                          selectedColor: selectedColor,
                          color: color,
                          label: const Text('FilterChip.elevated'),
                          onSelected: enabled ? (bool value) {} : null,
                        ),
                      ],
                    ),
                    Column(
                      mainAxisSize: MainAxisSize.min,
                      children: <Widget>[
                        ChoiceChip(
                          selected: selected,
                          selectedColor: selectedColor,
                          color: color,
                          label: const Text('ChoiceChip'),
                          onSelected: enabled ? (bool value) {} : null,
                        ),
                        verticalSpace,
                        ChoiceChip.elevated(
                          selected: selected,
                          selectedColor: selectedColor,
                          color: color,
                          label: const Text('ChoiceChip.elevated'),
                          onSelected: enabled ? (bool value) {} : null,
                        ),
                      ],
                    ),
                  ],
                ),
                const Spacer(),
                Row(
                  children: <Widget>[
                    Flexible(
                      child: SwitchListTile(
                        title: const Text('Enabled'),
                        value: enabled,
                        onChanged: (bool value) {
                          setState(() => enabled = value);
                        },
                      ),
                    ),
                    Flexible(
                      child: SwitchListTile(
                        title: const Text('Selected'),
                        value: selected,
                        onChanged: (bool value) {
                          setState(() => selected = value);
                        },
                      ),
                    ),
                  ],
                )
              ],
            ),
          ),
        );
      }
    }
    
    ``` 
    	
    </details>
    
    ### Before (not possible to customize disabled and selected chips)
    
    ![Screenshot 2023-06-13 at 16 27 13](https://github.com/flutter/flutter/assets/48603081/633f09f7-16a1-469e-b326-b9cc0ed59242)
    
    ### After (using disabled and selected chips using the new  MaterialState `color` property)
    
    ![Screenshot 2023-06-13 at 16 26 53](https://github.com/flutter/flutter/assets/48603081/7f5dffb7-4074-4268-87c0-c059c2da67a8)
    467c970b
Name
Last commit
Last update
..
about_test.dart Loading commit data...
action_chip_test.dart Loading commit data...
action_icons_theme_test.dart Loading commit data...
adaptive_text_selection_toolbar_test.dart Loading commit data...
animated_icons_test.dart Loading commit data...
app_bar_test.dart Loading commit data...
app_bar_theme_test.dart Loading commit data...
app_builder_test.dart Loading commit data...
app_test.dart Loading commit data...
arc_test.dart Loading commit data...
autocomplete_test.dart Loading commit data...
back_button_test.dart Loading commit data...
badge_test.dart Loading commit data...
badge_theme_test.dart Loading commit data...
banner_test.dart Loading commit data...
banner_theme_test.dart Loading commit data...
bottom_app_bar_test.dart Loading commit data...
bottom_app_bar_theme_test.dart Loading commit data...
bottom_navigation_bar_test.dart Loading commit data...
bottom_navigation_bar_theme_test.dart Loading commit data...
bottom_sheet_test.dart Loading commit data...
bottom_sheet_theme_test.dart Loading commit data...
button_bar_test.dart Loading commit data...
button_bar_theme_test.dart Loading commit data...
button_style_test.dart Loading commit data...
button_theme_test.dart Loading commit data...
calendar_date_picker_test.dart Loading commit data...
card_test.dart Loading commit data...
card_theme_test.dart Loading commit data...
checkbox_list_tile_test.dart Loading commit data...
checkbox_test.dart Loading commit data...
checkbox_theme_test.dart Loading commit data...
chip_test.dart Loading commit data...
chip_theme_test.dart Loading commit data...
choice_chip_test.dart Loading commit data...
circle_avatar_test.dart Loading commit data...
color_scheme_test.dart Loading commit data...
colors_test.dart Loading commit data...
data_table_test.dart Loading commit data...
data_table_test_utils.dart Loading commit data...
data_table_theme_test.dart Loading commit data...
date_picker_test.dart Loading commit data...
date_picker_theme_test.dart Loading commit data...
date_range_picker_test.dart Loading commit data...
debug_test.dart Loading commit data...
desktop_text_selection_toolbar_button_test.dart Loading commit data...
desktop_text_selection_toolbar_test.dart Loading commit data...
dialog_test.dart Loading commit data...
dialog_theme_test.dart Loading commit data...
divider_test.dart Loading commit data...
divider_theme_test.dart Loading commit data...
drawer_button_test.dart Loading commit data...
drawer_test.dart Loading commit data...
drawer_theme_test.dart Loading commit data...
dropdown_form_field_test.dart Loading commit data...
dropdown_menu_test.dart Loading commit data...
dropdown_menu_theme_test.dart Loading commit data...
dropdown_test.dart Loading commit data...
elevated_button_test.dart Loading commit data...
elevated_button_theme_test.dart Loading commit data...
elevation_overlay_test.dart Loading commit data...
expand_icon_test.dart Loading commit data...
expansion_panel_test.dart Loading commit data...
expansion_tile_test.dart Loading commit data...
expansion_tile_theme_test.dart Loading commit data...
feedback_test.dart Loading commit data...
feedback_tester.dart Loading commit data...
filled_button_test.dart Loading commit data...
filled_button_theme_test.dart Loading commit data...
filter_chip_test.dart Loading commit data...
flexible_space_bar_collapse_mode_test.dart Loading commit data...
flexible_space_bar_stretch_mode_test.dart Loading commit data...
flexible_space_bar_test.dart Loading commit data...
floating_action_button_location_test.dart Loading commit data...
floating_action_button_test.dart Loading commit data...
floating_action_button_theme_test.dart Loading commit data...
flutter_logo_test.dart Loading commit data...
grid_title_test.dart Loading commit data...
icon_button_test.dart Loading commit data...
icon_button_theme_test.dart Loading commit data...
icons_test.dart Loading commit data...
inherited_theme_test.dart Loading commit data...
ink_paint_test.dart Loading commit data...
ink_sparkle_test.dart Loading commit data...
ink_splash_test.dart Loading commit data...
ink_well_test.dart Loading commit data...
input_chip_test.dart Loading commit data...
input_date_picker_form_field_test.dart Loading commit data...
input_decorator_test.dart Loading commit data...
list_tile_test.dart Loading commit data...
list_tile_theme_test.dart Loading commit data...
localizations_test.dart Loading commit data...
magnifier_test.dart Loading commit data...
material_button_test.dart Loading commit data...
material_state_mixin_test.dart Loading commit data...
material_state_property_test.dart Loading commit data...
material_states_controller_test.dart Loading commit data...
material_test.dart Loading commit data...
menu_anchor_test.dart Loading commit data...
menu_bar_theme_test.dart Loading commit data...
menu_button_theme_test.dart Loading commit data...
menu_style_test.dart Loading commit data...
menu_theme_test.dart Loading commit data...
mergeable_material_test.dart Loading commit data...
navigation_bar_test.dart Loading commit data...
navigation_bar_theme_test.dart Loading commit data...
navigation_drawer_test.dart Loading commit data...
navigation_drawer_theme_test.dart Loading commit data...
navigation_rail_test.dart Loading commit data...
navigation_rail_theme_test.dart Loading commit data...
outlined_button_test.dart Loading commit data...
outlined_button_theme_test.dart Loading commit data...
page_selector_test.dart Loading commit data...
page_test.dart Loading commit data...
page_transitions_theme_test.dart Loading commit data...
paginated_data_table_test.dart Loading commit data...
persistent_bottom_sheet_test.dart Loading commit data...
popup_menu_test.dart Loading commit data...
popup_menu_theme_test.dart Loading commit data...
progress_indicator_test.dart Loading commit data...
progress_indicator_theme_test.dart Loading commit data...
radio_list_tile_test.dart Loading commit data...
radio_test.dart Loading commit data...
radio_theme_test.dart Loading commit data...
range_slider_test.dart Loading commit data...
raw_material_button_test.dart Loading commit data...
refresh_indicator_test.dart Loading commit data...
reorderable_list_test.dart Loading commit data...
scaffold_test.dart Loading commit data...
scrollbar_paint_test.dart Loading commit data...
scrollbar_test.dart Loading commit data...
scrollbar_theme_test.dart Loading commit data...
search_anchor_test.dart Loading commit data...
search_bar_theme_test.dart Loading commit data...
search_test.dart Loading commit data...
search_view_theme_test.dart Loading commit data...
segmented_button_test.dart Loading commit data...
segmented_button_theme_test.dart Loading commit data...
selection_area_test.dart Loading commit data...
slider_test.dart Loading commit data...
slider_theme_test.dart Loading commit data...
snack_bar_test.dart Loading commit data...
snack_bar_theme_test.dart Loading commit data...
spell_check_suggestions_toolbar_layout_delegate_test.dart Loading commit data...
spell_check_suggestions_toolbar_test.dart Loading commit data...
stepper_test.dart Loading commit data...
switch_list_tile_test.dart Loading commit data...
switch_test.dart Loading commit data...
switch_theme_test.dart Loading commit data...
tab_bar_theme_test.dart Loading commit data...
tabbed_scrollview_warp_test.dart Loading commit data...
tabs_test.dart Loading commit data...
text_button_test.dart Loading commit data...
text_button_theme_test.dart Loading commit data...
text_field_focus_test.dart Loading commit data...
text_field_helper_text_test.dart Loading commit data...
text_field_restoration_test.dart Loading commit data...
text_field_splash_test.dart Loading commit data...
text_field_test.dart Loading commit data...
text_form_field_restoration_test.dart Loading commit data...
text_form_field_test.dart Loading commit data...
text_selection_test.dart Loading commit data...
text_selection_theme_test.dart Loading commit data...
text_selection_toolbar_test.dart Loading commit data...
text_selection_toolbar_text_button_test.dart Loading commit data...
text_theme_test.dart Loading commit data...
theme_data_test.dart Loading commit data...
theme_defaults_test.dart Loading commit data...
theme_test.dart Loading commit data...
time_picker_test.dart Loading commit data...
time_picker_theme_test.dart Loading commit data...
time_test.dart Loading commit data...
toggle_buttons_test.dart Loading commit data...
toggle_buttons_theme_test.dart Loading commit data...
tooltip_test.dart Loading commit data...
tooltip_theme_test.dart Loading commit data...
tooltip_visibility_test.dart Loading commit data...
typography_test.dart Loading commit data...
user_accounts_drawer_header_test.dart Loading commit data...
value_indicating_slider_test.dart Loading commit data...
will_pop_test.dart Loading commit data...