ButtonTheme.of().colorScheme defers to Theme#22880
Merged
HansMuller merged 1 commit intoflutter:masterfrom Oct 10, 2018
Merged
Conversation
matthew-carroll
pushed a commit
to matthew-carroll/flutter
that referenced
this pull request
Oct 11, 2018
This reverts commit a590940.
Merged
matthew-carroll
added a commit
that referenced
this pull request
Oct 12, 2018
For G3 Roll: * Revert "MaterialButton must honor its minWidth and height parameters (#22919)" This reverts commit a023323. * Revert "Update uses of ButtonTheme.bar: pass along the current Theme's colorScheme (#22827)" This reverts commit 655bf6a. * Revert "ButtonTheme.of().colorScheme defers to Theme (#22880)" This reverts commit a590940. * Revert "Bring TextTheme into alignment with the current Material spec (#22330)" This reverts commit 8bfb4b3. * Revert "Added ColorScheme, updated ThemeData, ButtonTheme, material buttons (#22013)" This reverts commit eea3465. * Manual adjustments to fix reversion issues.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #22789
ButtonThemeData no longer requires a
colorScheme. If colorScheme is null,ButtonTheme.of()will initialize it from the current Theme.Also fixed ButtonThemeData.copyWith() which failed to copy the layoutBehavior field.
This undoes the many of the changes made in #22827, where a
colorSchemeparameter was added toButtonTheme.bar()constructor expressions.