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

Merge branch 'main' of github.com:akatreyt/Feels

Browse Source
This commit is contained in:
Trey t
2026-02-28 10:19:39 -06:00
parent 97c8128e2d 4068bdd60d
commit f614487057
6 changed files with 1232 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/Views/IAPWarningView.swift
View File

@@ -22,12 +22,12 @@ struct IAPWarningView: View {
Image(systemName: "clock")
.foregroundColor(.orange)
if let expirationDate = iapManager.trialExpirationDate, expirationDate > Date() {
if iapManager.daysLeftInTrial > 0 {
Text(String(localized: "iap_warning_view_title"))
.font(.body)
.foregroundColor(textColor)
Text(expirationDate, style: .relative)
Text("\(iapManager.daysLeftInTrial) days")
.font(.body)
.bold()
.foregroundColor(.orange)

4
Shared/Views/PurchaseButtonView.swift
View File

@@ -192,8 +192,8 @@ struct PurchaseButtonView: View {
Image(systemName: "clock")
.foregroundColor(.orange)
if let expirationDate = iapManager.trialExpirationDate, expirationDate > Date() {
Text("\(Text(String(localized: "purchase_view_trial_expires_in")).foregroundColor(textColor)) \(Text(expirationDate, style: .relative).foregroundColor(.orange).bold())")
if iapManager.daysLeftInTrial > 0 {
Text("\(Text(String(localized: "purchase_view_trial_expires_in")).foregroundColor(textColor)) \(Text("\(iapManager.daysLeftInTrial) days").foregroundColor(.orange).bold())")
} else {
Text(String(localized: "purchase_view_trial_expired"))
.foregroundColor(.orange)

8
Shared/Views/SettingsView/SettingsTabView.swift
View File

@@ -41,7 +41,7 @@ struct SettingsTabView: View {
UpgradeBannerView(
showWhyUpgrade: $showWhyUpgrade,
showSubscriptionStore: $showSubscriptionStore,
trialExpirationDate: iapManager.trialExpirationDate
daysRemaining: iapManager.daysLeftInTrial
)
.padding(.horizontal, 16)
.padding(.top, 12)
@@ -86,7 +86,7 @@ struct SettingsTabView: View {
struct UpgradeBannerView: View {
@Binding var showWhyUpgrade: Bool
@Binding var showSubscriptionStore: Bool
let trialExpirationDate: Date?
let daysRemaining: Int
@Environment(\.colorScheme) private var colorScheme
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@@ -101,8 +101,8 @@ struct UpgradeBannerView: View {
.font(.subheadline.weight(.medium))
.foregroundColor(.orange)
if let expirationDate = trialExpirationDate, expirationDate > Date() {
Text("\(Text("Trial expires in ").font(.subheadline.weight(.medium)).foregroundColor(textColor.opacity(0.8)))\(Text(expirationDate, style: .relative).font(.subheadline.weight(.bold)).foregroundColor(.orange))")
if daysRemaining > 0 {
Text("\(Text("Trial expires in ").font(.subheadline.weight(.medium)).foregroundColor(textColor.opacity(0.8)))\(Text("\(daysRemaining) days").font(.subheadline.weight(.bold)).foregroundColor(.orange))")
} else {
Text("Trial expired")
.font(.subheadline.weight(.medium))