Skip to content

Remove ThemeData.buttonColor references #118658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 24, 2023

Conversation

gspencergoog
Copy link
Contributor

@gspencergoog gspencergoog commented Jan 18, 2023

Description

This removes references to the deprecated ThemeData.buttonColor from the framework. The deprecation period has elapsed, and the attribute is removed.

Verified that customer tests (including Google) do not have any remaining instances of buttonColor.

Related PRs

Related Issues

Tests

  • Updated tests to not test for buttonColor anymore.

@flutter-dashboard flutter-dashboard bot added f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. labels Jan 18, 2023
Copy link
Contributor

@Piinks Piinks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

Copy link
Contributor

@darrenaustin darrenaustin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as well. Nice clean up, glad to see it go!

@gspencergoog gspencergoog added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 23, 2023
Copy link
Contributor

@HansMuller HansMuller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking: do the references to buttonColor in the following files need to change?

  • packages/flutter/test_fixes/material/theme_data.dart
  • packages/flutter/lib/src/material/button_theme.dart
  • packages/flutter/test/material/theme_data_test.dart

Also the API doc for ThemeData.colorScheme mentions buttonColor.

@gspencergoog gspencergoog removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 23, 2023
@@ -1405,14 +1391,14 @@ class ThemeData with Diagnosticable {
/// The color of [Material] when it is used as a [Card].
final Color cardColor;

/// A set of twelve colors that can be used to configure the
/// color properties of most components.
/// A set of twelve colors that can be used to configure the color properties
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ColorScheme is 30 colors. It might make sense to macro the first line from https://api.flutter.dev/flutter/material/ColorScheme-class.html to avoid having this go out of sync again when additional color scheme colors are added in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I'll update that.

@gspencergoog gspencergoog added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 23, 2023
@auto-submit auto-submit bot merged commit df44208 into flutter:master Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jan 24, 2023
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 24, 2023
* 3bf7960 [web] Fix paths fetched by flutter.js (flutter/flutter#118684)

* e71e8da 76998e529 Roll Fuchsia Linux SDK from f613tOkDB282hW2tA... to GLRbnjiO5SbZKX-Us... (flutter/engine#39067) (flutter/flutter#119009)

* 71a4256 Revert "[Re-land] Button padding m3 (#118640)" (flutter/flutter#118962)

* 90ffb1c 94fc0728f Roll Dart SDK from c52810968747 to 107a1280a61f (1 revision) (flutter/engine#39069) (flutter/flutter#119010)

* 224e6aa Remove unnecessary null checks in flutter/gestures (flutter/flutter#118926)

* 6cd4945 Remove unnecessary null checks in flutter_web_plugins (flutter/flutter#118862)

* a63e19b Remove unnecessary null checks in flutter_localizations (flutter/flutter#118863)

* 19dfde6 Remove unnecessary null checks in `flutter/{foundation,services,physics}` (flutter/flutter#118910)

* 392dffe Update the Linux Android defines test to use dimensions when selecting a build bot (flutter/flutter#118930)

* 5e50ed9 Test Utf8FromUtf16 (flutter/flutter#118647)

* edb571e Update README.md (flutter/flutter#118803)

* 38630b6 Remove unnecessary null checks in `flutter_tool` (flutter/flutter#118857)

* 332aed9 Revert "Update the Linux Android defines test to use dimensions when selecting a build bot (#118930)" (flutter/flutter#119023)

* 84071aa Add todo for linux defines test. (flutter/flutter#119035)

* e8b7f4b [examples] Fix typo in `refresh_indicator` example (flutter/flutter#119000)

* df44208 Remove ThemeData.buttonColor references (flutter/flutter#118658)

* 6548616 Remove animated_complex_opacity_perf_macos__e2e_summary bringup (flutter/flutter#118916)

* 59767e5 Remove unnecessary null checks in `flutter/material` (flutter/flutter#119022)

* 1906ce5 7d3233d26 [web] Build multiple CanvasKit variants (using toolchain_args) (flutter/engine#38448) (flutter/flutter#119021)

* 720bea0 Remove unnecessary null checks in `flutter/widgets` (flutter/flutter#119028)

* 0de8bef Remove unnecessary null checks in flutter/cupertino (flutter/flutter#119020)

* 2e8dd9d Run integration_ui_test_test_macos in prod (flutter/flutter#118919)

* 64b4c69 roll pub deps and remove archive, crypto, typed_data from allow-list (flutter/flutter#119018)

* c35efda Remove superfluous words. (flutter/flutter#119008)
auto-submit bot pushed a commit to flutter/plugins that referenced this pull request Jan 24, 2023
* 3bf7960 [web] Fix paths fetched by flutter.js (flutter/flutter#118684)

* e71e8da 76998e529 Roll Fuchsia Linux SDK from f613tOkDB282hW2tA... to GLRbnjiO5SbZKX-Us... (flutter/engine#39067) (flutter/flutter#119009)

* 71a4256 Revert "[Re-land] Button padding m3 (#118640)" (flutter/flutter#118962)

* 90ffb1c 94fc0728f Roll Dart SDK from c52810968747 to 107a1280a61f (1 revision) (flutter/engine#39069) (flutter/flutter#119010)

* 224e6aa Remove unnecessary null checks in flutter/gestures (flutter/flutter#118926)

* 6cd4945 Remove unnecessary null checks in flutter_web_plugins (flutter/flutter#118862)

* a63e19b Remove unnecessary null checks in flutter_localizations (flutter/flutter#118863)

* 19dfde6 Remove unnecessary null checks in `flutter/{foundation,services,physics}` (flutter/flutter#118910)

* 392dffe Update the Linux Android defines test to use dimensions when selecting a build bot (flutter/flutter#118930)

* 5e50ed9 Test Utf8FromUtf16 (flutter/flutter#118647)

* edb571e Update README.md (flutter/flutter#118803)

* 38630b6 Remove unnecessary null checks in `flutter_tool` (flutter/flutter#118857)

* 332aed9 Revert "Update the Linux Android defines test to use dimensions when selecting a build bot (#118930)" (flutter/flutter#119023)

* 84071aa Add todo for linux defines test. (flutter/flutter#119035)

* e8b7f4b [examples] Fix typo in `refresh_indicator` example (flutter/flutter#119000)

* df44208 Remove ThemeData.buttonColor references (flutter/flutter#118658)

* 6548616 Remove animated_complex_opacity_perf_macos__e2e_summary bringup (flutter/flutter#118916)

* 59767e5 Remove unnecessary null checks in `flutter/material` (flutter/flutter#119022)

* 1906ce5 7d3233d26 [web] Build multiple CanvasKit variants (using toolchain_args) (flutter/engine#38448) (flutter/flutter#119021)

* 720bea0 Remove unnecessary null checks in `flutter/widgets` (flutter/flutter#119028)

* 0de8bef Remove unnecessary null checks in flutter/cupertino (flutter/flutter#119020)

* 2e8dd9d Run integration_ui_test_test_macos in prod (flutter/flutter#118919)

* 64b4c69 roll pub deps and remove archive, crypto, typed_data from allow-list (flutter/flutter#119018)

* c35efda Remove superfluous words. (flutter/flutter#119008)
mauricioluz pushed a commit to mauricioluz/plugins that referenced this pull request Jan 26, 2023
* 3bf7960 [web] Fix paths fetched by flutter.js (flutter/flutter#118684)

* e71e8da 76998e529 Roll Fuchsia Linux SDK from f613tOkDB282hW2tA... to GLRbnjiO5SbZKX-Us... (flutter/engine#39067) (flutter/flutter#119009)

* 71a4256 Revert "[Re-land] Button padding m3 (#118640)" (flutter/flutter#118962)

* 90ffb1c 94fc0728f Roll Dart SDK from c52810968747 to 107a1280a61f (1 revision) (flutter/engine#39069) (flutter/flutter#119010)

* 224e6aa Remove unnecessary null checks in flutter/gestures (flutter/flutter#118926)

* 6cd4945 Remove unnecessary null checks in flutter_web_plugins (flutter/flutter#118862)

* a63e19b Remove unnecessary null checks in flutter_localizations (flutter/flutter#118863)

* 19dfde6 Remove unnecessary null checks in `flutter/{foundation,services,physics}` (flutter/flutter#118910)

* 392dffe Update the Linux Android defines test to use dimensions when selecting a build bot (flutter/flutter#118930)

* 5e50ed9 Test Utf8FromUtf16 (flutter/flutter#118647)

* edb571e Update README.md (flutter/flutter#118803)

* 38630b6 Remove unnecessary null checks in `flutter_tool` (flutter/flutter#118857)

* 332aed9 Revert "Update the Linux Android defines test to use dimensions when selecting a build bot (#118930)" (flutter/flutter#119023)

* 84071aa Add todo for linux defines test. (flutter/flutter#119035)

* e8b7f4b [examples] Fix typo in `refresh_indicator` example (flutter/flutter#119000)

* df44208 Remove ThemeData.buttonColor references (flutter/flutter#118658)

* 6548616 Remove animated_complex_opacity_perf_macos__e2e_summary bringup (flutter/flutter#118916)

* 59767e5 Remove unnecessary null checks in `flutter/material` (flutter/flutter#119022)

* 1906ce5 7d3233d26 [web] Build multiple CanvasKit variants (using toolchain_args) (flutter/engine#38448) (flutter/flutter#119021)

* 720bea0 Remove unnecessary null checks in `flutter/widgets` (flutter/flutter#119028)

* 0de8bef Remove unnecessary null checks in flutter/cupertino (flutter/flutter#119020)

* 2e8dd9d Run integration_ui_test_test_macos in prod (flutter/flutter#118919)

* 64b4c69 roll pub deps and remove archive, crypto, typed_data from allow-list (flutter/flutter#119018)

* c35efda Remove superfluous words. (flutter/flutter#119008)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants