Skip to content

Reland "migrate some material files to nullsafety (#67078)" - #67318

Merged
goderbauer merged 2 commits into
flutter:masterfrom
goderbauer:relandmaterialnnbd
Oct 5, 2020
Merged

goderbauer merged 2 commits into
flutter:masterfrom
goderbauer:relandmaterialnnbd

Conversation

@goderbauer

@goderbauer goderbauer commented Oct 5, 2020 •

Copy link
Copy Markdown
Member

This reverts commit a0a65fc.

Google failures were cased by marking _StandardBottomSheetState.close() as async in #67078:

https://github.com/flutter/flutter/pull/67078/files#diff-ad7e5ee7be5375e4242652ddc6448da7R2723

This changed the timing slightly in tests. Since there is no need for that method to be async, I am reverting that change to restore the old behavior. Additionally, I also cleaned up the nullability of Scaffold.geometryOf and _StandardBottomSheet.animationController to simplify the code.

See the last commit for changes over #67078.

@flutter-dashboard flutter-dashboard Bot added p: material_ui material_ui package in flutter/packages framework flutter/packages/flutter repository. See also f: labels. labels Oct 5, 2020
@goderbauer

Copy link
Copy Markdown
Member Author

/cc @a14n @Hixie @pcsosinski

@Hixie Hixie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

RSLGTM

Comment on lines +2723 to +2715
Future<void> close() async {
void close() {

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This was the reason for the google3 failure: In #67078 this method was marked async, which changes the timing slightly for tests. There's no need for it to be async, though. The main goal of this commit is to revert that.

@jonahwilliams jonahwilliams left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@a14n a14n left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@goderbauer

Copy link
Copy Markdown
Member Author

Landing, since the tree is actually green, but not reported properly (according to @jonahwilliams).

@goderbauer
goderbauer merged commit c14ab91 into flutter:master Oct 5, 2020
@goderbauer
goderbauer deleted the relandmaterialnnbd branch October 5, 2020 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

framework flutter/packages/flutter repository. See also f: labels. p: material_ui material_ui package in flutter/packages

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants