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

Removed TabPageSelector accentColor dependency. (#77997)

Browse Source
This commit is contained in:
Darren Austin 2021-03-12 16:43:03 -08:00 committed by GitHub
parent f0fca7de8b
commit 2820d21cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/material/tabs.dart
View File

@ -1577,7 +1577,7 @@ class TabPageSelector extends StatelessWidget {
/// for all indicator circles. /// for all indicator circles.
/// ///
/// If this parameter is null, then the indicator is filled with the theme's /// If this parameter is null, then the indicator is filled with the theme's
/// accent color, [ThemeData.accentColor]. /// [ColorScheme.secondary].
final Color? selectedColor; final Color? selectedColor;
Widget _buildTabIndicator( Widget _buildTabIndicator(
@ -1620,7 +1620,7 @@ class TabPageSelector extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Color fixColor = color ?? Colors.transparent; final Color fixColor = color ?? Colors.transparent;
final Color fixSelectedColor = selectedColor ?? Theme.of(context).accentColor; final Color fixSelectedColor = selectedColor ?? Theme.of(context).colorScheme.secondary;
final ColorTween selectedColorTween = ColorTween(begin: fixColor, end: fixSelectedColor); final ColorTween selectedColorTween = ColorTween(begin: fixColor, end: fixSelectedColor);
final ColorTween previousColorTween = ColorTween(begin: fixSelectedColor, end: fixColor); final ColorTween previousColorTween = ColorTween(begin: fixSelectedColor, end: fixColor);
final TabController? tabController = controller ?? DefaultTabController.of(context); final TabController? tabController = controller ?? DefaultTabController.of(context);

2
packages/flutter/test/material/page_selector_test.dart
View File

@ -12,7 +12,7 @@ Widget buildFrame(TabController tabController, { Color? color, Color? selectedCo
return Directionality( return Directionality(
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
child: Theme( child: Theme(
data: ThemeData(accentColor: kSelectedColor), data: ThemeData(colorScheme: const ColorScheme.light().copyWith(secondary: kSelectedColor)),
child: SizedBox.expand( child: SizedBox.expand(
child: Center( child: Center(
child: SizedBox( child: SizedBox(