Normalize TabBarTheme #155476

QuncCccccc · 2024-09-20T21:06:13Z

This PR is to make preparations to make TabBarTheme conform to Flutter's conventions for component themes:

Added a TabBarThemeData class which defines overrides for the defaults for TabBar properties.
Added 2 TabBarTheme constructor parameters: TabBarThemeData? data and Widget? child. This is now the preferred way to configure a TabBarTheme:

TabBarTheme(
  data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...),
  child: TabBar(...)
)

These two properties are made nullable to not break existing apps which has customized ThemeData.tabBarTheme.

Changed the type of component theme defaults from TabBarTheme to TabBarThemeData.

TODO:

Fix internal failures.
Change the type of ThemeData.tabBarTheme from TabBarTheme to TabBarThemeData. This may cause breaking changes, a migration guide will be created.

Addresses the "theme normalization" sub project within #91772

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
All existing and new tests are passing.

TahaTesser

Very nice! LGTM!

eyebrowsoffire · 2024-09-25T17:48:29Z

Reason for revert: The newly added tests are failing in postsubmit. See https://ci.chromium.org/ui/p/flutter/builders/prod/Windows%20framework_tests_libraries/19062/overview

This reverts commit f310625.

Reverts: #155476 Initiated by: eyebrowsoffire Reason for reverting: The newly added tests are failing in postsubmit. See https://ci.chromium.org/ui/p/flutter/builders/prod/Windows%20framework_tests_libraries/19062/overview Original PR Author: QuncCccccc Reviewed By: {TahaTesser} This change reverts the following previous change: This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within #91772

Roll Flutter from 4ca51a1 to 538e742 (40 revisions) flutter/flutter@4ca51a1...538e742 2024-09-25 fluttergithubbot@gmail.com Marks Linux build_aar_module_test to be unflaky (flutter/flutter#155349) 2024-09-25 engine-flutter-autoroll@skia.org Roll Packages from 4926c0f to 7da2374 (3 revisions) (flutter/flutter#155701) 2024-09-25 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Normalize TabBarTheme (#155476)" (flutter/flutter#155698) 2024-09-25 36861262+QuncCccccc@users.noreply.github.com Normalize TabBarTheme (flutter/flutter#155476) 2024-09-25 christopherfujino@gmail.com increase both linux & windows tool integration test shards (flutter/flutter#155631) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from c7cd559e483b to d6d5fdba6ae1 (1 revision) (flutter/flutter#155693) 2024-09-25 sokolovskyi.konstantin@gmail.com Add WidgetStateBorderSide example and tests for it. (flutter/flutter#155559) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from b9dd7a39dd58 to c7cd559e483b (1 revision) (flutter/flutter#155686) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from 87c1667dfd1e to b9dd7a39dd58 (1 revision) (flutter/flutter#155684) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from 05211f9d2267 to 87c1667dfd1e (1 revision) (flutter/flutter#155681) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8d1eb7410b49 to 05211f9d2267 (1 revision) (flutter/flutter#155672) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from ad3dd0df0fe7 to 8d1eb7410b49 (2 revisions) (flutter/flutter#155662) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from 746ce6124844 to ad3dd0df0fe7 (2 revisions) (flutter/flutter#155653) 2024-09-25 magder@google.com Add PrivacyInfo.xcprivacy to macOS plugin template (flutter/flutter#155570) 2024-09-25 engine-flutter-autoroll@skia.org Roll Flutter Engine from 559f2ff31c74 to 746ce6124844 (14 revisions) (flutter/flutter#155648) 2024-09-25 120297255+PurplePolyhedron@users.noreply.github.com fix `SearchAnchor` disposing `SearchController` while it is still used (flutter/flutter#155219) 2024-09-25 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#155640) 2024-09-24 hhugh@google.com Preserve transform when using *Gradient:withOpacity (flutter/flutter#154908) 2024-09-24 nick9822@gmail.com fixed keyboardDismissBehavior on scroll without a drag (flutter/flutter#154675) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7cd3d0b1bb2e to 559f2ff31c74 (3 revisions) (flutter/flutter#155629) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 2a13c3a27e1f to 7cd3d0b1bb2e (4 revisions) (flutter/flutter#155625) 2024-09-24 parlough@gmail.com Misc docs cleanup and fixes (flutter/flutter#155501) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from dc44f95b7027 to 2a13c3a27e1f (1 revision) (flutter/flutter#155619) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 2745b8797025 to dc44f95b7027 (1 revision) (flutter/flutter#155616) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8a54cc56d4b9 to 2745b8797025 (2 revisions) (flutter/flutter#155610) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from c07812775255 to 8a54cc56d4b9 (2 revisions) (flutter/flutter#155607) 2024-09-24 engine-flutter-autoroll@skia.org Roll Packages from 9de72be to 4926c0f (4 revisions) (flutter/flutter#155605) 2024-09-24 danny@tuppeny.com Fix some broken links in DAP readme (flutter/flutter#155600) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 22e4f015cc99 to c07812775255 (2 revisions) (flutter/flutter#155599) 2024-09-24 danny@tuppeny.com [flutter_tools] Fix encoded stderr in "dart.log" from debug adapter to client (flutter/flutter#155249) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 309468cfd1bb to 22e4f015cc99 (2 revisions) (flutter/flutter#155591) 2024-09-24 dacoharkes@google.com [native assets] Roll dependencies (flutter/flutter#155432) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 4013dc28a48b to 309468cfd1bb (2 revisions) (flutter/flutter#155588) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8a5af19a43f3 to 4013dc28a48b (1 revision) (flutter/flutter#155585) 2024-09-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 95c5a0940ad9 to 8a5af19a43f3 (10 revisions) (flutter/flutter#155583) 2024-09-24 sokolovskyi.konstantin@gmail.com Add `WidgetStateProperty` example and tests for it. (flutter/flutter#155315) 2024-09-24 30870216+gaaclarke@users.noreply.github.com Redo flutter engine flutter autoroll bd3d1990 485b 419c 8c55 b27e3eeb15ed 1727117767 (flutter/flutter#155579) 2024-09-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 61f0a3fbabbe to 9bb0ece79ae2 (2 revisions) (flutter/flutter#155549) 2024-09-23 magder@google.com Assert macOS framework artifact contains xcprivacy manifest (flutter/flutter#155189) 2024-09-23 engine-flutter-autoroll@skia.org Roll Packages from f54fe93 to 9de72be (1 revision) (flutter/flutter#155540) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC louisehsu@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. ...

This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

Reverts: flutter#155476 Initiated by: eyebrowsoffire Reason for reverting: The newly added tests are failing in postsubmit. See https://ci.chromium.org/ui/p/flutter/builders/prod/Windows%20framework_tests_libraries/19062/overview Original PR Author: QuncCccccc Reviewed By: {TahaTesser} This change reverts the following previous change: This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

gaaclarke · 2024-09-26T15:25:58Z

@QuncCccccc I mentioned this on discord but I know it's easy to get lost so I'll repeat it here:

the way we handled this is to avoid asserting .toString behavior. here's an example:

--- a/dev/tracing_tests/test/timeline_test.dart
+++ b/dev/tracing_tests/test/timeline_test.dart
@@ -108,7 +108,7 @@ void main() {
       <String>['BUILD', 'Placeholder', 'CustomPaint', 'LAYOUT', 'UPDATING COMPOSITING BITS', 'PAINT', 'COMPOSITING', 'FINALIZE TREE'],
     );
     args = (events.where((TimelineEvent event) => event.json!['name'] == '$Placeholder').single.json!['args'] as Map<String, Object?>).cast<String, String>();
-    expect(args['color'], 'Color(0xffffffff)');
+    expect(args['color'], '${const Color(0xffffffff)}');
     debugProfileBuildsEnabled = false;
     debugEnhanceBuildTimelineArguments = false;

This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

Reverts: flutter#155476 Initiated by: eyebrowsoffire Reason for reverting: The newly added tests are failing in postsubmit. See https://ci.chromium.org/ui/p/flutter/builders/prod/Windows%20framework_tests_libraries/19062/overview Original PR Author: QuncCccccc Reviewed By: {TahaTesser} This change reverts the following previous change: This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

Reverts: flutter#155476 Initiated by: eyebrowsoffire Reason for reverting: The newly added tests are failing in postsubmit. See https://ci.chromium.org/ui/p/flutter/builders/prod/Windows%20framework_tests_libraries/19062/overview Original PR Author: QuncCccccc Reviewed By: {TahaTesser} This change reverts the following previous change: This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

Reverts: flutter#155476 Initiated by: eyebrowsoffire Reason for reverting: The newly added tests are failing in postsubmit. See https://ci.chromium.org/ui/p/flutter/builders/prod/Windows%20framework_tests_libraries/19062/overview Original PR Author: QuncCccccc Reviewed By: {TahaTesser} This change reverts the following previous change: This PR is to make preparations to make `TabBarTheme` conform to Flutter's conventions for component themes: * Added a `TabBarThemeData` class which defines overrides for the defaults for `TabBar` properties. * Added 2 `TabBarTheme` constructor parameters: `TabBarThemeData? data` and `Widget? child`. This is now the preferred way to configure a `TabBarTheme`: ``` TabBarTheme( data: TabBarThemeData(labelColor: xxx, indicatorColor: xxx, ...), child: TabBar(...) ) ``` These two properties are made nullable to not break existing apps which has customized `ThemeData.tabBarTheme`. * Changed the type of component theme defaults from `TabBarTheme` to `TabBarThemeData`. TODO: * Fix internal failures. * Change the type of `ThemeData.tabBarTheme` from `TabBarTheme` to `TabBarThemeData`. This may cause breaking changes, a migration guide will be created. Addresses the "theme normalization" sub project within flutter#91772

This reverts commit 1c9607f.

Reland #155476 with test fix. The test fix uses the method mentioned in #155476 (comment).

@deprecated

Following #155476, this PR is to normalize `ThemeData.tabBarTheme`; change the `TabBarTheme tabBarTheme` property to `TabBarThemeData tabBarTheme` in `ThemeData`. In `ThemeData()` and `ThemeData.copyWith()`, the `tabBarTheme` parameter type is changed to `Object?` to accept both `TabBarTheme` and `TabBarThemeData` so that we won't cause immediate breaking change and make sure rolling is smooth. Once all component themes are normalized, these `Object?` types should be changed to `xxxThemeData`. There's no way to create a dart fix because we can't add a "@deprecated" label for TabBarTheme; TabBarTheme is a new InheritedWidget subclass now. Addresses the "theme normalization" sub project within #91772

Normalize TabBarTheme

ea63d73

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: material design flutter/packages/flutter/material repository. labels Sep 20, 2024

guidezpl mentioned this pull request Sep 23, 2024

☂️ Material Theme System Updates #91772

Open

43 tasks

Add tests

3f84750

QuncCccccc requested review from Piinks, TahaTesser and guidezpl September 24, 2024 21:50

QuncCccccc marked this pull request as ready for review September 24, 2024 21:51

Update

6e6ef9f

TahaTesser approved these changes Sep 25, 2024

View reviewed changes

QuncCccccc added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 25, 2024

auto-submit bot merged commit f310625 into flutter:master Sep 25, 2024

engine-flutter-autoroll mentioned this pull request Sep 25, 2024

Roll Flutter from 4ca51a1de597 to f310625bc6df (37 revisions) flutter/packages#7700

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 25, 2024

f310625 Normalize TabBarTheme (flutter/flutter#155476)

ac0889e

eyebrowsoffire added the revert Autorevert PR (with "Reason for revert:" comment) label Sep 25, 2024

auto-submit bot pushed a commit that referenced this pull request Sep 25, 2024

Revert "Normalize TabBarTheme (#155476)"

a5151d5

This reverts commit f310625.

auto-submit bot mentioned this pull request Sep 25, 2024

Reverts "Normalize TabBarTheme (#155476)" #155698

Merged

9 tasks

auto-submit bot removed the revert Autorevert PR (with "Reason for revert:" comment) label Sep 25, 2024

engine-flutter-autoroll mentioned this pull request Sep 25, 2024

Roll Flutter from 4ca51a1de597 to 1c9607fc9c98 (38 revisions) flutter/packages#7702

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 25, 2024

f310625 Normalize TabBarTheme (flutter/flutter#155476)

f64d5e4

engine-flutter-autoroll mentioned this pull request Sep 25, 2024

Roll Flutter from 4ca51a1de597 to 538e7424d018 (40 revisions) flutter/packages#7705

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 25, 2024

f310625 Normalize TabBarTheme (flutter/flutter#155476)

3494608

gaaclarke mentioned this pull request Sep 26, 2024

Engine -> Framework roll failing #155727

Closed

Piinks mentioned this pull request Sep 27, 2024

Flutter Framework Team: Notable Commits #121415

Closed

QuncCccccc added a commit that referenced this pull request Sep 30, 2024

Revert "Reverts "Normalize TabBarTheme (#155476)" (#155698)"

2a89417

This reverts commit 1c9607f.

QuncCccccc mentioned this pull request Sep 30, 2024

Reland TabBarTheme normalization #155969

Merged

9 tasks

auto-submit bot pushed a commit that referenced this pull request Oct 1, 2024

Reland TabBarTheme normalization (#155969)

33d3e4b

Reland #155476 with test fix. The test fix uses the method mentioned in #155476 (comment).

QuncCccccc mentioned this pull request Oct 8, 2024

Normalize ThemeData.tabBarTheme #156253

Merged

9 tasks

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 11, 2024

f310625 Normalize TabBarTheme (flutter/flutter#155476)

cea53e5

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 12, 2024

f310625 Normalize TabBarTheme (flutter/flutter#155476)

297061d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Normalize TabBarTheme #155476

Normalize TabBarTheme #155476

Uh oh!

QuncCccccc commented Sep 20, 2024 •

edited

Loading

Uh oh!

TahaTesser left a comment

Uh oh!

eyebrowsoffire commented Sep 25, 2024

Uh oh!

gaaclarke commented Sep 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Normalize TabBarTheme #155476

Normalize TabBarTheme #155476

Uh oh!

Conversation

QuncCccccc commented Sep 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

TahaTesser left a comment

Choose a reason for hiding this comment

Uh oh!

eyebrowsoffire commented Sep 25, 2024

Uh oh!

gaaclarke commented Sep 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

QuncCccccc commented Sep 20, 2024 •

edited

Loading