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

v0.34.0 を同期 #4

Merged
merged 23 commits into from
Apr 23, 2024
Merged

v0.34.0 を同期 #4

merged 23 commits into from
Apr 23, 2024

Conversation

warahiko
Copy link
Collaborator

Compose の安定版を用いている v0.34.0 の内容を同期する

Monkey-Matt and others added 21 commits October 20, 2023 10:05
[Placeholder documentation] Show deprecated message within the warning box
[Documentation] Fix warning box/text in docs
[FlowLayout Documentation] Update flowlayout.md
If there is a nested NavGraph under the current bottomSheet destination
and you do a back press, instead of the bottomSheet which is the topmost
destination being popped, the nested NavHost underneath will be popped
instead. This is caused by bottomSheet not properly intercepting back presses.

This change added a BackHandler to ensure that bottomsheets correctly
respect the system back hierarchy for back events.

Fixes: google#1726
[Navigation Material] Ensure Navigation Material properly handles back for nested nav
[ThemeAdapter-Material3] Fix warning in docs
README.md Outdated
@@ -1,7 +1,7 @@
## Notice: About this fork
本レポジトリは fork 元である [google/accompanist](https://github.com/google/accompanist) において非推奨となる API を保持することを目的としています。
動作、問題の解決やメンテナンスなどは一切保証しません。
バージョンは [v0.33.2-alpha](https://github.com/google/accompanist/releases/tag/v0.33.2-alpha) を用いています。
バージョンは [v0.34.0](https://github.com/google/accompanist/releases/tag/v0.33.2-alpha) を用いています。
Copy link
Member

Choose a reason for hiding this comment

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

nits-badge

リンク先も修正しておきたいです

Suggested change
バージョンは [v0.34.0](https://github.com/google/accompanist/releases/tag/v0.33.2-alpha) を用いています。
バージョンは [v0.34.0](https://github.com/google/accompanist/releases/tag/v0.34.0) を用いています。

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

漏れてました 🙏
b660bef で対応しました!

@@ -1,18 +1,18 @@
[versions]

compose = "1.6.0-alpha06"
composeCompiler = "1.5.3"
compose = "1.6.0"
Copy link
Member

Choose a reason for hiding this comment

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

good-badge

👏

@warahiko
Copy link
Collaborator Author

#3 のマージでのコンフリクトを解決

Copy link

@ue-moo ue-moo left a comment

Choose a reason for hiding this comment

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

更新ありがとうございます!
LGTM 👍

@@ -185,6 +186,10 @@ public class BottomSheetNavigator(
LaunchedEffect(retainedEntry) {
sheetState.show()
}

BackHandler {
state.popWithTransition(popUpTo = retainedEntry!!, saveState = false)
Copy link

Choose a reason for hiding this comment

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

👀

@warahiko warahiko merged commit 4cde6d7 into main Apr 23, 2024
@warahiko warahiko deleted the feature/sync_v0.34.0 branch April 23, 2024 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants