Merged
Conversation
… one ABCircleAndLoader everywhere
…): add common ProgressFlowAB View with correct margins
…handle "mobile&fixed" and "only fixed" as two separate processes to prevent simultaneous handling of fixed and mobile
mturnau
reviewed
Aug 29, 2025
| } | ||
|
|
||
| var syncImage: some View { | ||
| Image(airbeamImage) |
Collaborator
There was a problem hiding this comment.
not very important but is there sth like alt text for ios? like accessibility desc or sth
| self.abImage = image(airbeamImageAsset) | ||
| self.continueButtonOnClickDestination = nil | ||
| self.continueButtonOnClick = continueButtonOnClick | ||
| } |
Collaborator
There was a problem hiding this comment.
Another minor remark: Is there a way to dry it out? not sure if this is the way to go in Swift (having multiple inits, even if they are v. similar). Maybe you can make structs or whatever like
enum ABImageSource {
case view(AnyView)
case asset(String)
}
enum ContinueAction {
case navigation(AnyView)
case action(@MainActor () -> Void)
case none
}
and then have one init like
init(progress: Float, abImageSource: ABImageSource, title: String, message: String, continueAction: ContinueAction = .none
) {
self.progress = progress
self.abImageSource = abImageSource
self.title = title
self.message = message
self.continueAction = continueAction
}
but possibly I'm thinking in over languages ;)
| let title = if viewModel.isDownloadingFinished { | ||
| Strings.SyncingABView.finishingSyncTitle | ||
| } else if let progressTitle { | ||
| "Syncing \(progressTitle.lowercased()) \(progressCount ?? "")" |
Collaborator
There was a problem hiding this comment.
are't we keeping strings somewhere separate
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Replace AB3 images in the app with ABM
Correct margins on UI screens with ABM images
Refactor and unify UI screens with ABM images under common ProgressFlowAB view
Fix issue with SD sync failing sometimes when having both Fixed and Mobile SD card data