update to match version merged into dev

Author: marionbarker

testflight_expiration_warning/main_tf_alert.patch

@@ -1,5 +1,6 @@
-diff --git a/Loop/Loop/Managers/ProfileExpirationAlerter.swift b/Loop/Managers/ProfileExpirationAlerter.swift
-index a28d4527..068e6327 100644
+Submodule Loop contains modified content
+diff --git a/Loop/Loop/Managers/ProfileExpirationAlerter.swift b/Loop/Loop/Managers/ProfileExpirationAlerter.swift
+index a28d4527..62f458fb 100644
 --- a/Loop/Loop/Managers/ProfileExpirationAlerter.swift
 +++ b/Loop/Loop/Managers/ProfileExpirationAlerter.swift
 @@ -19,13 +19,19 @@ class ProfileExpirationAlerter {
@@ -88,7 +89,7 @@ index a28d4527..068e6327 100644
          let relativeTimeRemaining: String = readableRelativeTime ?? NSLocalizedString("Unknown time", comment: "Unknown amount of time in settings' profile expiration section")
          let verboseMessage = createVerboseAlertMessage(timeUntilExpirationStr: relativeTimeRemaining)
          let conciseMessage = relativeTimeRemaining + NSLocalizedString(" remaining", comment: "remaining time in setting's profile expiration section")
-@@ -81,6 +104,50 @@ class ProfileExpirationAlerter {
+@@ -81,6 +104,56 @@ class ProfileExpirationAlerter {
          formatter.unitsStyle = .full
          formatter.zeroFormattingBehavior = .dropLeading
          formatter.maximumUnitCount = maxUnitCount
@@ -111,6 +112,12 @@ index a28d4527..068e6327 100644
 +    }
 +
 +    static func isTestFlightBuild() -> Bool {
++        // If the target environment is a simulator, then
++        // this is not a TestFlight distribution. Return false.
++        #if targetEnvironment(simulator)
++            return false
++        #endif
++
 +        // If an "embedded.mobileprovision" is present in the main bundle, then
 +        // this is an Xcode, Ad-Hoc, or Enterprise distribution. Return false.
 +        if Bundle.main.url(forResource: "embedded", withExtension: "mobileprovision") != nil {
@@ -141,10 +148,10 @@ index a28d4527..068e6327 100644
      }
  }
 diff --git a/Loop/Loop/Views/SettingsView.swift b/Loop/Loop/Views/SettingsView.swift
-index 90859273..e41ebfa2 100644
+index 90859273..4021e5d4 100644
 --- a/Loop/Loop/Views/SettingsView.swift
 +++ b/Loop/Loop/Views/SettingsView.swift
-@@ -343,25 +343,48 @@ extension SettingsView {
+@@ -343,23 +343,50 @@ 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 {
@@ -158,54 +165,50 @@ index 90859273..e41ebfa2 100644
 -                       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)
 +        let nearExpiration : Bool = ProfileExpirationAlerter.isNearExpiration(expirationDate: expirationDate)
 +        let profileExpirationMsg = ProfileExpirationAlerter.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 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("Profile Expiration", comment: "Settings App Profile expiration view")
++                    Text(expirationLabel)
+                     Spacer()
+-                    Text(profileExpirationMsg).foregroundColor(Color.secondary)
++                    Text(expirationMessage).foregroundColor(Color.secondary)
                  }
              }
--            Button(action: {
+             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"))
-+        } 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"))
-+                }
++                UIApplication.shared.open(URL(string: updateURL)!)
+             }) {
+                 Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
              }
-         }
-     }