Revert the revert of #813 and apply Xcode 16.4

 fix-its after merging upstream

Trio/Resources/InfoPlist.xcstrings

@@ -457,18 +457,6 @@
         }
       }
     },
-    "NSCalendarsFullAccessUsageDescription" : {
-      "comment" : "Privacy - Calendars Full Access Usage Description",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "To create events with BG reading values, so that they can be viewed on Apple Watch and CarPlay"
-          }
-        }
-      }
-    },
     "NSCalendarsUsageDescription" : {
       "comment" : "Privacy - Calendars Usage Description",
       "extractionState" : "extracted_with_value",

Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -1711,6 +1711,7 @@
       }
     },
     " %@/U" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -3754,6 +3755,7 @@
     },
     " U/day" : {
       "comment" : "Total AT / Scheduled basal insulin",
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -8952,6 +8954,7 @@
     },
     "%@ U/hr" : {
       "comment" : "Number of units per hour",
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -11456,6 +11459,16 @@
         }
       }
     },
+    "• An ISF of %@ means 1 U lowers your glucose by %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "• An ISF of %1$@ means 1 U lowers your glucose by %2$@"
+          }
+        }
+      }
+    },
     "• Basal Rate" : {
       "localizations" : {
         "bg" : {
@@ -22474,6 +22487,16 @@
         }
       }
     },
+    "45 %@ / %@ = %@ %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "45 %1$@ / %2$@ = %3$@ %4$@"
+          }
+        }
+      }
+    },
     "50% is half effect:" : {
       "localizations" : {
         "bg" : {
@@ -26284,6 +26307,7 @@
       }
     },
     "Add an entry by tapping 'Add Rate +' in the top right-hand corner of the screen." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -26402,6 +26426,7 @@
       }
     },
     "Add an entry by tapping 'Add Ratio +' in the top right-hand corner of the screen." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -26520,6 +26545,7 @@
       }
     },
     "Add an entry by tapping 'Add Sensitivity +' in the top right-hand corner of the screen." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -26638,6 +26664,7 @@
       }
     },
     "Add an entry by tapping 'Add Target +' in the top right-hand corner of the screen." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -30123,6 +30150,7 @@
       }
     },
     "Add Rate" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -30241,6 +30269,7 @@
       }
     },
     "Add Ratio" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -30359,6 +30388,7 @@
       }
     },
     "Add Sensitivity" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -30603,6 +30633,7 @@
       }
     },
     "Add Target" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -51589,6 +51620,7 @@
       }
     },
     "Basal profile covers 24 hours. You cannot add more rates. Please remove or adjust existing rates to make space." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -60840,6 +60872,7 @@
       }
     },
     "Carb Ratios cover 24 hours. You cannot add more rates. Please remove or adjust existing rates to make space." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -135289,6 +135322,7 @@
       }
     },
     "Insulin Sensitivities cover 24 hours. You cannot add more rates. Please remove or adjust existing rates to make space." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -198754,6 +198788,7 @@
       }
     },
     "Schedule" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -204911,6 +204946,7 @@
       }
     },
     "Set Rate" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -205029,6 +205065,7 @@
       }
     },
     "Set Ratio" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -205147,6 +205184,7 @@
       }
     },
     "Set Target" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -220935,6 +220973,7 @@
       }
     },
     "Swipe left to delete a single entry. Tap on it, to edit its time or rate." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -221407,6 +221446,7 @@
       }
     },
     "Swipe to delete a single entry. Tap on it, to edit its time or rate." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -223066,6 +223106,7 @@
       }
     },
     "Target " : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -223545,6 +223586,7 @@
       }
     },
     "Target Glucose covered for 24 hours. You cannot add more rates. Please remove or adjust existing rates to make space." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {

Trio/Sources/Modules/CarbRatioEditor/View/CarbRatioEditorRootView.swift

@@ -135,7 +135,7 @@ extension CarbRatioEditor {
                                             .padding(.horizontal)
 
                                         VStack(alignment: .leading, spacing: 8) {
-                                            Text("For 45g of carbs, you would need:")
+                                            Text("For 45 g of carbs, you would need:")
                                                 .font(.subheadline)
                                                 .padding(.horizontal)
 
@@ -162,7 +162,7 @@ extension CarbRatioEditor {
                                             .padding(.horizontal)
 
                                         VStack(alignment: .leading, spacing: 4) {
-                                            Text("• A ratio of 10 g/U means 1 unit of insulin covers 10g of carbs")
+                                            Text("• A ratio of 10 g/U means 1 unit of insulin covers 10 g of carbs")
                                             Text("• A lower number means you need more insulin for the same amount of carbs")
                                             Text("• A higher number means you need less insulin for the same amount of carbs")
                                             Text("• Different times of day may require different ratios")

Trio/Sources/Modules/ISFEditor/View/ISFEditorRootView.swift

@@ -171,13 +171,12 @@ extension ISFEditor {
                                             .padding(.horizontal)
 
                                         VStack(alignment: .leading, spacing: 4) {
-                                            let isfValue =
-                                                "\(state.units == .mgdL ? Decimal(50) : 50.asMmolL)\(state.units.rawValue)"
+                                            let isfValue = "\(state.units == .mgdL ? Decimal(50) : 50.asMmolL)"
                                             Text(
-                                                "• An ISF of \(isfValue) means 1 U lowers your glucose by \(isfValue)"
+                                                "• An ISF of \(isfValue) \(state.units.rawValue)/U means 1 U lowers your glucose by \(isfValue) \(state.units.rawValue)"
                                             )
-                                            Text("• A lower number means you're more sensitive to insulin")
-                                            Text("• A higher number means you're less sensitive to insulin")
+                                            Text("• A lower number means you're less sensitive (more resistant) to insulin")
+                                            Text("• A higher number means you're more sensitive (less resistant) to insulin")
                                         }
                                         .font(.caption)
                                         .foregroundColor(.secondary)

Trio/Sources/Modules/Onboarding/View/OnboardingSteps/TherapySettings/CarbRatioStepView.swift

@@ -76,7 +76,7 @@ struct CarbRatioStepView: View {
                                 .padding(.horizontal)
 
                             VStack(alignment: .leading, spacing: 8) {
-                                Text("For 45g of carbs, you would need:")
+                                Text("For 45 g of carbs, you would need:")
                                     .font(.subheadline)
                                     .padding(.horizontal)
 
@@ -107,7 +107,7 @@ struct CarbRatioStepView: View {
                                 .padding(.horizontal)
 
                             VStack(alignment: .leading, spacing: 4) {
-                                Text("• A ratio of 10 g/U means 1 unit of insulin covers 10g of carbs")
+                                Text("• A ratio of 10 g/U means 1 unit of insulin covers 10 g of carbs")
                                 Text("• A lower number means you need more insulin for the same amount of carbs")
                                 Text("• A higher number means you need less insulin for the same amount of carbs")
                                 Text("• Different times of day may require different ratios")

Trio/Sources/Modules/Onboarding/View/OnboardingSteps/TherapySettings/InsulinSensitivityStepView.swift

@@ -118,8 +118,8 @@ struct InsulinSensitivityStepView: View {
                                 Text(
                                     "• An ISF of \(isfValue) means 1 U lowers your glucose by \(isfValue)"
                                 )
-                                Text("• A lower number means you're more sensitive to insulin")
-                                Text("• A higher number means you're less sensitive to insulin")
+                                Text("• A lower number means you're less sensitive (more resistant) to insulin")
+                                Text("• A higher number means you're more sensitive (less resistant) to insulin")
                             }
                             .font(.caption)
                             .foregroundColor(.secondary)