-
Notifications
You must be signed in to change notification settings - Fork 319
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
Paywalls
: open Terms and Privacy Policy links in-app
#3475
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,10 @@ | |
import RevenueCat | ||
import SwiftUI | ||
|
||
#if canImport(WebKit) | ||
import WebKit | ||
#endif | ||
|
||
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
struct FooterView: View { | ||
|
||
|
@@ -212,6 +216,9 @@ private struct LinkButton: View { | |
@Environment(\.locale) | ||
private var locale | ||
|
||
@State | ||
private var displayLink = false | ||
|
||
let url: URL | ||
let titles: [String] | ||
|
||
|
@@ -221,12 +228,44 @@ private struct LinkButton: View { | |
} | ||
|
||
var body: some View { | ||
#if canImport(WebKit) && !os(macOS) | ||
Button { | ||
self.displayLink = true | ||
} label: { | ||
self.content | ||
} | ||
.buttonStyle(.plain) | ||
.sheet(isPresented: self.$displayLink) { | ||
NavigationView { | ||
WebView(url: self.url) | ||
.navigationBarTitleDisplayMode(.inline) | ||
.navigationTitle(self.titles.first ?? "") | ||
.toolbar { | ||
ToolbarItem(placement: .destructiveAction) { | ||
Button { | ||
self.displayLink = false | ||
} label: { | ||
Image(systemName: "xmark") | ||
} | ||
} | ||
} | ||
} | ||
} | ||
#else | ||
Link(destination: self.url) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keeping the existing implementation if |
||
self.content | ||
} | ||
#endif | ||
} | ||
|
||
@ViewBuilder | ||
private var content: some View { | ||
let bundle = Localization.localizedBundle(self.locale) | ||
|
||
if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *) { | ||
ViewThatFits { | ||
ForEach(self.titles, id: \.self) { title in | ||
self.link(for: title, bundle: bundle) | ||
self.linkContent(for: title, bundle: bundle) | ||
} | ||
} | ||
// Only use the largest label for accessibility | ||
|
@@ -235,16 +274,13 @@ private struct LinkButton: View { | |
?? "" | ||
) | ||
} else if let first = self.titles.first { | ||
self.link(for: first, bundle: bundle) | ||
self.linkContent(for: first, bundle: bundle) | ||
} | ||
} | ||
|
||
private func link(for title: String, bundle: Bundle) -> some View { | ||
Link( | ||
Self.localizedString(title, bundle), | ||
destination: self.url | ||
) | ||
.frame(minHeight: Constants.minimumButtonHeight) | ||
private func linkContent(for title: String, bundle: Bundle) -> some View { | ||
Text(Self.localizedString(title, bundle)) | ||
.frame(minHeight: Constants.minimumButtonHeight) | ||
} | ||
|
||
private static func localizedString(_ string: String, _ bundle: Bundle) -> String { | ||
|
@@ -257,6 +293,25 @@ private struct LinkButton: View { | |
|
||
} | ||
|
||
#if canImport(WebKit) && !os(macOS) | ||
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
@available(tvOS, unavailable) | ||
private struct WebView: UIViewRepresentable { | ||
|
||
let url: URL | ||
NachoSoto marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
func makeUIView(context: Context) -> WKWebView { | ||
let view = WKWebView() | ||
view.load(URLRequest(url: self.url)) | ||
|
||
return view | ||
} | ||
|
||
func updateUIView(_ uiView: WKWebView, context: Context) {} | ||
|
||
} | ||
#endif | ||
|
||
// MARK: - Previews | ||
|
||
#if DEBUG && canImport(SwiftUI) && canImport(UIKit) | ||
|
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.
This doesn't exist on watchOS 😅