Unverified Commit 24bf6b81 authored by Hans Muller's avatar Hans Muller Committed by GitHub

Removed CheckboxListTile accentColor dependency (#76877)

parent ee54a72a
...@@ -26,10 +26,10 @@ import 'theme_data.dart'; ...@@ -26,10 +26,10 @@ import 'theme_data.dart';
/// those of the same name on [ListTile]. /// those of the same name on [ListTile].
/// ///
/// The [selected] property on this widget is similar to the [ListTile.selected] /// The [selected] property on this widget is similar to the [ListTile.selected]
/// property, but the color used is that described by [activeColor], if any, /// property, but the color used is [activeColor], if it's non-null.
/// defaulting to the accent color of the current [Theme]. No effort is made to /// No effort is made to coordinate the [selected] state and the
/// coordinate the [selected] state and the [value] state; to have the list tile /// [value] state; to have the list tile appear selected when the
/// appear selected when the checkbox is checked, pass the same value to both. /// checkbox is checked, pass the same value to both.
/// ///
/// The checkbox is shown on the right by default in left-to-right languages /// The checkbox is shown on the right by default in left-to-right languages
/// (i.e. the trailing edge). This can be changed using [controlAffinity]. The /// (i.e. the trailing edge). This can be changed using [controlAffinity]. The
...@@ -314,7 +314,8 @@ class CheckboxListTile extends StatelessWidget { ...@@ -314,7 +314,8 @@ class CheckboxListTile extends StatelessWidget {
/// The color to use when this checkbox is checked. /// The color to use when this checkbox is checked.
/// ///
/// Defaults to accent color of the current [Theme]. /// If this property is null, then the checkbox's default is used, which is
/// [ThemeData.toggleableActiveColor].
final Color? activeColor; final Color? activeColor;
/// The color to use for the check icon when this checkbox is checked. /// The color to use for the check icon when this checkbox is checked.
...@@ -430,25 +431,23 @@ class CheckboxListTile extends StatelessWidget { ...@@ -430,25 +431,23 @@ class CheckboxListTile extends StatelessWidget {
trailing = control; trailing = control;
break; break;
} }
return MergeSemantics( return MergeSemantics(
child: ListTileTheme.merge( child: ListTile(
selectedColor: activeColor ?? Theme.of(context).accentColor, leading: leading,
child: ListTile( title: title,
leading: leading, subtitle: subtitle,
title: title, trailing: trailing,
subtitle: subtitle, isThreeLine: isThreeLine,
trailing: trailing, dense: dense,
isThreeLine: isThreeLine, enabled: onChanged != null,
dense: dense, onTap: onChanged != null ? _handleValueChange : null,
enabled: onChanged != null, selected: selected,
onTap: onChanged != null ? _handleValueChange : null, autofocus: autofocus,
selected: selected, contentPadding: contentPadding,
autofocus: autofocus, shape: shape,
contentPadding: contentPadding, selectedTileColor: selectedTileColor,
shape: shape, tileColor: tileColor,
selectedTileColor: selectedTileColor,
tileColor: tileColor,
),
), ),
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment