Skip to content

Cherry pick NavigationBar ink ripple fixes#119553

Merged
godofredoc merged 5 commits intoflutter:flutter-3.7-candidate.1from
Piinks:pickInk
Feb 7, 2023
Merged

Cherry pick NavigationBar ink ripple fixes#119553
godofredoc merged 5 commits intoflutter:flutter-3.7-candidate.1from
Piinks:pickInk

Conversation

@Piinks
Copy link
Contributor

@Piinks Piinks commented Jan 30, 2023 •
edited
Loading

Pick for: #119554

Main goal to cherry pick: #117473
Required pulling in already cherry picked: #117500

There were some conflicts based on a lot of changes in this file over the last month, some cherry picked, others not, can you check me on this @TahaTesser?

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.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@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 30, 2023
@Piinks Piinks mentioned this pull request Jan 30, 2023
Closed
@TahaTesser
Copy link
Contributor

TahaTesser commented Jan 31, 2023

@Piinks
This looks alright to me.

@XilaiZhang
Copy link
Contributor

XilaiZhang commented Jan 31, 2023

Umm I did a rerun of the presubmit tests but seem like they are still failing

@Piinks
Copy link
Contributor Author

Piinks commented Jan 31, 2023

Yeah I am not sure what the issue is, there are a number of errors that have to do with unnamed library?

01:00 +1000 ~1: /b/s/w/ir/x/w/flutter/packages/flutter/test/material/calendar_date_picker_test.dart: CalendarDatePicker Can select a day                                                               
test/material/navigation_bar_theme_test.dart:8:8: Error: The 'unnamed-libraries' language feature is disabled for this library.
Try removing the package language version or setting the language version to 2.19 or higher.
library;

I am not used to cherry picking, I'll try to take another look later today.

goderbauer
goderbauer reviewed Feb 1, 2023
View reviewed changes
@XilaiZhang
Copy link
Contributor

XilaiZhang commented Feb 1, 2023

Thanks for checking Micheal! We are releasing tomorrow morning, would Kate’s CP be able to make it tonight to pass the presubs?

@XilaiZhang
Copy link
Contributor

XilaiZhang commented Feb 1, 2023

We will probably save this cp for the next hotfix, since we are about to release tomorrow morning

@Piinks @goderbauer
Apply suggestions from code review
35752cd 
Co-authored-by: Michael Goderbauer <[email protected]>
@Piinks
Copy link
Contributor Author

Piinks commented Feb 1, 2023

Thanks, should be fixed with latest commit

@w568w w568w mentioned this pull request Feb 2, 2023
Closed
@godofredoc
Copy link
Contributor

godofredoc commented Feb 7, 2023

Landing with customer_testing failures as they are not expected to pass consistently on release candidate branches.

@godofredoc godofredoc merged commit c6ab0a0 into flutter:flutter-3.7-candidate.1 Feb 7, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 8, 2023
@engine-flutter-autoroll
c6ab0a0 Cherry pick NavigationBar ink ripple fixes (flutter/flutter#1…
4075894 
…19553)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Feb 8, 2023
@engine-flutter-autoroll
c6ab0a013 Cherry pick NavigationBar ink ripple fixes (flutter/flutter…
18e6e9c 
…#119553)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Feb 8, 2023
@engine-flutter-autoroll
Roll Flutter (stable) from 7048ed9 to 32fb2f9 (7 revisions) (#3180)
bba3339 
* 200bc35 Make gen-l10n error handling independent of logger state (#119644) (flutter/flutter#119679)

* 7c28707 cherrypick fix to dwds (flutter/flutter#119745)

* 80f3571 check if directory exists before listing content (#119748) (flutter/flutter#119946)

* 78d09b6 Do not run customer testing on release candidate branches. (#119979) (flutter/flutter#119984)

* c6ab0a0 Cherry pick NavigationBar ink ripple fixes (flutter/flutter#119553)

* 2290856 Verify Mac artifact codesigning on x64 and arm64 (flutter/flutter#120153)

* 32fb2f9 Update Engine revision to f40b73f8a4d5bc2bf50b21e3c0fb478b8f282486 for stable release 3.7.2 (flutter/flutter#120263)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Feb 9, 2023
@engine-flutter-autoroll
c6ab0a013 Cherry pick NavigationBar ink ripple fixes (flutter/flutter…
f45aae6 
…#119553)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Feb 9, 2023
@engine-flutter-autoroll
c6ab0a013 Cherry pick NavigationBar ink ripple fixes (flutter/flutter…
726fe4a 
…#119553)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Feb 9, 2023
@engine-flutter-autoroll
c6ab0a013 Cherry pick NavigationBar ink ripple fixes (flutter/flutter…
0d2afbf 
…#119553)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Feb 10, 2023
@engine-flutter-autoroll
c6ab0a013 Cherry pick NavigationBar ink ripple fixes (flutter/flutter…
6d7c430 
…#119553)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Feb 22, 2023
@engine-flutter-autoroll
c6ab0a013 Cherry pick NavigationBar ink ripple fixes (flutter/flutter…
f7c9a35 
…#119553)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@goderbauer goderbauer goderbauer left review comments

@HansMuller HansMuller Awaiting requested review from HansMuller

@itsjustkevin itsjustkevin Awaiting requested review from itsjustkevin

+1 more reviewer

@TahaTesser TahaTesser TahaTesser approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Piinks @TahaTesser @XilaiZhang @godofredoc @goderbauer