forked from shadowfacts/Tusker
Add more info for subscription to Tip Jar
This commit is contained in:
parent
b85c0eb95d
commit
d0758dc73c
|
@ -32,12 +32,12 @@ struct TipJarView: View {
|
||||||
@StateObject private var observer = UbiquitousKeyValueStoreObserver()
|
@StateObject private var observer = UbiquitousKeyValueStoreObserver()
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
ZStack {
|
List {
|
||||||
Color.appGroupedBackground
|
productsOrLoading
|
||||||
.edgesIgnoringSafeArea(.all)
|
}
|
||||||
|
.listStyle(.insetGrouped)
|
||||||
productsView
|
.appGroupedListBackground(container: PreferencesNavigationController.self)
|
||||||
|
.overlay {
|
||||||
if showConfetti {
|
if showConfetti {
|
||||||
ConfettiView()
|
ConfettiView()
|
||||||
.transition(.opacity.animation(.default))
|
.transition(.opacity.animation(.default))
|
||||||
|
@ -75,46 +75,66 @@ struct TipJarView: View {
|
||||||
.onDisappear {
|
.onDisappear {
|
||||||
updatesObserver?.cancel()
|
updatesObserver?.cancel()
|
||||||
}
|
}
|
||||||
.onReceive(Just(showConfetti).filter { $0 }.delay(for: .seconds(5), scheduler: DispatchQueue.main)) { _ in
|
.onChange(of: showConfetti) { newValue in
|
||||||
showConfetti = false
|
if newValue {
|
||||||
|
Task {
|
||||||
|
try await Task.sleep(nanoseconds: 5 * NSEC_PER_SEC)
|
||||||
|
showConfetti = false
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var productsView: some View {
|
private var productsOrLoading: some View {
|
||||||
if isLoaded {
|
if isLoaded {
|
||||||
VStack {
|
productsSections
|
||||||
if !supporterProducts.isEmpty {
|
|
||||||
supporterSubscriptions
|
|
||||||
}
|
|
||||||
|
|
||||||
tipPurchases
|
|
||||||
|
|
||||||
if let tipStatus {
|
|
||||||
tipStatus
|
|
||||||
.multilineTextAlignment(.center)
|
|
||||||
.padding(.horizontal)
|
|
||||||
.padding(.top, 16)
|
|
||||||
Text("Thank you!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
ProgressView()
|
ProgressView()
|
||||||
.progressViewStyle(.circular)
|
.progressViewStyle(.circular)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .center)
|
||||||
|
.listRowBackground(Color.clear)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var supporterSubscriptions: some View {
|
private var productsSections: some View {
|
||||||
Text("If you want to contribute Tusker's continued development, you can become a supporter. Supporting Tusker is an auto-renewable monthly subscription.")
|
if let tipStatus {
|
||||||
.multilineTextAlignment(.center)
|
Section {
|
||||||
.padding(.horizontal)
|
VStack(alignment: .leading) {
|
||||||
|
tipStatus
|
||||||
|
.multilineTextAlignment(.leading)
|
||||||
|
Text("Thank you!")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.appGroupedListRowBackground()
|
||||||
|
}
|
||||||
|
|
||||||
|
if !supporterProducts.isEmpty {
|
||||||
|
supporterSection
|
||||||
|
}
|
||||||
|
|
||||||
|
tipSection
|
||||||
|
}
|
||||||
|
|
||||||
|
private var supporterSection: some View {
|
||||||
|
Section {
|
||||||
|
Text("If you want to contribute Tusker's continued development, you can become a supporter and give a montly tip.")
|
||||||
|
.multilineTextAlignment(.leading)
|
||||||
|
|
||||||
VStack(alignment: .myAlignment) {
|
|
||||||
ForEach($supporterProducts, id: \.0.id) { $productAndPurchasing in
|
ForEach($supporterProducts, id: \.0.id) { $productAndPurchasing in
|
||||||
TipRow(product: productAndPurchasing.0, buttonWidth: supporterButtonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
|
TipRow(product: productAndPurchasing.0, buttonWidth: supporterButtonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
|
||||||
}
|
}
|
||||||
|
} footer: {
|
||||||
|
VStack {
|
||||||
|
var privacyPolicy: AttributedString = "Privacy Policy"
|
||||||
|
let _ = privacyPolicy.link = URL(string: "https://vaccor.space/tusker#privacy")!
|
||||||
|
var eula: AttributedString = "EULA"
|
||||||
|
let _ = eula.link = URL(string: "https://www.apple.com/legal/internet-services/itunes/dev/stdeula/")!
|
||||||
|
Text(AttributedString("Supporting Tusker is an auto-renewable monthly subscription. Subscribing does not provide additional features or capabilities.\n") + privacyPolicy + AttributedString(" and ") + eula)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
.appGroupedListRowBackground()
|
||||||
.onPreferenceChange(ButtonWidthKey.self) { newValue in
|
.onPreferenceChange(ButtonWidthKey.self) { newValue in
|
||||||
if let supporterButtonWidth {
|
if let supporterButtonWidth {
|
||||||
self.supporterButtonWidth = max(supporterButtonWidth, newValue)
|
self.supporterButtonWidth = max(supporterButtonWidth, newValue)
|
||||||
|
@ -124,18 +144,16 @@ struct TipJarView: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
private var tipSection: some View {
|
||||||
private var tipPurchases: some View {
|
Section {
|
||||||
Text("Or, you can choose to make a one-time tip to show your gratitutde or help support the app's development. It is greatly appreciated!")
|
Text("Or, you can choose to make a one-time tip to show your gratitutde or help support the app's development. It is greatly appreciated!")
|
||||||
.multilineTextAlignment(.center)
|
.multilineTextAlignment(.leading)
|
||||||
.padding(.horizontal)
|
|
||||||
.padding(.top, 16)
|
|
||||||
|
|
||||||
VStack(alignment: .myAlignment) {
|
|
||||||
ForEach($tipProducts, id: \.0.id) { $productAndPurchasing in
|
ForEach($tipProducts, id: \.0.id) { $productAndPurchasing in
|
||||||
TipRow(product: productAndPurchasing.0, buttonWidth: tipButtonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
|
TipRow(product: productAndPurchasing.0, buttonWidth: tipButtonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.appGroupedListRowBackground()
|
||||||
.onPreferenceChange(ButtonWidthKey.self) { newValue in
|
.onPreferenceChange(ButtonWidthKey.self) { newValue in
|
||||||
if let tipButtonWidth {
|
if let tipButtonWidth {
|
||||||
self.tipButtonWidth = max(tipButtonWidth, newValue)
|
self.tipButtonWidth = max(tipButtonWidth, newValue)
|
||||||
|
@ -231,6 +249,8 @@ private struct TipRow: View {
|
||||||
Text(product.displayName)
|
Text(product.displayName)
|
||||||
.alignmentGuide(.myAlignment, computeValue: { context in context[.trailing] })
|
.alignmentGuide(.myAlignment, computeValue: { context in context[.trailing] })
|
||||||
|
|
||||||
|
Spacer()
|
||||||
|
|
||||||
if let subscription = product.subscription {
|
if let subscription = product.subscription {
|
||||||
SubscriptionButton(product: product, subscriptionInfo: subscription, isPurchasing: $isPurchasing, buttonWidth: buttonWidth, purchase: purchase)
|
SubscriptionButton(product: product, subscriptionInfo: subscription, isPurchasing: $isPurchasing, buttonWidth: buttonWidth, purchase: purchase)
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue