Fix Example + add bottom sheet to 2.0.0 #23
Conversation
This file contains 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
HaidenTenno
changed the title
onl1ner
requested changes
Mar 4, 2024
Sources/Navidux/Core/Navigation/NavigationAction/Actions/PushNavigationAction.swift
Outdated
Show resolved
Hide resolved
Sources/Navidux/Core/Navigation/NavigationAction/Actions/PushNavigationAction.swift
Outdated
Show resolved
Hide resolved
onl1ner
requested changes
Mar 7, 2024
Comment on lines
+8
to
+16
| public struct NavigationStore { | ||
| public var isAlertShow: Bool = false | ||
| public var hasOverlay: Bool = false | ||
|
|
||
| public init(isAlertShow: Bool = false, hasOverlay: Bool = false) { | ||
| self.isAlertShow = isAlertShow | ||
| self.hasOverlay = hasOverlay | ||
| } | ||
| } |
There was a problem hiding this comment.
Я думаю будет хорошей идеей подписать Store под ObservableObject, чтобы юзеры могли подписываться под обновления. Быстренько набросал то как я вижу эти изменения:
Suggested change
| public struct NavigationStore { | |
| public var isAlertShow: Bool = false | |
| public var hasOverlay: Bool = false | |
| public init(isAlertShow: Bool = false, hasOverlay: Bool = false) { | |
| self.isAlertShow = isAlertShow | |
| self.hasOverlay = hasOverlay | |
| } | |
| } | |
| public final class NavigationStore: ObservableObject { | |
| @Published public var isAlertPresented: Bool = false | |
| @Published public var isModalPresented: Bool = false | |
| } |
Comment on lines
+10
to
+35
| class BSBuilder { | ||
|
|
||
| static func buildBottomSheet( | ||
| coordinator: Coordinator, | ||
| screen: any NavigationScreen, | ||
| size: BSSize | ||
| ) { | ||
| switch size { | ||
| case .auto: | ||
| coordinator.bottomSheetTransitioningDelegate.sheetSize = .auto | ||
| screen.transitioningDelegate = coordinator.bottomSheetTransitioningDelegate | ||
| screen.modalPresentationStyle = .custom | ||
| case .fixed(let height): | ||
| coordinator.bottomSheetTransitioningDelegate.sheetSize = .fixed(height) | ||
| screen.transitioningDelegate = coordinator.bottomSheetTransitioningDelegate | ||
| screen.modalPresentationStyle = .custom | ||
| case .halfScreen: | ||
| coordinator.bottomSheetTransitioningDelegate.sheetSize = .halfScreen | ||
| screen.transitioningDelegate = coordinator.bottomSheetTransitioningDelegate | ||
| screen.modalPresentationStyle = .custom | ||
| case .fullScreen: | ||
| screen.modalPresentationStyle = .formSheet | ||
| } | ||
| coordinator.store.hasOverlay = true | ||
| } | ||
| } |
There was a problem hiding this comment.
Может тогда лучше будем хранить делегат тут, чтобы не прокидывать координатор сюда, а то как-то слишком неочевидно получается. Давай еще переименуем функцию просто в build(screen:size:), а то c окончанием bottomSheet будто получается тавтология. Плюсом сюда думаю будет правильней возвращать уже сконфигурированный экран, чтобы не нарушать семантику, т.к. мы используем слово build
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.