Moves the literal strings out of SubscriptionInformation.

RevenueCat · Jul 19, 2024 · 124e143 · 124e143
1 parent 222741b
commit 124e143
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/RevenueCatUI/CustomerCenter/Data/SubscriptionInformation.swift b/RevenueCatUI/CustomerCenter/Data/SubscriptionInformation.swift
@@ -22,23 +22,8 @@ struct SubscriptionInformation {
     let price: String
     let expirationDateString: String?
     let productIdentifier: String
-
-    var expirationString: String {
-        return active ? (
-            willRenew ? String(localized: "Next billing date") : String(localized: "Expires")
-        ) : String(localized: "Expired")
-    }
-
-    var explanation: String {
-        return active ? (
-            willRenew ?
-                String(localized: "This is your subscription with the earliest billing date.") :
-                String(localized: "This is your subscription with the earliest expiration date.")
-        ) : String(localized: "This subscription has expired.")
-    }
-
-    private let willRenew: Bool
-    private let active: Bool
+    let willRenew: Bool
+    let active: Bool
 
     init(title: String,
          durationTitle: String,

diff --git a/RevenueCatUI/CustomerCenter/Views/ManageSubscriptionsView.swift b/RevenueCatUI/CustomerCenter/Views/ManageSubscriptionsView.swift
@@ -148,7 +148,16 @@ struct SubscriptionDetailsView: View {
             VStack(alignment: .leading) {
                 Text("\(subscriptionInformation.title)")
                     .font(.headline)
-                Text("\(subscriptionInformation.explanation)")
+
+                var explanation: String {
+                    return subscriptionInformation.active ? (
+                        subscriptionInformation.willRenew ?
+                            String(localized: "This is your subscription with the earliest billing date.") :
+                            String(localized: "This is your subscription with the earliest expiration date.")
+                    ) : String(localized: "This subscription has expired.")
+                }
+
+                Text("\(explanation)")
                     .frame(maxWidth: 200, alignment: .leading)
                     .font(.caption)
                     .foregroundColor(Color(UIColor.secondaryLabel))
@@ -181,12 +190,21 @@ struct SubscriptionDetailsView: View {
             }
 
             if let nextRenewal =  subscriptionInformation.expirationDateString {
+
+                var expirationString: String {
+                    return subscriptionInformation.active ? (
+                        subscriptionInformation.willRenew ?
+                            String(localized: "Next billing date") :
+                            String(localized: "Expires")
+                    ) : String(localized: "Expired")
+                }
+
                 HStack(alignment: .center) {
                     Image(systemName: "calendar")
                         .accessibilityHidden(true)
                         .frame(width: iconWidth)
                     VStack(alignment: .leading) {
-                        Text("\(subscriptionInformation.expirationString)")
+                        Text("\(expirationString)")
                             .font(.caption2)
                             .foregroundColor(Color(UIColor.secondaryLabel))
                         Text("\(String(describing: nextRenewal))")