admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor StoreKit 2 subscription system and add interactive vote widget

Browse Source 
## 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
2025-12-09 23:07:16 -06:00
parent c8248429dd
commit f2c510de50
34 changed files with 1267 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/AppDelegate.swift
View File

@@ -10,7 +10,7 @@ import UserNotifications
import UIKit
import WidgetKit
import SwiftUI
import Firebase
// import Firebase // Firebase removed
class AppDelegate: NSObject, UIApplicationDelegate {
private let savedOnboardingData = UserDefaultsStore.getOnboarding()
@@ -22,7 +22,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
// PersistenceController.shared.deleteRandomFromLast(numberOfEntries: 10)
// GroupUserDefaults.groupDefaults.set(false, forKey: UserDefaultsStore.Keys.showNSFW.rawValue)
FirebaseApp.configure()
// FirebaseApp.configure() // Firebase removed
PersistenceController.shared.removeNoForDates()
PersistenceController.shared.fillInMissingDates()
UNUserNotificationCenter.current().delegate = self

2
Shared/BGTask.swift
View File

@@ -9,7 +9,7 @@ import Foundation
import BackgroundTasks
class BGTask {
static let updateDBMissingID = "com.88oak.Feels.dbUpdateMissing"
static let updateDBMissingID = "com.tt.ifeel.dbUpdateMissing"
class func runFillInMissingDatesTask(task: BGProcessingTask) {
BGTask.scheduleBackgroundProcessing()

8
Shared/EventLogger.swift
View File

@@ -6,10 +6,14 @@
//
import Foundation
import Firebase
// import Firebase // Firebase removed
class EventLogger {
static func log(event: String, withData data: [String: Any]? = nil) {
Analytics.logEvent(event, parameters: data)
// Firebase Analytics disabled
// Analytics.logEvent(event, parameters: data)
#if DEBUG
print("[EventLogger] \(event)", data ?? "")
#endif
}
}

16
Shared/FeelsApp.swift
View File

@@ -17,6 +17,7 @@ struct FeelsApp: App {
let persistenceController = PersistenceController.shared
@StateObject var iapManager = IAPManager()
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults) private var firstLaunchDate = Date()
@State private var showSubscriptionFromWidget = false
init() {
BGTaskScheduler.shared.cancelAllTaskRequests()
@@ -38,14 +39,27 @@ struct FeelsApp: App {
customizeView: CustomizeView())
.environment(\.managedObjectContext, persistenceController.viewContext)
.environmentObject(iapManager)
.sheet(isPresented: $showSubscriptionFromWidget) {
FeelsSubscriptionStoreView()
.environmentObject(iapManager)
}
.onOpenURL { url in
if url.scheme == "feels" && url.host == "subscribe" {
showSubscriptionFromWidget = true
}
}
}.onChange(of: scenePhase) { phase in
if phase == .background {
//BGTask.scheduleBackgroundProcessing()
WidgetCenter.shared.reloadAllTimelines()
}
if phase == .active {
UIApplication.shared.applicationIconBadgeNumber = 0
// Check subscription status on each app launch
Task {
await iapManager.checkSubscriptionStatus()
}
}
}
}

14
Shared/GoogleService-Info.plist
View File

@@ -13,22 +13,22 @@
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.88oakapps.ifeel</string>
<string>com.tt.ifeel</string>
<key>PROJECT_ID</key>
<string>ifeels</string>
<key>STORAGE_BUCKET</key>
<string>ifeels.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<false/>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<false/>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<true/>
<key>IS_GCM_ENABLED</key>
<true></true>
<true/>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<true/>
<key>GOOGLE_APP_ID</key>
<string>1:946071058799:ios:10f66b0b5dfe758ab0509a</string>
</dict>
</plist>
</plist>

559
Shared/IAPManager.swift
View File

@@ -1,410 +1,235 @@
/*
See LICENSE folder for this sample’s licensing information.
Abstract:
The store class is responsible for requesting products from the App Store and starting purchases.
*/
//
// IAPManager.swift
// Feels
//
// Refactored StoreKit 2 subscription manager with clean state model.
//
import Foundation
import StoreKit
import SwiftUI
typealias Transaction = StoreKit.Transaction
typealias RenewalInfo = StoreKit.Product.SubscriptionInfo.RenewalInfo
typealias RenewalState = StoreKit.Product.SubscriptionInfo.RenewalState
// MARK: - Subscription State
public enum StoreError: Error {
case failedVerification
enum SubscriptionState: Equatable {
case unknown
case subscribed(expirationDate: Date?, willAutoRenew: Bool)
case inTrial(daysRemaining: Int)
case trialExpired
case expired
}
class IAPManager: ObservableObject {
@Published private(set) var showIAP = false
@Published private(set) var showIAPWarning = false
@Published private(set) var isPurchasing = false
@Published private(set) var subscriptions = [Product: (status: [Product.SubscriptionInfo.Status], renewalInfo: RenewalInfo)?]()
private(set) var purchasedProductIDs = Set<String>()
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults) private var firstLaunchDate = Date()
@Published private(set) var isLoadingSubscriptions = false
public var sortedSubscriptionKeysByPriceOptions: [Product] {
subscriptions.keys.sorted(by: {
$0.price < $1.price
})
}
// MARK: - IAPManager
public var daysLeftBeforeIAP: Int {
let daysSinceInstall = Calendar.current.dateComponents([.day, .hour, .minute, .second], from: firstLaunchDate, to: Date())
if let days = daysSinceInstall.day {
return 30 - days
}
return 0
}
private var shouldShowIAP: Bool {
if shouldShowIAPWarning && daysLeftBeforeIAP <= 0{
return true
}
@MainActor
class IAPManager: ObservableObject {
// MARK: - Constants
static let subscriptionGroupID = "2CFE4C4F"
private let productIdentifiers: Set<String> = [
"com.tt.ifeel.IAP.subscriptions.monthly",
"com.tt.ifeel.IAP.subscriptions.yearly"
]
private let trialDays = 30
// MARK: - Published State
@Published private(set) var state: SubscriptionState = .unknown
@Published private(set) var availableProducts: [Product] = []
@Published private(set) var currentProduct: Product? = nil
@Published private(set) var isLoading = false
// MARK: - Storage
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults)
private var firstLaunchDate = Date()
// MARK: - Private
private var updateListenerTask: Task<Void, Error>?
// MARK: - Computed Properties
var isSubscribed: Bool {
if case .subscribed = state { return true }
return false
}
private var shouldShowIAPWarning: Bool {
// if we have't fetch all subscriptions yet use faster
// purchasedProductIDs
if subscriptions.isEmpty {
if purchasedProductIDs.isEmpty {
return true
} else {
return false
}
} else {
if currentSubscription == nil {
return true
}
var hasFullAccess: Bool {
switch state {
case .subscribed, .inTrial:
return true
case .unknown, .trialExpired, .expired:
return false
}
}
public var currentSubscription: Product? {
let sortedProducts = subscriptions.keys.sorted(by: {
$0.price > $1.price
})
// first see if we have a product + sub that is set to autorenew
for product in sortedProducts {
if let _value = subscriptions[product]??.renewalInfo {
if _value.willAutoRenew {
return product
}
}
var shouldShowPaywall: Bool {
switch state {
case .trialExpired, .expired:
return true
case .unknown, .subscribed, .inTrial:
return false
}
// if no auto renew then return
// highest priced that has a sub status
for product in sortedProducts {
if let _ = subscriptions[product]??.status {
return product
}
}
return nil
}
// for all products return the one that is set
// to auto renew
public var nextRenewllOption: Product? {
if let currentSubscription = currentSubscription,
let info = subscriptions[currentSubscription],
let status = info?.status {
for aStatus in status {
if let renewalInfo = try? checkVerified(aStatus.renewalInfo),
renewalInfo.willAutoRenew {
if let renewToProduct = subscriptions.first(where: {
$0.key.id == renewalInfo.autoRenewPreference
})?.key {
return renewToProduct
}
}
}
}
return nil
var shouldShowTrialWarning: Bool {
if case .inTrial = state { return true }
return false
}
var updateListenerTask: Task<Void, Error>? = nil
public var expireDate: Date? {
Calendar.current.date(byAdding: .day, value: 30, to: firstLaunchDate) ?? nil
var daysLeftInTrial: Int {
if case .inTrial(let days) = state { return days }
return 0
}
private let iapIdentifiers = Set([
// "com.88oakapps.ifeel.IAP.subscriptions.weekly",
"com.88oakapps.ifeel.IAP.subscriptions.monthly",
"com.88oakapps.ifeel.IAP.subscriptions.yearly"
])
var expireOnTimer: Timer?
var trialExpirationDate: Date? {
Calendar.current.date(byAdding: .day, value: trialDays, to: firstLaunchDate)
}
/// Products sorted by price (lowest first)
var sortedProducts: [Product] {
availableProducts.sorted { $0.price < $1.price }
}
// MARK: - Initialization
init() {
isLoadingSubscriptions = true
//Start a transaction listener as close to app launch as possible so you don't miss any transactions.
updateListenerTask = listenForTransactions()
updateEverything()
Task {
await checkSubscriptionStatus()
}
}
deinit {
updateListenerTask?.cancel()
}
public func updateEverything() {
Task {
DispatchQueue.main.async {
self.subscriptions.removeAll()
self.purchasedProductIDs.removeAll()
}
// get current sub from local cache
await updatePurchasedProducts()
// update local variables to show iap warning / purchase views
self.updateShowVariables()
// if they have a subscription we dont care about showing the loading indicator
if !self.showIAP {
DispatchQueue.main.async {
self.isLoadingSubscriptions = false
}
}
// During store initialization, request products from the App Store.
await requestProducts()
// Deliver products that the customer purchases.
await updateCustomerProductStatus()
self.updateShowVariables()
self.setUpdateTimer()
DispatchQueue.main.async {
self.isLoadingSubscriptions = false
}
}
}
// MARK: - Public Methods
private func updateShowVariables() {
DispatchQueue.main.async {
self.showIAP = self.shouldShowIAP
self.showIAPWarning = self.shouldShowIAPWarning
}
}
private func setUpdateTimer() {
if !self.showIAPWarning {
if let expireOnTimer = expireOnTimer {
expireOnTimer.invalidate()
}
/// Check subscription status - call on app launch and when becoming active
func checkSubscriptionStatus() async {
isLoading = true
defer { isLoading = false }
// Fetch available products
await loadProducts()
// Check for active subscription
let hasActiveSubscription = await checkForActiveSubscription()
if hasActiveSubscription {
// State already set in checkForActiveSubscription
syncSubscriptionStatusToUserDefaults()
return
}
if let expireDate = expireDate {
expireOnTimer = Timer.init(fire: expireDate, interval: 0, repeats: false, block: { _ in
self.updateShowVariables()
})
RunLoop.main.add(expireOnTimer!, forMode: .common)
} else {
if let expireOnTimer = expireOnTimer {
expireOnTimer.invalidate()
}
}
// No active subscription - check trial status
updateTrialState()
}
func listenForTransactions() -> Task<Void, Error> {
return Task.detached {
//Iterate through any transactions that don't come from a direct call to `purchase()`.
for await result in Transaction.updates {
do {
let transaction = try self.checkVerified(result)
//Deliver products to the user.
await self.updateCustomerProductStatus()
self.updateShowVariables()
//Always finish a transaction.
await transaction.finish()
} catch {
//StoreKit has a transaction that fails verification. Don't deliver content to the user.
print("Transaction failed verification")
}
}
}
/// Sync subscription status to UserDefaults for widget access
private func syncSubscriptionStatusToUserDefaults() {
GroupUserDefaults.groupDefaults.set(hasFullAccess, forKey: UserDefaultsStore.Keys.hasActiveSubscription.rawValue)
}
// fetch all available iap from remote and store locally
// in subscriptions
@MainActor
func requestProducts() async {
do {
subscriptions.removeAll()
//Request products from the App Store using the identifiers that the Products.plist file defines.
let storeProducts = try await Product.products(for: iapIdentifiers)
//Filter the products into categories based on their type.
for product in storeProducts {
switch product.type {
case .consumable:
break
case .nonConsumable:
break
case .autoRenewable:
subscriptions.updateValue(nil, forKey: product)
case .nonRenewable:
break
default:
//Ignore this product.
print("Unknown product")
}
}
} catch {
print("Failed product request from the App Store server: \(error)")
}
}
// quickly check current entitlments if we have a sub
private func updatePurchasedProducts() async {
for await result in Transaction.currentEntitlements {
guard case .verified(let transaction) = result else {
continue
}
if transaction.revocationDate == nil {
self.purchasedProductIDs.insert(transaction.productID)
} else {
self.purchasedProductIDs.remove(transaction.productID)
}
}
}
// fetch all subscriptions and fill out subscriptions with current
// status of each
@MainActor
func updateCustomerProductStatus() async {
var purchasedSubscriptions: [Product] = []
// Iterate through all of the user's purchased products.
for await result in Transaction.currentEntitlements {
do {
//Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
let transaction = try checkVerified(result)
//Check the `productType` of the transaction and get the corresponding product from the store.
switch transaction.productType {
case .nonConsumable:
break
case .nonRenewable:
break
case .autoRenewable:
if let subscription = subscriptions.first(where: {
$0.key.id == transaction.productID
}) {
purchasedSubscriptions.append(subscription.key)
}
default:
break
}
} catch {
print()
}
}
for sub in purchasedSubscriptions {
guard let statuses = try? await sub.subscription?.status else {
return
}
for status in statuses {
switch status.state {
case .expired, .revoked:
continue
default:
if let renewalInfo = try? checkVerified(status.renewalInfo) {
subscriptions.updateValue((statuses, renewalInfo), forKey: sub)
}
}
}
}
}
func purchase(_ product: Product) async throws -> Transaction? {
DispatchQueue.main.async {
self.isPurchasing = true
}
//Begin purchasing the `Product` the user selects.
let result = try await product.purchase()
switch result {
case .success(let verification):
//Check whether the transaction is verified. If it isn't,
//this function rethrows the verification error.
let transaction = try checkVerified(verification)
//The transaction is verified. Deliver content to the user.
await updateCustomerProductStatus()
self.updateShowVariables()
//Always finish a transaction.
await transaction.finish()
DispatchQueue.main.async {
self.isPurchasing = false
}
return transaction
case .userCancelled, .pending:
return nil
default:
return nil
}
}
func isPurchased(_ product: Product) async throws -> Bool {
//Determine whether the user purchases a given product.
switch product.type {
case .nonRenewable:
return false
case .nonConsumable:
return false
case .autoRenewable:
return subscriptions.keys.contains(product)
default:
return false
}
}
public func restore() async {
/// Restore purchases
func restore() async {
do {
try await AppStore.sync()
await checkSubscriptionStatus()
} catch {
print(error)
print("Failed to restore purchases: \(error)")
}
}
func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
//Check whether the JWS passes StoreKit verification.
switch result {
case .unverified:
//StoreKit parses the JWS, but it fails verification.
throw StoreError.failedVerification
case .verified(let safe):
//The result is verified. Return the unwrapped value.
return safe
// MARK: - Private Methods
private func loadProducts() async {
do {
let products = try await Product.products(for: productIdentifiers)
availableProducts = products.filter { $0.type == .autoRenewable }
} catch {
print("Failed to load products: \(error)")
}
}
func sortByPrice(_ products: [Product]) -> [Product] {
products.sorted(by: { return $0.price < $1.price })
private func checkForActiveSubscription() async -> Bool {
var foundActiveSubscription = false
for await result in Transaction.currentEntitlements {
guard case .verified(let transaction) = result else { continue }
// Skip revoked transactions
if transaction.revocationDate != nil { continue }
// Check if this is one of our subscription products
guard productIdentifiers.contains(transaction.productID) else { continue }
// Found an active subscription
foundActiveSubscription = true
// Get the product for this transaction
currentProduct = availableProducts.first { $0.id == transaction.productID }
// Get renewal info
if let product = currentProduct,
let subscription = product.subscription,
let statuses = try? await subscription.status {
for status in statuses {
guard case .verified(let renewalInfo) = status.renewalInfo else { continue }
switch status.state {
case .subscribed, .inGracePeriod, .inBillingRetryPeriod:
state = .subscribed(
expirationDate: transaction.expirationDate,
willAutoRenew: renewalInfo.willAutoRenew
)
return true
case .expired, .revoked:
continue
default:
continue
}
}
}
// Fallback if we couldn't get detailed status
state = .subscribed(expirationDate: transaction.expirationDate, willAutoRenew: false)
return true
}
// No active subscription found
currentProduct = nil
return false
}
func colorForIAPButton(iapIdentifier: String) -> Color {
if iapIdentifier == "com.88oakapps.ifeel.IAP.subscriptions.weekly" {
return DefaultMoodTint.color(forMood: .horrible)
private func updateTrialState() {
let daysSinceInstall = Calendar.current.dateComponents([.day], from: firstLaunchDate, to: Date()).day ?? 0
let daysRemaining = trialDays - daysSinceInstall
if daysRemaining > 0 {
state = .inTrial(daysRemaining: daysRemaining)
} else {
state = .trialExpired
}
else if iapIdentifier == "com.88oakapps.ifeel.IAP.subscriptions.monthly" {
return DefaultMoodTint.color(forMood: .average)
syncSubscriptionStatusToUserDefaults()
}
private func listenForTransactions() -> Task<Void, Error> {
Task.detached { [weak self] in
for await result in Transaction.updates {
guard case .verified(let transaction) = result else { continue }
await transaction.finish()
await self?.checkSubscriptionStatus()
}
}
else if iapIdentifier == "com.88oakapps.ifeel.IAP.subscriptions.yearly" {
return DefaultMoodTint.color(forMood: .great)
}
return .blue
}
}

1
Shared/Models/MoodEntryExtension.swift
View File

@@ -12,6 +12,7 @@ enum EntryType: Int {
case header
case listView
case filledInMissing
case widget
}
extension MoodEntry {

4
Shared/Models/UserDefaultsStore.swift
View File

@@ -26,7 +26,9 @@ class UserDefaultsStore {
case shape
case daysFilter
case firstLaunchDate
case hasActiveSubscription
case lastVotedDate
case contentViewCurrentSelectedHeaderViewBackDays
case contentViewHeaderTag
case contentViewHeaderTagViewOneViewType

25
Shared/Persisence/Persistence.swift
View File

@@ -9,12 +9,14 @@ import CoreData
import SwiftUI
class PersistenceController {
@AppStorage(UserDefaultsStore.Keys.useCloudKit.rawValue, store: GroupUserDefaults.groupDefaults) private var useCloudKit = false
@AppStorage(UserDefaultsStore.Keys.useCloudKit.rawValue, store: GroupUserDefaults.groupDefaults)
private var useCloudKit = false
static let shared = PersistenceController.persistenceController
private static var persistenceController: PersistenceController {
return PersistenceController(inMemory: false)
return PersistenceController(inMemory: true)
}
public var viewContext: NSManagedObjectContext {
@@ -117,12 +119,19 @@ extension NSManagedObjectContext {
class NSCustomPersistentContainer: NSPersistentContainer {
override open class func defaultDirectoryURL() -> URL {
#if DEBUG
var storeURLDebug = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.groupShareIdDebug)
storeURLDebug = storeURLDebug?.appendingPathComponent("Feels-Debug.sqlite")
return storeURLDebug!
if let storeURLDebug = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.groupShareIdDebug) {
return storeURLDebug.appendingPathComponent("Feels-Debug.sqlite")
}
// Fallback to default location if App Group not available
print("⚠️ App Group not available, using default Core Data location")
return super.defaultDirectoryURL()
#else
if let storeURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.groupShareId) {
return storeURL.appendingPathComponent("Feels.sqlite")
}
// Fallback to default location if App Group not available
print("⚠️ App Group not available, using default Core Data location")
return super.defaultDirectoryURL()
#endif
var storeURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.groupShareId)
storeURL = storeURL?.appendingPathComponent("Feels.sqlite")
return storeURL!
}
}

4
Shared/Random.swift
View File

@@ -9,8 +9,8 @@ import Foundation
import SwiftUI
struct Constants {
static let groupShareId = "group.com.88oakapps.ifeel"
static let groupShareIdDebug = "group.com.88oakapps.ifeelDebug"
static let groupShareId = "group.com.tt.ifeel"
static let groupShareIdDebug = "group.com.tt.ifeelDebug"
static let viewsCornerRaidus: CGFloat = 10
}

47
Shared/views/FeelsSubscriptionStoreView.swift Normal file
View 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())
}

78
Shared/views/IAPWarningView.swift
View File

@@ -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())
}

43
Shared/views/MonthView/MonthView.swift
View File

@@ -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
}
}
}

370
Shared/views/PurchaseButtonView.swift
View File

@@ -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())
}

45
Shared/views/SettingsView/SettingsView.swift
View File

@@ -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 {

143
Shared/views/StatusInfoView.swift
View File

@@ -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
}
}

39
Shared/views/YearView/YearView.swift
View File

@@ -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])