Refactoring and renaming

Author: bjorkert

Loop/Views/SettingsView.swift

@@ -416,50 +416,53 @@ extension SettingsView {
     /*
      DIY loop specific component to show users the amount of time remaining on their build before a rebuild is necessary.
      */
-    private func profileExpirationSection(profileExpiration:Date) -> some View {
+    private func appExpirationSection(profileExpiration: Date) -> some View {
         let expirationDate = AppExpirationAlerter.calculateExpirationDate(profileExpiration: profileExpiration)
         let isTestFlight = AppExpirationAlerter.isTestFlightBuild()
-        
-        let nearExpiration : Bool = AppExpirationAlerter.isNearExpiration(expirationDate: expirationDate)
+        let nearExpiration = AppExpirationAlerter.isNearExpiration(expirationDate: expirationDate)
         let profileExpirationMsg = AppExpirationAlerter.createProfileExpirationSettingsMessage(expirationDate: expirationDate)
         let readableExpirationTime = Self.dateFormatter.string(from: expirationDate)
 
         if isTestFlight {
-            return Section(header: SectionHeader(label: NSLocalizedString("TestFlight", comment: "Settings app TestFlight section")),
-                           footer: Text(NSLocalizedString("TestFlight expires ", comment: "Time that build expires") + readableExpirationTime)) {
-                if(nearExpiration) {
-                    Text(profileExpirationMsg).foregroundColor(.red)
-                } else {
-                    HStack {
-                        Text("TestFlight Expiration", comment: "Settings TestFlight expiration view")
-                        Spacer()
-                        Text(profileExpirationMsg).foregroundColor(Color.secondary)
-                    }
-                }
-                Button(action: {
-                    UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/gh-actions/gh-update/")!)
-                }) {
-                    Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
-                }
-            }
+            return createAppExpirationSection(
+                headerLabel: NSLocalizedString("TestFlight", comment: "Settings app TestFlight section"),
+                footerLabel: NSLocalizedString("TestFlight expires ", comment: "Time that build expires") + readableExpirationTime,
+                expirationLabel: NSLocalizedString("TestFlight Expiration", comment: "Settings TestFlight expiration view"),
+                updateURL: "https://loopkit.github.io/loopdocs/gh-actions/gh-update/",
+                nearExpiration: nearExpiration,
+                expirationMessage: profileExpirationMsg
+            )
         } else {
-            return Section(header: SectionHeader(label: NSLocalizedString("App Profile", comment: "Settings app profile section")),
-                           footer: Text(NSLocalizedString("Profile expires ", comment: "Time that profile expires") + readableExpirationTime)) {
-                if(nearExpiration) {
-                    Text(profileExpirationMsg).foregroundColor(.red)
-                } else {
-                    HStack {
-                        Text("Profile Expiration", comment: "Settings App Profile expiration view")
-                        Spacer()
-                        Text(profileExpirationMsg).foregroundColor(Color.secondary)
-                    }
-                }
-                Button(action: {
-                    UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/build/updating/")!)
-                }) {
-                    Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
+            return createAppExpirationSection(
+                headerLabel: NSLocalizedString("App Profile", comment: "Settings app profile section"),
+                footerLabel: NSLocalizedString("Profile expires ", comment: "Time that profile expires") + readableExpirationTime,
+                expirationLabel: NSLocalizedString("Profile Expiration", comment: "Settings App Profile expiration view"),
+                updateURL: "https://loopkit.github.io/loopdocs/build/updating/",
+                nearExpiration: nearExpiration,
+                expirationMessage: profileExpirationMsg
+            )
+        }
+    }
+    
+    private func createAppExpirationSection(headerLabel: String, footerLabel: String, expirationLabel: String, updateURL: String, nearExpiration: Bool, expirationMessage: String) -> some View {
+        return Section(
+            header: SectionHeader(label: headerLabel),
+            footer: Text(footerLabel)
+        ) {
+            if nearExpiration {
+                Text(expirationMessage).foregroundColor(.red)
+            } else {
+                HStack {
+                    Text(expirationLabel)
+                    Spacer()
+                    Text(expirationMessage).foregroundColor(Color.secondary)
                 }
             }
+            Button(action: {
+                UIApplication.shared.open(URL(string: updateURL)!)
+            }) {
+                Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
+            }
         }
     }