-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1074 from hyperskill/hotfix/1.60.1
Hotfix 1.60.1
- Loading branch information
Showing
15 changed files
with
188 additions
and
87 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
70 changes: 70 additions & 0 deletions
70
iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/StepToolbarContent.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| import shared | ||
| import SwiftUI | ||
|
|
||
| // swiftlint:disable function_parameter_count | ||
| extension View { | ||
| @ViewBuilder | ||
| func stepToolbar( | ||
| stepState: StepFeatureStepState, | ||
| stepMenuActions: Set<StepMenuAction>, | ||
| onShareButtonTap: @escaping () -> Void, | ||
| onReportButtonTap: @escaping () -> Void, | ||
| onSkipButtonTap: @escaping () -> Void, | ||
| onOpenInWebButtonTap: @escaping () -> Void | ||
| ) -> some View { | ||
| toolbar { | ||
| StepToolbarContent( | ||
| disabled: stepState is StepFeatureStepStateIdle || stepState is StepFeatureStepStateLoading, | ||
| stepMenuActions: stepMenuActions, | ||
| onShareButtonTap: onShareButtonTap, | ||
| onReportButtonTap: onReportButtonTap, | ||
| onSkipButtonTap: onSkipButtonTap, | ||
| onOpenInWebButtonTap: onOpenInWebButtonTap | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| // swiftlint:enable function_parameter_count | ||
|
|
||
| private struct StepToolbarContent: ToolbarContent { | ||
| let disabled: Bool | ||
| let stepMenuActions: Set<StepMenuAction> | ||
|
|
||
| let onShareButtonTap: () -> Void | ||
| let onReportButtonTap: () -> Void | ||
| let onSkipButtonTap: () -> Void | ||
| let onOpenInWebButtonTap: () -> Void | ||
|
|
||
| var body: some ToolbarContent { | ||
| ToolbarItem(placement: .navigationBarTrailing) { | ||
| Menu { | ||
| if stepMenuActions.contains(.share) { | ||
| Button(action: onShareButtonTap) { | ||
| Label("Share", systemImage: "square.and.arrow.up") | ||
| } | ||
| } | ||
|
|
||
| if stepMenuActions.contains(.report) { | ||
| Button(action: onReportButtonTap) { | ||
| Label("Report", systemImage: "flag") | ||
| } | ||
| } | ||
|
|
||
| if stepMenuActions.contains(.skip) { | ||
| Button(action: onSkipButtonTap) { | ||
| Label("Skip", systemImage: "arrow.right") | ||
| } | ||
| } | ||
|
|
||
| if stepMenuActions.contains(.openInWeb) { | ||
| Button(action: onOpenInWebButtonTap) { | ||
| Label("Open in Web", systemImage: "safari") | ||
| } | ||
| } | ||
| } label: { | ||
| Image(systemName: "ellipsis.circle") | ||
| } | ||
| .disabled(disabled) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.