feat/replace-images-with-abm #1068
There are no files selected for viewing
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "ab_connecting.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Created by Lunar on 4.08.25. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct ABCircleAndLoader: View { | ||
| let airbeamImage: String | ||
|
|
||
| init(airbeamImage: String = "airbeam") { | ||
| self.airbeamImage = airbeamImage | ||
| } | ||
|
|
||
| var body: some View { | ||
| syncImage | ||
| .overlay( | ||
| loader | ||
| .padding(28), | ||
| alignment: .bottomTrailing | ||
| ) | ||
| } | ||
|
|
||
| var loader: some View { | ||
| ZStack { | ||
| Color.accentColor | ||
| .frame(width: Constants.Loader.size, height: Constants.Loader.size) | ||
| .clipShape(Circle()) | ||
| ProgressView() | ||
| .progressViewStyle(CircularProgressViewStyle(tint: Color.white)) | ||
| .scaleEffect(2) | ||
| } | ||
| } | ||
|
|
||
| var syncImage: some View { | ||
| Image(airbeamImage) | ||
| .aspectRatio(contentMode: .fit) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| ABCircleAndLoader() | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| // Created by Lunar on 4.08.25. | ||
| // | ||
|
|
||
| import SwiftUI | ||
| import AirCastingStyling | ||
|
|
||
| struct ProgressFlowAB: View { | ||
| let title: String | ||
| let message: String | ||
| let progress: Float | ||
| let abImage: any View | ||
|
|
||
| let continueButtonOnClickDestination: (any View)? | ||
| let continueButtonOnClick: (@MainActor () -> Void)? | ||
|
|
||
| init(progress: Float, abImage: any View, title: String, message: String, continueButtonOnClickDestination: (any View)? = nil) { | ||
| self.progress = progress | ||
| self.title = title | ||
| self.message = message | ||
| self.abImage = abImage | ||
| self.continueButtonOnClick = nil | ||
| self.continueButtonOnClickDestination = continueButtonOnClickDestination | ||
| } | ||
|
|
||
| init(progress: Float, airbeamImageAsset: String, title: String, message: String, continueButtonOnClickDestination: (any View)? = nil) { | ||
| self.progress = progress | ||
| self.title = title | ||
| self.message = message | ||
| self.abImage = image(airbeamImageAsset) | ||
| self.continueButtonOnClick = nil | ||
| self.continueButtonOnClickDestination = continueButtonOnClickDestination | ||
| } | ||
|
|
||
| init(progress: Float, airbeamImageAsset: String, title: String, message: String, continueButtonOnClick: @escaping @MainActor () -> Void) { | ||
| self.progress = progress | ||
| self.title = title | ||
| self.message = message | ||
| 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 and then have one init like but possibly I'm thinking in over languages ;) |
||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading) { | ||
| ProgressView(value: progress) | ||
| .padding(.bottom, 50) | ||
| AnyView(abImage) | ||
| .frame(maxWidth: .infinity) | ||
| VStack(alignment: .leading, spacing: 15) { | ||
| titleLabel | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| messageLabel | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| } | ||
| .padding(.top) | ||
| .frame(maxWidth: .infinity) | ||
| Spacer() | ||
| if let continueButtonOnClickDestination { | ||
| NavigationLink( | ||
| destination: AnyView(continueButtonOnClickDestination), | ||
| label: { | ||
| Text(Strings.Commons.continue) | ||
| .font(Fonts.muliBoldHeading1) | ||
| .frame(maxWidth: .infinity) | ||
| }) | ||
| .buttonStyle(BlueButtonStyle()) | ||
|
|
||
| } else if let continueButtonOnClick { | ||
| Button(action: continueButtonOnClick) { | ||
| Text(Strings.Commons.continue) | ||
| .font(Fonts.muliBoldHeading1) | ||
| .frame(maxWidth: .infinity) | ||
| } | ||
| .buttonStyle(BlueButtonStyle()) | ||
| } | ||
| } | ||
| .frame(maxWidth: .infinity) | ||
| .padding() | ||
| .background(Color.aircastingBackground.ignoresSafeArea()) | ||
| } | ||
|
|
||
| var titleLabel: some View { | ||
| Text(title) | ||
| .font(Fonts.moderateBoldTitle3) | ||
| .foregroundColor(.accentColor) | ||
| } | ||
|
|
||
| var messageLabel: some View { | ||
| Text(message) | ||
| .font(Fonts.moderateRegularHeading1) | ||
| .foregroundColor(.aircastingGray) | ||
| } | ||
| } | ||
|
|
||
| private func image(_ imageAsset: String) -> any View { | ||
| Image(imageAsset) | ||
| .aspectRatio(contentMode: .fit) | ||
| } | ||
|
|
||
| #Preview("AB Loading") { | ||
| ProgressFlowAB(progress: 0.4, abImage: ABCircleAndLoader(), title: Strings.SDSyncRootView.title, message: Strings.SDSyncRootView.message) | ||
| } | ||
|
|
||
| #Preview("AB Ready") { | ||
| ProgressFlowAB(progress: 0.4, airbeamImageAsset: "4-connected", title: Strings.SDSyncRootView.title, message: Strings.SDSyncRootView.message, continueButtonOnClickDestination: Text("test")) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not very important but is there sth like alt text for ios? like accessibility desc or sth