Refactor StoreKit 2 subscription system and add interactive vote widget
## StoreKit 2 Refactor - Rewrote IAPManager with clean enum-based state model (SubscriptionState) - Added native SubscriptionStoreView for iOS 17+ purchase UI - Subscription status now checked on every app launch - Synced subscription status to UserDefaults for widget access - Simplified PurchaseButtonView and IAPWarningView - Removed unused StatusInfoView ## Interactive Vote Widget - New FeelsVoteWidget with App Intents for mood voting - Subscribers can vote directly from widget, shows stats after voting - Non-subscribers see "Tap to subscribe" which opens subscription store - Added feels:// URL scheme for deep linking ## Firebase Removal - Commented out Firebase imports and initialization - EventLogger now prints to console in DEBUG mode only ## Other Changes - Added fallback for Core Data when App Group unavailable - Added new localization strings for subscription UI - Updated entitlements and Info.plist 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Trey t
47
Shared/views/FeelsSubscriptionStoreView.swift
Normal file
47
Shared/views/FeelsSubscriptionStoreView.swift
Normal file
@@ -0,0 +1,47 @@
|
||||
//
|
||||
// FeelsSubscriptionStoreView.swift
|
||||
// Feels
|
||||
//
|
||||
// Native StoreKit 2 subscription purchase view.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import StoreKit
|
||||
|
||||
struct FeelsSubscriptionStoreView: View {
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@EnvironmentObject var iapManager: IAPManager
|
||||
|
||||
var body: some View {
|
||||
SubscriptionStoreView(groupID: IAPManager.subscriptionGroupID) {
|
||||
VStack(spacing: 16) {
|
||||
Image(systemName: "heart.fill")
|
||||
.font(.system(size: 60))
|
||||
.foregroundStyle(.pink)
|
||||
|
||||
Text(String(localized: "subscription_store_title"))
|
||||
.font(.title)
|
||||
.bold()
|
||||
|
||||
Text(String(localized: "subscription_store_subtitle"))
|
||||
.font(.body)
|
||||
.foregroundStyle(.secondary)
|
||||
.multilineTextAlignment(.center)
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
.subscriptionStoreControlStyle(.prominentPicker)
|
||||
.storeButton(.visible, for: .restorePurchases)
|
||||
.subscriptionStoreButtonLabel(.multiline)
|
||||
.onInAppPurchaseCompletion { _, result in
|
||||
if case .success(.success(_)) = result {
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
FeelsSubscriptionStoreView()
|
||||
.environmentObject(IAPManager())
|
||||
}
|
||||
@@ -1,69 +1,57 @@
|
||||
//
|
||||
// PurchaseButtonView.swift
|
||||
// IAPWarningView.swift
|
||||
// Feels
|
||||
//
|
||||
// Created by Trey Tartt on 7/7/22.
|
||||
// Trial warning banner shown at bottom of Month/Year views.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import StoreKit
|
||||
|
||||
struct IAPWarningView: View {
|
||||
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
|
||||
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
|
||||
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults) private var firstLaunchDate = Date()
|
||||
|
||||
var iapManager: IAPManager
|
||||
|
||||
private let height: Float
|
||||
private let showManageSubClosure: (() -> Void)?
|
||||
|
||||
@State private var showSettings = false
|
||||
|
||||
public init(height: Float, iapManager: IAPManager, showManageSubClosure: (() -> Void)? = nil, showCountdownTimer: Bool = false) {
|
||||
self.height = height
|
||||
self.showManageSubClosure = showManageSubClosure
|
||||
self.iapManager = iapManager
|
||||
}
|
||||
|
||||
|
||||
@ObservedObject var iapManager: IAPManager
|
||||
|
||||
@State private var showSubscriptionStore = false
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
if let date = Calendar.current.date(byAdding: .day, value: 30, to: firstLaunchDate) {
|
||||
VStack(spacing: 8) {
|
||||
HStack {
|
||||
Image(systemName: "clock")
|
||||
.foregroundColor(.orange)
|
||||
|
||||
Text(String(localized: "iap_warning_view_title"))
|
||||
.font(.body)
|
||||
.frame(minWidth: 0, maxWidth: .infinity)
|
||||
.background(theme.currentTheme.secondaryBGColor)
|
||||
|
||||
Text(date, style: .relative)
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
|
||||
Button(action: {
|
||||
showSettings.toggle()
|
||||
}, label: {
|
||||
Text(String(localized: "iap_warning_view_buy_button"))
|
||||
.foregroundColor(.white)
|
||||
|
||||
if let expirationDate = iapManager.trialExpirationDate {
|
||||
Text(expirationDate, style: .relative)
|
||||
.font(.body)
|
||||
.bold()
|
||||
.frame(maxWidth: .infinity)
|
||||
.contentShape(Rectangle())
|
||||
})
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 50)
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(DefaultMoodTint.color(forMood: .great)))
|
||||
.foregroundColor(.orange)
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
showSubscriptionStore = true
|
||||
} label: {
|
||||
Text(String(localized: "iap_warning_view_buy_button"))
|
||||
.font(.headline)
|
||||
.foregroundColor(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 12)
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(Color.pink))
|
||||
}
|
||||
}
|
||||
.frame(minWidth: 0, maxWidth: .infinity)
|
||||
.padding()
|
||||
.background(theme.currentTheme.secondaryBGColor)
|
||||
.sheet(isPresented: $showSettings) {
|
||||
SettingsView()
|
||||
.sheet(isPresented: $showSubscriptionStore) {
|
||||
FeelsSubscriptionStoreView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct IAPWarningView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
IAPWarningView(height: 175, iapManager: IAPManager())
|
||||
}
|
||||
#Preview {
|
||||
IAPWarningView(iapManager: IAPManager())
|
||||
}
|
||||
|
||||
@@ -44,8 +44,9 @@ struct MonthView: View {
|
||||
]
|
||||
|
||||
@ObservedObject var viewModel: DayViewViewModel
|
||||
@State private var iAPWarningViewHidden = false
|
||||
|
||||
@State private var trialWarningHidden = false
|
||||
@State private var showSubscriptionStore = false
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
if viewModel.hasNoData {
|
||||
@@ -55,7 +56,7 @@ struct MonthView: View {
|
||||
ScrollView {
|
||||
VStack(spacing: 5) {
|
||||
ForEach(viewModel.grouped.sorted(by: { $0.key < $1.key }), id: \.key) { year, months in
|
||||
|
||||
|
||||
// for reach month
|
||||
ForEach(months.sorted(by: { $0.key < $1.key }), id: \.key) { month, entries in
|
||||
Section() {
|
||||
@@ -80,23 +81,43 @@ struct MonthView: View {
|
||||
}
|
||||
)
|
||||
}
|
||||
.disabled(iapManager.showIAP)
|
||||
.disabled(iapManager.shouldShowPaywall)
|
||||
}
|
||||
|
||||
if iapManager.showIAP {
|
||||
|
||||
if iapManager.shouldShowPaywall {
|
||||
// Paywall overlay - tap to show subscription store
|
||||
Color.black.opacity(0.3)
|
||||
.ignoresSafeArea()
|
||||
.onTapGesture {
|
||||
showSubscriptionStore = true
|
||||
}
|
||||
|
||||
VStack {
|
||||
Spacer()
|
||||
PurchaseButtonView(height: 250, iapManager: iapManager)
|
||||
Button {
|
||||
showSubscriptionStore = true
|
||||
} label: {
|
||||
Text(String(localized: "subscription_required_button"))
|
||||
.font(.headline)
|
||||
.foregroundColor(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding()
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(Color.pink))
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
} else if iapManager.showIAPWarning {
|
||||
} else if iapManager.shouldShowTrialWarning {
|
||||
VStack {
|
||||
Spacer()
|
||||
if !iAPWarningViewHidden {
|
||||
IAPWarningView(height: 75, iapManager: iapManager)
|
||||
if !trialWarningHidden {
|
||||
IAPWarningView(iapManager: iapManager)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $showSubscriptionStore) {
|
||||
FeelsSubscriptionStoreView()
|
||||
}
|
||||
.onAppear(perform: {
|
||||
EventLogger.log(event: "show_month_view")
|
||||
})
|
||||
@@ -116,7 +137,7 @@ struct MonthView: View {
|
||||
}
|
||||
.onPreferenceChange(ViewOffsetKey.self) { value in
|
||||
withAnimation {
|
||||
iAPWarningViewHidden = value < 0
|
||||
trialWarningHidden = value < 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// PurchaseButtonView.swift
|
||||
// Feels
|
||||
//
|
||||
// Created by Trey Tartt on 7/7/22.
|
||||
// Subscription status and purchase view for settings.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
@@ -11,238 +11,190 @@ import StoreKit
|
||||
struct PurchaseButtonView: View {
|
||||
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
|
||||
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
|
||||
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults) private var firstLaunchDate = Date()
|
||||
|
||||
var iapManager: IAPManager
|
||||
|
||||
private let showCountdownTimer: Bool
|
||||
private let showManageSubClosure: (() -> Void)?
|
||||
private let height: CGFloat?
|
||||
|
||||
public init(height: CGFloat? = nil,
|
||||
iapManager: IAPManager,
|
||||
showManageSubClosure: (() -> Void)? = nil,
|
||||
showCountdownTimer: Bool = false) {
|
||||
self.height = height
|
||||
self.showManageSubClosure = showManageSubClosure
|
||||
self.iapManager = iapManager
|
||||
self.showCountdownTimer = showCountdownTimer
|
||||
}
|
||||
|
||||
|
||||
@ObservedObject var iapManager: IAPManager
|
||||
|
||||
@State private var showSubscriptionStore = false
|
||||
@State private var showManageSubscriptions = false
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
// if we should show the iap warning that means no purchase which means
|
||||
// we should show buy options
|
||||
switch iapManager.showIAPWarning {
|
||||
case true:
|
||||
VStack {
|
||||
if let height = self.height {
|
||||
buyOptionsView
|
||||
.background(theme.currentTheme.secondaryBGColor)
|
||||
.frame(height: height)
|
||||
} else {
|
||||
buyOptionsView
|
||||
.background(theme.currentTheme.secondaryBGColor)
|
||||
}
|
||||
}
|
||||
case false:
|
||||
VStack(spacing: 16) {
|
||||
if iapManager.isLoading {
|
||||
loadingView
|
||||
} else if iapManager.isSubscribed {
|
||||
subscribedView
|
||||
.background(theme.currentTheme.secondaryBGColor)
|
||||
} else {
|
||||
notSubscribedView
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var buyOptionsSetingsView: some View {
|
||||
GeometryReader { metrics in
|
||||
VStack(spacing: 20) {
|
||||
Text(String(localized: "purchase_view_title"))
|
||||
.foregroundColor(textColor)
|
||||
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
|
||||
.padding([.leading, .trailing])
|
||||
VStack(alignment: .leading) {
|
||||
ForEach(iapManager.sortedSubscriptionKeysByPriceOptions, id: \.self) { product in
|
||||
HStack {
|
||||
Button(action: {
|
||||
purchase(product: product)
|
||||
}, label: {
|
||||
Text("\(product.displayPrice)\n\(product.displayName)")
|
||||
.foregroundColor(.white)
|
||||
.bold()
|
||||
.frame(maxWidth: .infinity)
|
||||
.contentShape(Rectangle())
|
||||
})
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 50)
|
||||
.padding()
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(iapManager.colorForIAPButton(iapIdentifier: product.id)))
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding([.leading, .leading])
|
||||
}
|
||||
.padding()
|
||||
.background(theme.currentTheme.secondaryBGColor)
|
||||
.cornerRadius(10)
|
||||
.sheet(isPresented: $showSubscriptionStore) {
|
||||
FeelsSubscriptionStoreView()
|
||||
}
|
||||
.manageSubscriptionsSheet(isPresented: $showManageSubscriptions)
|
||||
}
|
||||
|
||||
private var buyOptionsView: some View {
|
||||
VStack {
|
||||
ZStack {
|
||||
theme.currentTheme.secondaryBGColor
|
||||
|
||||
if iapManager.isLoadingSubscriptions {
|
||||
VStack(spacing: 20) {
|
||||
Text(String(localized: "purchase_view_loading"))
|
||||
.font(.body)
|
||||
.bold()
|
||||
.frame(minWidth: 0, maxWidth: .infinity, alignment: .center)
|
||||
ProgressView()
|
||||
}
|
||||
} else {
|
||||
|
||||
VStack(spacing: 20) {
|
||||
Text(String(localized: "purchase_view_title"))
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
|
||||
.padding(.top)
|
||||
|
||||
if showCountdownTimer {
|
||||
if let date = Calendar.current.date(byAdding: .day, value: 30, to: firstLaunchDate) {
|
||||
HStack {
|
||||
if iapManager.daysLeftBeforeIAP > 0 {
|
||||
Text(String(localized: "purchase_view_current_subscription_expires_in"))
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
|
||||
Text(date, style: .relative)
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
} else {
|
||||
Text(String(localized: "purchase_view_current_subscription_expired_on"))
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
|
||||
Text(date, style: .date)
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
}
|
||||
}
|
||||
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
|
||||
Text(String(localized: "purchase_view_current_why_subscribe"))
|
||||
.font(.body)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
|
||||
HStack {
|
||||
ForEach(iapManager.sortedSubscriptionKeysByPriceOptions) { product in
|
||||
Button(action: {
|
||||
purchase(product: product)
|
||||
}, label: {
|
||||
Text("\(product.displayPrice)\n\(product.displayName)")
|
||||
.foregroundColor(.white)
|
||||
.bold()
|
||||
.frame(maxWidth: .infinity)
|
||||
.contentShape(Rectangle())
|
||||
.frame(height: 65)
|
||||
})
|
||||
.padding()
|
||||
.frame(maxWidth: .infinity)
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(iapManager.colorForIAPButton(iapIdentifier: product.id)))
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding([.leading, .trailing])
|
||||
.frame(minWidth: 0, maxWidth: .infinity)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Loading View
|
||||
|
||||
private var loadingView: some View {
|
||||
VStack(spacing: 12) {
|
||||
ProgressView()
|
||||
Text(String(localized: "purchase_view_loading"))
|
||||
.font(.body)
|
||||
.foregroundColor(textColor)
|
||||
}
|
||||
.background(.ultraThinMaterial)
|
||||
.frame(minWidth: 0, maxWidth: .infinity)
|
||||
.background(.clear)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding()
|
||||
}
|
||||
|
||||
// MARK: - Subscribed View
|
||||
|
||||
private var subscribedView: some View {
|
||||
VStack(alignment: .leading) {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
Text(String(localized: "purchase_view_current_subscription"))
|
||||
.font(.title3)
|
||||
.padding([.leading, .top])
|
||||
|
||||
Divider()
|
||||
|
||||
if let currentProduct = iapManager.currentSubscription,
|
||||
let value = iapManager.subscriptions[currentProduct] {
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
|
||||
if let product = iapManager.currentProduct {
|
||||
HStack {
|
||||
VStack (alignment: .leading, spacing: 10) {
|
||||
Text(currentProduct.displayName)
|
||||
.font(.title3)
|
||||
Text(currentProduct.displayPrice)
|
||||
.font(.title3)
|
||||
}.padding([.leading, .trailing])
|
||||
|
||||
ForEach(value!.status, id: \.self) { singleStatus in
|
||||
StatusInfoView(product: currentProduct, status: singleStatus)
|
||||
.padding([.leading])
|
||||
.font(.body)
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(product.displayName)
|
||||
.font(.headline)
|
||||
.foregroundColor(textColor)
|
||||
Text(product.displayPrice)
|
||||
.font(.subheadline)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
subscriptionStatusBadge
|
||||
}
|
||||
}
|
||||
|
||||
Button(action: {
|
||||
showManageSubClosure?()
|
||||
}, label: {
|
||||
Text(String(localized: "purchase_view_cancel"))
|
||||
.foregroundColor(.red)
|
||||
})
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding([.bottom])
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
|
||||
Divider()
|
||||
|
||||
showOtherSubOptions
|
||||
}
|
||||
}
|
||||
|
||||
private var showOtherSubOptions: some View {
|
||||
VStack (spacing: 10) {
|
||||
HStack {
|
||||
ForEach(iapManager.sortedSubscriptionKeysByPriceOptions, id: \.self) { product in
|
||||
if product.id != iapManager.nextRenewllOption?.id {
|
||||
Button(action: {
|
||||
purchase(product: product)
|
||||
}, label: {
|
||||
Text("\(product.displayPrice)\n\(product.displayName)")
|
||||
.foregroundColor(.white)
|
||||
.font(.headline)
|
||||
})
|
||||
.contentShape(Rectangle())
|
||||
.padding()
|
||||
|
||||
// Manage subscription button
|
||||
Button {
|
||||
showManageSubscriptions = true
|
||||
} label: {
|
||||
Text(String(localized: "purchase_view_manage_subscription"))
|
||||
.font(.body)
|
||||
.foregroundColor(.blue)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
// Show other subscription options
|
||||
if iapManager.sortedProducts.count > 1 {
|
||||
Button {
|
||||
showSubscriptionStore = true
|
||||
} label: {
|
||||
Text(String(localized: "purchase_view_change_plan"))
|
||||
.font(.body)
|
||||
.foregroundColor(.secondary)
|
||||
.frame(maxWidth: .infinity)
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(iapManager.colorForIAPButton(iapIdentifier: product.id)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding([.leading, .trailing])
|
||||
}
|
||||
|
||||
private func purchase(product: Product) {
|
||||
Task {
|
||||
try await iapManager.purchase(product)
|
||||
|
||||
private var subscriptionStatusBadge: some View {
|
||||
Group {
|
||||
if case .subscribed(_, let willAutoRenew) = iapManager.state {
|
||||
if willAutoRenew {
|
||||
Text(String(localized: "subscription_status_active"))
|
||||
.font(.caption)
|
||||
.foregroundColor(.white)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
.background(Color.green)
|
||||
.cornerRadius(4)
|
||||
} else {
|
||||
Text(String(localized: "subscription_status_expires"))
|
||||
.font(.caption)
|
||||
.foregroundColor(.white)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
.background(Color.orange)
|
||||
.cornerRadius(4)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Not Subscribed View
|
||||
|
||||
private var notSubscribedView: some View {
|
||||
VStack(spacing: 16) {
|
||||
Text(String(localized: "purchase_view_title"))
|
||||
.font(.title3)
|
||||
.bold()
|
||||
.foregroundColor(textColor)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
|
||||
// Trial status
|
||||
if iapManager.shouldShowTrialWarning {
|
||||
trialStatusView
|
||||
} else if iapManager.shouldShowPaywall {
|
||||
Text(String(localized: "purchase_view_trial_expired"))
|
||||
.font(.body)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Text(String(localized: "purchase_view_current_why_subscribe"))
|
||||
.font(.body)
|
||||
.foregroundColor(.secondary)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
// Subscribe button
|
||||
Button {
|
||||
showSubscriptionStore = true
|
||||
} label: {
|
||||
Text(String(localized: "purchase_view_subscribe_button"))
|
||||
.font(.headline)
|
||||
.foregroundColor(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding()
|
||||
.background(Color.pink)
|
||||
.cornerRadius(10)
|
||||
}
|
||||
|
||||
// Restore purchases
|
||||
Button {
|
||||
Task {
|
||||
await iapManager.restore()
|
||||
}
|
||||
} label: {
|
||||
Text(String(localized: "purchase_view_restore"))
|
||||
.font(.body)
|
||||
.foregroundColor(.blue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var trialStatusView: some View {
|
||||
HStack {
|
||||
Image(systemName: "clock")
|
||||
.foregroundColor(.orange)
|
||||
|
||||
if let expirationDate = iapManager.trialExpirationDate {
|
||||
Text(String(localized: "purchase_view_trial_expires_in"))
|
||||
.foregroundColor(textColor)
|
||||
+
|
||||
Text(" ")
|
||||
+
|
||||
Text(expirationDate, style: .relative)
|
||||
.foregroundColor(.orange)
|
||||
.bold()
|
||||
}
|
||||
}
|
||||
.font(.body)
|
||||
}
|
||||
}
|
||||
|
||||
struct PurchaseButtonView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
PurchaseButtonView(iapManager: IAPManager())
|
||||
}
|
||||
#Preview {
|
||||
PurchaseButtonView(iapManager: IAPManager())
|
||||
}
|
||||
|
||||
@@ -147,30 +147,7 @@ struct SettingsView: View {
|
||||
}
|
||||
|
||||
private var subscriptionInfoView: some View {
|
||||
ZStack {
|
||||
theme.currentTheme.secondaryBGColor
|
||||
VStack {
|
||||
PurchaseButtonView(iapManager: iapManager, showManageSubClosure: {
|
||||
Task {
|
||||
await
|
||||
self.showManageSubscription()
|
||||
}
|
||||
}, showCountdownTimer: true)
|
||||
|
||||
if iapManager.showIAPWarning {
|
||||
Button(action: {
|
||||
Task {
|
||||
await iapManager.restore()
|
||||
}
|
||||
}, label: {
|
||||
Text(String(localized: "purchase_view_restore"))
|
||||
.font(.title3)
|
||||
.padding([.top, .bottom])
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
.cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
|
||||
PurchaseButtonView(iapManager: iapManager)
|
||||
}
|
||||
|
||||
private var closeButtonView: some View {
|
||||
@@ -245,7 +222,9 @@ struct SettingsView: View {
|
||||
tmpDate = Calendar.current.date(byAdding: .minute, value: -59, to: tmpDate)!
|
||||
tmpDate = Calendar.current.date(byAdding: .second, value: -45, to: tmpDate)!
|
||||
firstLaunchDate = tmpDate
|
||||
iapManager.updateEverything()
|
||||
Task {
|
||||
await iapManager.checkSubscriptionStatus()
|
||||
}
|
||||
}, label: {
|
||||
Text("Set first launch date back 29 days, 23 hrs, 45 seconds")
|
||||
.foregroundColor(textColor)
|
||||
@@ -255,13 +234,15 @@ struct SettingsView: View {
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
.cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
|
||||
}
|
||||
|
||||
|
||||
private var resetLaunchDate: some View {
|
||||
ZStack {
|
||||
theme.currentTheme.secondaryBGColor
|
||||
Button(action: {
|
||||
firstLaunchDate = Date()
|
||||
iapManager.updateEverything()
|
||||
Task {
|
||||
await iapManager.checkSubscriptionStatus()
|
||||
}
|
||||
}, label: {
|
||||
Text("Reset luanch date to current date")
|
||||
.foregroundColor(textColor)
|
||||
@@ -590,16 +571,6 @@ struct SettingsView: View {
|
||||
.cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
|
||||
}
|
||||
|
||||
func showManageSubscription() async {
|
||||
if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene{
|
||||
do {
|
||||
try await StoreKit.AppStore.showManageSubscriptions(in: windowScene)
|
||||
iapManager.updateEverything()
|
||||
} catch {
|
||||
print("Sheet can not be opened")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct TextFile: FileDocument {
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
//
|
||||
// StatusInfoView.swift
|
||||
// Feels
|
||||
//
|
||||
// Created by Trey Tartt on 7/8/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import StoreKit
|
||||
|
||||
struct StatusInfoView: View {
|
||||
@EnvironmentObject var iapManager: IAPManager
|
||||
|
||||
let product: Product
|
||||
let status: Product.SubscriptionInfo.Status
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
Text(statusDescription())
|
||||
.frame(maxWidth: .infinity, alignment: .center)
|
||||
.font(.body)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 75)
|
||||
}
|
||||
|
||||
//Build a string description of the subscription status to display to the user.
|
||||
fileprivate func statusDescription() -> String {
|
||||
guard case .verified(let renewalInfo) = status.renewalInfo,
|
||||
case .verified(let transaction) = status.transaction else {
|
||||
return "The App Store could not verify your subscription status."
|
||||
}
|
||||
|
||||
var description = ""
|
||||
|
||||
switch status.state {
|
||||
case .subscribed:
|
||||
let renewToProduct: Product?
|
||||
let renewalInfo: RenewalInfo?
|
||||
|
||||
renewalInfo = try? iapManager.checkVerified(status.renewalInfo)
|
||||
renewToProduct = iapManager.subscriptions.first(where: {
|
||||
$0.key.id == renewalInfo?.autoRenewPreference
|
||||
})?.key
|
||||
|
||||
description = subscribedDescription(expirationDate: transaction.expirationDate,
|
||||
willRenew: renewalInfo?.willAutoRenew ?? false,
|
||||
willRenewTo: renewToProduct)
|
||||
case .expired:
|
||||
if let expirationDate = transaction.expirationDate,
|
||||
let expirationReason = renewalInfo.expirationReason {
|
||||
description = expirationDescription(expirationReason, expirationDate: expirationDate)
|
||||
}
|
||||
case .revoked:
|
||||
if let revokedDate = transaction.revocationDate {
|
||||
description = "The App Store refunded your subscription to \(product.displayName) on \(revokedDate.formattedDate())."
|
||||
}
|
||||
case .inGracePeriod:
|
||||
description = gracePeriodDescription(renewalInfo)
|
||||
case .inBillingRetryPeriod:
|
||||
description = billingRetryDescription()
|
||||
default:
|
||||
break
|
||||
}
|
||||
return description
|
||||
}
|
||||
|
||||
fileprivate func billingRetryDescription() -> String {
|
||||
var description = "The App Store could not confirm your billing information for \(product.displayName)."
|
||||
description += " Please verify your billing information to resume service."
|
||||
return description
|
||||
}
|
||||
|
||||
fileprivate func gracePeriodDescription(_ renewalInfo: RenewalInfo) -> String {
|
||||
var description = "The App Store could not confirm your billing information for \(product.displayName)."
|
||||
if let untilDate = renewalInfo.gracePeriodExpirationDate {
|
||||
description += " Please verify your billing information to continue service after \(untilDate.formattedDate())"
|
||||
}
|
||||
|
||||
return description
|
||||
}
|
||||
|
||||
fileprivate func subscribedDescription(expirationDate: Date?, willRenew: Bool, willRenewTo: Product?) -> String {
|
||||
var description = "You are currently subscribed to \(product.displayName)"
|
||||
|
||||
if let expirationDate = expirationDate {
|
||||
description += ", which will expire on \(expirationDate.formattedDate()),"
|
||||
}
|
||||
|
||||
if willRenew {
|
||||
if let willRenewTo = willRenewTo {
|
||||
if willRenewTo == product {
|
||||
description += " and will auto renew."
|
||||
} else {
|
||||
description += " and will auto renew to \(willRenewTo.displayName) at \(willRenewTo.displayPrice)."
|
||||
}
|
||||
}
|
||||
} else {
|
||||
description += " and will NOT auto renew."
|
||||
}
|
||||
|
||||
return description
|
||||
}
|
||||
|
||||
fileprivate func renewalDescription(_ renewalInfo: RenewalInfo, _ expirationDate: Date) -> String {
|
||||
var description = ""
|
||||
|
||||
if let newProductID = renewalInfo.autoRenewPreference {
|
||||
if let newProduct = iapManager.subscriptions.first(where: { $0.key.id == newProductID }) {
|
||||
description += "\nYour subscription to \(newProduct.key.displayName)"
|
||||
description += " will begin when your current subscription expires on \(expirationDate.formattedDate())."
|
||||
}
|
||||
} else if renewalInfo.willAutoRenew {
|
||||
description += "\nWill auto renew on: \(expirationDate.formattedDate())."
|
||||
}
|
||||
|
||||
return description
|
||||
}
|
||||
|
||||
//Build a string description of the `expirationReason` to display to the user.
|
||||
fileprivate func expirationDescription(_ expirationReason: RenewalInfo.ExpirationReason, expirationDate: Date) -> String {
|
||||
var description = ""
|
||||
|
||||
switch expirationReason {
|
||||
case .autoRenewDisabled:
|
||||
if expirationDate > Date() {
|
||||
description += "Your subscription to \(product.displayName) will expire on \(expirationDate.formattedDate())."
|
||||
} else {
|
||||
description += "Your subscription to \(product.displayName) expired on \(expirationDate.formattedDate())."
|
||||
}
|
||||
case .billingError:
|
||||
description = "Your subscription to \(product.displayName) was not renewed due to a billing error."
|
||||
case .didNotConsentToPriceIncrease:
|
||||
description = "Your subscription to \(product.displayName) was not renewed due to a price increase that you disapproved."
|
||||
case .productUnavailable:
|
||||
description = "Your subscription to \(product.displayName) was not renewed because the product is no longer available."
|
||||
default:
|
||||
description = "Your subscription to \(product.displayName) was not renewed."
|
||||
}
|
||||
|
||||
return description
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,8 @@ struct YearView: View {
|
||||
@EnvironmentObject var iapManager: IAPManager
|
||||
@StateObject public var viewModel: YearViewModel
|
||||
@StateObject private var filteredDays = DaysFilterClass.shared
|
||||
@State private var iAPWarningViewHidden = false
|
||||
@State private var trialWarningHidden = false
|
||||
@State private var showSubscriptionStore = false
|
||||
//[
|
||||
// 2001: [0: [], 1: [], 2: []],
|
||||
// 2002: [0: [], 1: [], 2: []]
|
||||
@@ -60,24 +61,44 @@ struct YearView: View {
|
||||
}
|
||||
)
|
||||
}
|
||||
.disabled(iapManager.showIAP)
|
||||
.disabled(iapManager.shouldShowPaywall)
|
||||
.padding(.bottom, 5)
|
||||
}
|
||||
|
||||
if iapManager.showIAP {
|
||||
|
||||
if iapManager.shouldShowPaywall {
|
||||
// Paywall overlay - tap to show subscription store
|
||||
Color.black.opacity(0.3)
|
||||
.ignoresSafeArea()
|
||||
.onTapGesture {
|
||||
showSubscriptionStore = true
|
||||
}
|
||||
|
||||
VStack {
|
||||
Spacer()
|
||||
PurchaseButtonView(height: 250, iapManager: iapManager)
|
||||
Button {
|
||||
showSubscriptionStore = true
|
||||
} label: {
|
||||
Text(String(localized: "subscription_required_button"))
|
||||
.font(.headline)
|
||||
.foregroundColor(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding()
|
||||
.background(RoundedRectangle(cornerRadius: 10).fill(Color.pink))
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
} else if iapManager.showIAPWarning {
|
||||
} else if iapManager.shouldShowTrialWarning {
|
||||
VStack {
|
||||
Spacer()
|
||||
if !iAPWarningViewHidden {
|
||||
IAPWarningView(height: 75, iapManager: iapManager)
|
||||
if !trialWarningHidden {
|
||||
IAPWarningView(iapManager: iapManager)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $showSubscriptionStore) {
|
||||
FeelsSubscriptionStoreView()
|
||||
}
|
||||
.onAppear(perform: {
|
||||
self.viewModel.filterEntries(startDate: Date(timeIntervalSince1970: 0), endDate: Date())
|
||||
})
|
||||
@@ -87,7 +108,7 @@ struct YearView: View {
|
||||
)
|
||||
.onPreferenceChange(ViewOffsetKey.self) { value in
|
||||
withAnimation {
|
||||
iAPWarningViewHidden = value < 0
|
||||
trialWarningHidden = value < 0
|
||||
}
|
||||
}
|
||||
.padding([.top])
|
||||
|
||||
Reference in New Issue
Block a user