Skip to content
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

[flutter_adaptive_scaffold] exchange BottomNavigationBar with NavigationBar #3746

Merged
merged 25 commits into from
May 17, 2023

Conversation

fmt-Println-MKO
Copy link
Contributor

@fmt-Println-MKO fmt-Println-MKO commented Apr 17, 2023

To have a common Material 3 Design, BottomNavigationBar was replaced with M3 NavigationBar as adaptive scaffold claims to be Material 3.

fixes: #124984

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 relevant style guides and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use dart format.)
  • I signed the CLA.
  • The title of the PR starts with the name of the package surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy, or this PR is exempt from version changes.
  • I updated CHANGELOG.md to add a description of the change, following repository CHANGELOG style.
  • 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.

@google-cla
Copy link

google-cla bot commented Apr 17, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@stuartmorgan stuartmorgan requested a review from gspencergoog May 16, 2023 20:07
Copy link
Contributor

@gspencergoog gspencergoog left a comment

Choose a reason for hiding this comment

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

32384589-a60f0e74-c078-11e7-9bc1-e5b5287aea9d

Copy link
Contributor

@justinmc justinmc left a comment

Choose a reason for hiding this comment

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

LGTM with a formatting nit. Thanks!

Copy link
Contributor

@justinmc justinmc left a comment

Choose a reason for hiding this comment

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

LGTM with a formatting nit. Thanks!

@fmt-Println-MKO
Copy link
Contributor Author

LGTM with a formatting nit. Thanks!

now it failed with wrong formatting :(

@fmt-Println-MKO
Copy link
Contributor Author

@justinmc any suggestion on how to solve the formatting issue?
either roll back to the version that worked in the pipeline or any other idea?

@gspencergoog
Copy link
Contributor

Just go back to the version that passes. Formatting is enforced in flutter/packages, so there's really only one way to format it that works (what dartfmt says).

@fmt-Println-MKO
Copy link
Contributor Author

ok formatting is fixed, it's ready for merge :)

@gspencergoog gspencergoog added the autosubmit Merge PR when tree becomes green via auto submit App label May 17, 2023
@auto-submit auto-submit bot merged commit 9e52ec4 into flutter:main May 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 18, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 18, 2023
flutter/packages@5c69914...b31a128

2023-05-18 [email protected] [flutter_plugin_android_lifecycle] Fix lints (flutter/packages#4030)
2023-05-18 [email protected] [rfw] Fix a typo in the API documentation (flutter/packages#4023)
2023-05-18 [email protected] [ci] Manual flutter roll (flutter/packages#4033)
2023-05-17 [email protected] [flutter_adaptive_scaffold] exchange BottomNavigationBar with NavigationBar (flutter/packages#3746)
2023-05-17 [email protected] [tools] Ignore comments in federated safety check (flutter/packages#4028)
2023-05-17 [email protected] Revert "[url_launcher] Set broadcast reciever visability as required by target api 34" (flutter/packages#4027)
2023-05-17 [email protected] [camera] Fix Java lints in camerax version (flutter/packages#3966)
2023-05-17 [email protected] [image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies (flutter/packages#3968)
2023-05-17 49699333+dependabot[bot]@users.noreply.github.com [espresso]: Bump com.squareup.okhttp3:okhttp from 4.10.0 to 4.11.0 in /packages/espresso/android (flutter/packages#3804)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
flutter/packages@5c69914...b31a128

2023-05-18 [email protected] [flutter_plugin_android_lifecycle] Fix lints (flutter/packages#4030)
2023-05-18 [email protected] [rfw] Fix a typo in the API documentation (flutter/packages#4023)
2023-05-18 [email protected] [ci] Manual flutter roll (flutter/packages#4033)
2023-05-17 [email protected] [flutter_adaptive_scaffold] exchange BottomNavigationBar with NavigationBar (flutter/packages#3746)
2023-05-17 [email protected] [tools] Ignore comments in federated safety check (flutter/packages#4028)
2023-05-17 [email protected] Revert "[url_launcher] Set broadcast reciever visability as required by target api 34" (flutter/packages#4027)
2023-05-17 [email protected] [camera] Fix Java lints in camerax version (flutter/packages#3966)
2023-05-17 [email protected] [image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies (flutter/packages#3968)
2023-05-17 49699333+dependabot[bot]@users.noreply.github.com [espresso]: Bump com.squareup.okhttp3:okhttp from 4.10.0 to 4.11.0 in /packages/espresso/android (flutter/packages#3804)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
nploi pushed a commit to nploi/packages that referenced this pull request Jul 16, 2023
…ionBar (flutter#3746)

To have a common Material 3 Design, BottomNavigationBar was replaced with M3 NavigationBar as adaptive scaffold claims to be Material 3.

[fixes: #124984](flutter/flutter#124984)

* [x]  I read the [Contributor Guide](https://github.com/flutter/packages/blob/main/CONTRIBUTING.md) and followed the process outlined there for submitting PRs.
* [x]  I read the [Tree Hygiene](https://github.com/flutter/flutter/wiki/Tree-hygiene) wiki page, which explains my responsibilities.
* [x]  I read and followed the [relevant style guides](https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style) and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use `dart format`.)
* [x]  I signed the [CLA](https://cla.developers.google.com/).
* [x]  The title of the PR starts with the name of the package surrounded by square brackets, e.g. `[shared_preferences]`
* [x]  I listed at least one issue that this PR fixes in the description above.
* [x]  I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy](https://dart.dev/tools/pub/versioning), or this PR is [exempt from version changes](https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates).
* [x]  I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style](https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style).
* [x]  I updated/added relevant documentation (doc comments with `///`).
* [x]  I added new tests to check the change I am making, or this PR is [test-exempt](https://github.com/flutter/flutter/wiki/Tree-hygiene#tests).
* [x]  All existing and new tests are passing.
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 p: flutter_adaptive_scaffold
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants