Update `ThemeData.dialogTheme` type to accept `DialogThemeData` #155129

QuncCccccc · 2024-09-12T21:26:39Z

Following #153982, this PR is to normalize ThemeData.dialogTheme; change the DialogTheme dialogTheme property to DialogThemeData dialogTheme in ThemeData. In ThemeData() and ThemeData.copyWith(), the dialogTheme parameter type is changed to Object? to accept both DialogTheme and DialogThemeData 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 DialogTheme; DialogTheme is a new InheritedWidget subclass now.

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.

QuncCccccc · 2024-10-01T20:50:04Z

packages/flutter/lib/src/material/theme_data.dart

@@ -320,7 +320,8 @@ class ThemeData with Diagnosticable {
    ChipThemeData? chipTheme,
    DataTableThemeData? dataTableTheme,
    DatePickerThemeData? datePickerTheme,
-    DialogTheme? dialogTheme,
+    // TODO(QuncCccccc): Change the parameter type to DialogThemeData
+    Object? dialogTheme,


To help smooth rolling into G3, I updated the parameter type in ThemeData() and ThemeData.copyWith() to object? based on @chingjun's suggestion in cl/674011694(Thanks!) and added a TODO to change the parameter type back to DialogThemeData. Will do similar change in #153254.

TahaTesser

LGTM!

guidezpl

  _    ___ _____ __  __ 
 | |  / __|_   _|  \/  |
 | |_| (_ | | | | |\/| |
 |____\___| |_| |_|  |_|

guidezpl · 2024-10-02T12:24:40Z

packages/flutter/lib/src/material/theme_data.dart

@@ -497,7 +498,14 @@ class ThemeData with Diagnosticable {
    chipTheme ??= const ChipThemeData();
    dataTableTheme ??= const DataTableThemeData();
    datePickerTheme ??= const DatePickerThemeData();
-    dialogTheme ??= const DialogTheme();
+    if (dialogTheme != null) {


please add a TODO to clean this up

guidezpl · 2024-10-02T12:24:53Z

packages/flutter/lib/src/material/theme_data.dart

@@ -1510,6 +1519,13 @@ class ThemeData with Diagnosticable {
    ButtonBarThemeData? buttonBarTheme,
  }) {
    cupertinoOverrideTheme = cupertinoOverrideTheme?.noDefault();
+    if (dialogTheme != null) {


please add a TODO to clean this up

…a` (flutter/flutter#155129)

Manual roll Flutter from 0975e61 to ec2e12b (54 revisions) Manual roll requested by [email protected] flutter/flutter@0975e61...ec2e12b 2024-10-03 [email protected] Roll Flutter Engine from bd44b58e3204 to 247bc68c578e (7 revisions) (flutter/flutter#156144) 2024-10-03 [email protected] Roll Flutter Engine from 70232fa124d0 to bd44b58e3204 (1 revision) (flutter/flutter#156124) 2024-10-03 [email protected] Roll Flutter Engine from 33ac1b30ab0a to 70232fa124d0 (2 revisions) (flutter/flutter#156122) 2024-10-02 [email protected] Update `ThemeData.dialogTheme` type to accept `DialogThemeData` (flutter/flutter#155129) 2024-10-02 [email protected] Roll Flutter Engine from 751ab9b3c5eb to 33ac1b30ab0a (4 revisions) (flutter/flutter#156118) 2024-10-02 [email protected] Add back main() methods to benchmark benches. (flutter/flutter#156083) 2024-10-02 [email protected] Roll pub packages (flutter/flutter#156117) 2024-10-02 [email protected] Add `mouseCursor` property to `CupertinoCheckbox` (flutter/flutter#151788) 2024-10-02 [email protected] Roll Flutter Engine from 3bdc1c0a30b6 to 751ab9b3c5eb (3 revisions) (flutter/flutter#156115) 2024-10-02 [email protected] Roll pub packages (flutter/flutter#156114) 2024-10-02 [email protected] [ Cocoon ] Wait for task results to be received by the task runner before shutting down the task process (flutter/flutter#156002) 2024-10-02 [email protected] Allow mixing route transitions in one app. (flutter/flutter#150031) 2024-10-02 [email protected] Roll Flutter Engine from f20681241753 to 3bdc1c0a30b6 (5 revisions) (flutter/flutter#156107) 2024-10-02 [email protected] Update Upgrading-Engine's-Android-API-version.md to reflect code move (flutter/flutter#156108) 2024-10-02 [email protected] Roll Packages from ebcc4f0 to 7c97c88 (5 revisions) (flutter/flutter#156106) 2024-10-02 [email protected] Roll pub packages (flutter/flutter#156105) 2024-10-02 [email protected] fix wrong test in "fixing `DropdownMenu` keyboard navigation" (flutter/flutter#156084) 2024-10-02 [email protected] fix ReorderableList not passing in item extent builder (flutter/flutter#155994) 2024-10-02 98614782+auto-submit[bot]@users.noreply.github.com Reverts "integration_test: migrate to build.gradle.kts (#154125)" (flutter/flutter#156087) 2024-10-02 [email protected] Add deprecation warning for "flutter create --ios-language" (flutter/flutter#155867) 2024-10-02 [email protected] update flutter create generated projects to use package:flutter_lints 5.0.0 (flutter/flutter#156011) 2024-10-02 [email protected] Roll Flutter Engine from d48c35d16814 to f20681241753 (1 revision) (flutter/flutter#156080) 2024-10-02 [email protected] [Docs] `CupertinoListTile` API Example (flutter/flutter#154548) 2024-10-02 [email protected] integration_test: migrate to build.gradle.kts (flutter/flutter#154125) 2024-10-02 [email protected] Marks Windows_mokey native_assets_android to be flaky (flutter/flutter#156064) 2024-10-02 [email protected] Fix DropdownMenu does not rematch initialSelection when entries have changed (flutter/flutter#155757) 2024-10-02 [email protected] Roll Flutter Engine from 9b224bd2f895 to d48c35d16814 (1 revision) (flutter/flutter#156074) 2024-10-02 [email protected] Roll Flutter Engine from 8774940b9ddc to 9b224bd2f895 (1 revision) (flutter/flutter#156065) 2024-10-02 [email protected] Roll Flutter Engine from 21ad04948457 to 8774940b9ddc (1 revision) (flutter/flutter#156055) 2024-10-02 [email protected] Roll Flutter Engine from 767bdc38cf51 to 21ad04948457 (1 revision) (flutter/flutter#156049) 2024-10-02 [email protected] Roll Flutter Engine from 055969512dc5 to 767bdc38cf51 (1 revision) (flutter/flutter#156043) 2024-10-02 [email protected] Roll Flutter Engine from e0f049d69240 to 055969512dc5 (2 revisions) (flutter/flutter#156042) 2024-10-02 [email protected] fix `DropdownMenu` keyboard navigation when entries are filtered empty (flutter/flutter#155252) 2024-10-02 [email protected] Roll Flutter Engine from a5bc2e2708c7 to e0f049d69240 (1 revision) (flutter/flutter#156039) 2024-10-02 [email protected] mark {Linux,Windows} tool_integration_tests_* non-bringup (flutter/flutter#155773) 2024-10-02 [email protected] Roll Flutter Engine from a7abf7a8163e to a5bc2e2708c7 (2 revisions) (flutter/flutter#156038) 2024-10-02 [email protected] Roll Flutter Engine from df1982dd4482 to a7abf7a8163e (1 revision) (flutter/flutter#156032) 2024-10-02 [email protected] Add `enableSplash` parameter to `CarouselView` (flutter/flutter#155214) 2024-10-02 [email protected] Roll pub packages (flutter/flutter#156030) 2024-10-01 [email protected] Roll Flutter Engine from ab48d6d8c167 to df1982dd4482 (1 revision) (flutter/flutter#156029) 2024-10-01 [email protected] Marks Mac_arm64_ios hot_mode_dev_cycle_ios__benchmark to be unflaky (flutter/flutter#147289) 2024-10-01 [email protected] Add WidgetStateMouseCursor example and tests for it. (flutter/flutter#155552) 2024-10-01 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.5.0 to 4.6.0 (flutter/flutter#156024) 2024-10-01 [email protected] Roll Flutter Engine from e7b3ce717006 to ab48d6d8c167 (1 revision) (flutter/flutter#156023) ...

…a` (flutter/flutter#155129)

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

QuncCccccc mentioned this pull request Sep 24, 2024

Deprecate ThemeData.dialogBackgroundColor in favor of DialogThemeData.backgroundColor #155072

Merged

9 tasks

QuncCccccc added 3 commits October 1, 2024 13:44

Change ThemeData.dialogTheme type to DialogThemeData

ab74623

Add unit test

341069a

Change parameter type in ThemeData() and ThemeData.copy() to Object?

6a1489f

QuncCccccc force-pushed the update_dialog_theme_type branch from f27042e to 6a1489f Compare October 1, 2024 20:44

QuncCccccc changed the title ~~Change ThemeData.dialogTheme type to DialogThemeData~~ Normalize ThemeData.dialogTheme Oct 1, 2024

QuncCccccc changed the title ~~Normalize ThemeData.dialogTheme~~ Update ThemeData.dialogTheme type to accept DialogThemeData Oct 1, 2024

QuncCccccc commented Oct 1, 2024

View reviewed changes

QuncCccccc marked this pull request as ready for review October 1, 2024 20:58

QuncCccccc requested review from TahaTesser, guidezpl and Piinks October 1, 2024 20:59

QuncCccccc mentioned this pull request Oct 1, 2024

Normalize ThemeData.cardTheme #153254

Merged

9 tasks

TahaTesser approved these changes Oct 2, 2024

View reviewed changes

guidezpl approved these changes Oct 2, 2024

View reviewed changes

Address comments

cc81c1e

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

auto-submit bot merged commit 64906c2 into flutter:master Oct 2, 2024
74 checks passed

engine-flutter-autoroll mentioned this pull request Oct 3, 2024

Roll Flutter from fa402c8057a1 to ec2e12ba5099 (106 revisions) flutter/packages#7777

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

5d5b012

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 3, 2024

Roll Flutter from fa402c8057a1 to 58e0e00c63b6 (107 revisions) flutter/packages#7778

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

9d376b1

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 3, 2024

Roll Flutter from fa402c8057a1 to c8c2f4651a14 (109 revisions) flutter/packages#7779

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

c0a45f4

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 3, 2024

Roll Flutter from fa402c8057a1 to 91eb8d226d75 (110 revisions) flutter/packages#7780

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

c1a4355

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 3, 2024

Roll Flutter from fa402c8057a1 to 5ecf10052fc2 (111 revisions) flutter/packages#7782

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

845f0a4

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 3, 2024

Roll Flutter from fa402c8057a1 to d39550fb528c (113 revisions) flutter/packages#7784

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

b1f6051

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 4, 2024

Roll Flutter from fa402c8057a1 to 195f81e025de (122 revisions) flutter/packages#7789

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

81e47e3

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 4, 2024

Roll Flutter from fa402c8057a1 to 85abc1a3a469 (123 revisions) flutter/packages#7791

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

37011ef

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 4, 2024

Roll Flutter from fa402c8057a1 to 85abc1a3a469 (123 revisions) flutter/packages#7793

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

7a5d94e

…a` (flutter/flutter#155129)

Piinks mentioned this pull request Oct 4, 2024

Flutter Framework Team: Notable Commits #121415

Closed

engine-flutter-autoroll mentioned this pull request Oct 5, 2024

Roll Flutter from fa402c8057a1 to 0917e9dfdce0 (135 revisions) flutter/packages#7797

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

7ac739e

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 5, 2024

Roll Flutter from fa402c8057a1 to 0917e9dfdce0 (135 revisions) flutter/packages#7798

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

691cae2

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 6, 2024

Roll Flutter from fa402c8057a1 to bae797143174 (138 revisions) flutter/packages#7799

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

38d71b2

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 6, 2024

Roll Flutter from fa402c8057a1 to bae797143174 (138 revisions) flutter/packages#7800

Closed

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

5c90f0a

…a` (flutter/flutter#155129)

engine-flutter-autoroll mentioned this pull request Oct 8, 2024

Manual roll Flutter from 0975e612c04a to ec2e12ba5099 (54 revisions) flutter/packages#7815

Merged

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

d46cc00

…a` (flutter/flutter#155129)

barbl058 mentioned this pull request Nov 4, 2024

[DO NOT MERGE] Add Support to flutter 3.27 peiffer-innovations/json_theme#229

Merged

8 tasks

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

89ac0a6

…a` (flutter/flutter#155129)

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

64906c2 Update ThemeData.dialogTheme type to accept `DialogThemeDat…

d024912

…a` (flutter/flutter#155129)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update `ThemeData.dialogTheme` type to accept `DialogThemeData` #155129

Update `ThemeData.dialogTheme` type to accept `DialogThemeData` #155129

Uh oh!

QuncCccccc commented Sep 12, 2024 •

edited

Loading

Uh oh!

QuncCccccc Oct 1, 2024 •

edited

Loading

Uh oh!

TahaTesser left a comment

Uh oh!

guidezpl left a comment

Uh oh!

guidezpl Oct 2, 2024

Uh oh!

guidezpl Oct 2, 2024

Uh oh!

Uh oh!

Uh oh!

Update ThemeData.dialogTheme type to accept DialogThemeData #155129

Update ThemeData.dialogTheme type to accept DialogThemeData #155129

Uh oh!

Conversation

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

Uh oh!

Pre-launch Checklist

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TahaTesser left a comment

Choose a reason for hiding this comment

Uh oh!

guidezpl left a comment

Choose a reason for hiding this comment

Uh oh!

guidezpl Oct 2, 2024

Choose a reason for hiding this comment

Uh oh!

guidezpl Oct 2, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Update `ThemeData.dialogTheme` type to accept `DialogThemeData` #155129

Update `ThemeData.dialogTheme` type to accept `DialogThemeData` #155129

QuncCccccc commented Sep 12, 2024 •

edited

Loading

QuncCccccc Oct 1, 2024 •

edited

Loading