firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Removed CheckboxListTile accentColor dependency (#76877)" (#76904)

Browse Source 
This reverts commit 24bf6b81d576b343e130b7c367c39bd4f35ad7c0.
This commit is contained in:
Hans Muller 2021-02-26 18:09:08 -08:00 committed by GitHub
parent 697547c3ea
commit c9ccb17710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/flutter/lib/src/material/checkbox_list_tile.dart
View File

@ -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 [activeColor], if it's non-null. /// property, but the color used is that described by [activeColor], if any,
/// No effort is made to coordinate the [selected] state and the /// defaulting to the accent color of the current [Theme]. No effort is made to
/// [value] state; to have the list tile appear selected when the /// coordinate the [selected] state and the [value] state; to have the list tile
/// checkbox is checked, pass the same value to both. /// appear selected when the 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,8 +314,7 @@ class CheckboxListTile extends StatelessWidget {
/// The color to use when this checkbox is checked. /// The color to use when this checkbox is checked.
/// ///
/// If this property is null, then the checkbox's default is used, which is /// Defaults to accent color of the current [Theme].
/// [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.
@ -431,23 +430,25 @@ class CheckboxListTile extends StatelessWidget {
trailing = control; trailing = control;
break; break;
} }
return MergeSemantics( return MergeSemantics(
child: ListTile( child: ListTileTheme.merge(
leading: leading, selectedColor: activeColor ?? Theme.of(context).accentColor,
title: title, child: ListTile(
subtitle: subtitle, leading: leading,
trailing: trailing, title: title,
isThreeLine: isThreeLine, subtitle: subtitle,
dense: dense, trailing: trailing,
enabled: onChanged != null, isThreeLine: isThreeLine,
onTap: onChanged != null ? _handleValueChange : null, dense: dense,
selected: selected, enabled: onChanged != null,
autofocus: autofocus, onTap: onChanged != null ? _handleValueChange : null,
contentPadding: contentPadding, selected: selected,
shape: shape, autofocus: autofocus,
selectedTileColor: selectedTileColor, contentPadding: contentPadding,
tileColor: tileColor, shape: shape,
selectedTileColor: selectedTileColor,
tileColor: tileColor,
),
), ),
); );
} }