Просмотр исходного кода

Refines Garmin watch settings UI and help text

Shortens display names for primary/secondary attributes, watchfaces, and datafields to improve conciseness in the user interface.

Expands hint text in the Garmin app configuration view to provide detailed explanations for watchface, datafield, and data attribute options, including full names and developer credits, for enhanced user understanding.
Robert 2 месяцев назад
Родитель
Сommit
043f75eaef

+ 13 - 22
Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -68052,9 +68052,6 @@
         }
         }
       }
       }
     },
     },
-    "Choose which data types, along with BG and IOB etc., you want to show on your Garmin device. That data type will be shown both on watchface and datafield." : {
-
-    },
     "Choose which datafield to support. Can be used independently of watchface selection." : {
     "Choose which datafield to support. Can be used independently of watchface selection." : {
 
 
     },
     },
@@ -107923,6 +107920,9 @@
         }
         }
       }
       }
     },
     },
+    "evBG" : {
+
+    },
     "Even if you’re an updating user, you’ll be guided through the algorithm settings configuration step-by-step." : {
     "Even if you’re an updating user, you’ll be guided through the algorithm settings configuration step-by-step." : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {
@@ -108041,10 +108041,6 @@
         }
         }
       }
       }
     },
     },
-    "Eventual BG" : {
-      "comment" : "Description of a secondary data type selection for SwissAlpine watchface only. Determines whether to display Temp Basal Rate or Eventual BG.",
-      "isCommentAutoGenerated" : true
-    },
     "Eventual Glucose" : {
     "Eventual Glucose" : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {
@@ -139415,10 +139411,6 @@
         }
         }
       }
       }
     },
     },
-    "Insulin Sensitivity Factor" : {
-      "comment" : "Description of a Garmin data type when it is Insulin Sensitivity Factor.",
-      "isCommentAutoGenerated" : true
-    },
     "Insulin Suspended" : {
     "Insulin Suspended" : {
       "extractionState" : "manual",
       "extractionState" : "manual",
       "localizations" : {
       "localizations" : {
@@ -207171,6 +207163,10 @@
         }
         }
       }
       }
     },
     },
+    "Sens Ratio" : {
+      "comment" : "Name of the secondary attribute choice for the SwissAlpine watchface.",
+      "isCommentAutoGenerated" : true
+    },
     "Sensitivity" : {
     "Sensitivity" : {
       "extractionState" : "manual",
       "extractionState" : "manual",
       "localizations" : {
       "localizations" : {
@@ -227452,6 +227448,10 @@
         }
         }
       }
       }
     },
     },
+    "Swissalpine" : {
+      "comment" : "Name of the Swissalpine watchface.",
+      "isCommentAutoGenerated" : true
+    },
     "System Default" : {
     "System Default" : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {
@@ -230198,9 +230198,8 @@
         }
         }
       }
       }
     },
     },
-    "TBR (Temp Basal Rate)" : {
-      "comment" : "Description of a secondary data type selection for SwissAlpine watchface only. Determines whether to display Temp Basal Rate or Eventual BG.",
-      "isCommentAutoGenerated" : true
+    "TBR" : {
+
     },
     },
     "TDD" : {
     "TDD" : {
       "localizations" : {
       "localizations" : {
@@ -256110,10 +256109,6 @@
         }
         }
       }
       }
     },
     },
-    "Trio original" : {
-      "comment" : "Name of a Garmin watchface option.",
-      "isCommentAutoGenerated" : true
-    },
     "Trio Personalization" : {
     "Trio Personalization" : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {
@@ -256704,10 +256699,6 @@
         }
         }
       }
       }
     },
     },
-    "Trio Swissalpine" : {
-      "comment" : "Name for the watchface that combines the features of the original Trio watchface and the Swissalpine watchface.",
-      "isCommentAutoGenerated" : true
-    },
     "Trio Up-Time" : {
     "Trio Up-Time" : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {

+ 8 - 8
Trio/Sources/Models/GarminWatchSettings.swift

@@ -17,9 +17,9 @@ enum GarminPrimaryAttributeChoice: String, JSON, CaseIterable, Identifiable, Cod
         case .cob:
         case .cob:
             return String(localized: "COB", comment: "")
             return String(localized: "COB", comment: "")
         case .isf:
         case .isf:
-            return String(localized: "Insulin Sensitivity Factor", comment: "")
+            return String(localized: "ISF", comment: "")
         case .sensRatio:
         case .sensRatio:
-            return String(localized: "Sensitivity Ratio", comment: "")
+            return String(localized: "Sens Ratio", comment: "")
         }
         }
     }
     }
 }
 }
@@ -35,9 +35,9 @@ enum GarminSecondaryAttributeChoice: String, JSON, CaseIterable, Identifiable, C
     var displayName: String {
     var displayName: String {
         switch self {
         switch self {
         case .tbr:
         case .tbr:
-            return String(localized: "TBR (Temp Basal Rate)", comment: "")
+            return String(localized: "TBR", comment: "")
         case .eventualBG:
         case .eventualBG:
-            return String(localized: "Eventual BG", comment: "")
+            return String(localized: "evBG", comment: "")
         }
         }
     }
     }
 }
 }
@@ -54,9 +54,9 @@ enum GarminWatchface: String, JSON, CaseIterable, Identifiable, Codable, Hashabl
     var displayName: String {
     var displayName: String {
         switch self {
         switch self {
         case .trio:
         case .trio:
-            return String(localized: "Trio original", comment: "")
+            return String(localized: "Trio", comment: "")
         case .swissalpine:
         case .swissalpine:
-            return String(localized: "Trio Swissalpine", comment: "")
+            return String(localized: "Swissalpine", comment: "")
         }
         }
     }
     }
 
 
@@ -87,9 +87,9 @@ enum GarminDatafield: String, JSON, CaseIterable, Identifiable, Codable, Hashabl
     var displayName: String {
     var displayName: String {
         switch self {
         switch self {
         case .trio:
         case .trio:
-            return String(localized: "Trio original", comment: "")
+            return String(localized: "Trio", comment: "")
         case .swissalpine:
         case .swissalpine:
-            return String(localized: "Trio Swissalpine", comment: "")
+            return String(localized: "Swissalpine", comment: "")
         case .none:
         case .none:
             return String(localized: "None", comment: "")
             return String(localized: "None", comment: "")
         }
         }

+ 12 - 1
Trio/Sources/Modules/WatchConfig/View/WatchConfigGarminAppConfigView.swift

@@ -197,6 +197,8 @@ struct WatchConfigGarminAppConfigView: View {
                 hintLabel: "Choose Garmin Watchface",
                 hintLabel: "Choose Garmin Watchface",
                 hintText: Text(
                 hintText: Text(
                     "Choose which watchface on your Garmin device you wish to provide data for. You can independently select which datafield to use in the next section.\n\n" +
                     "Choose which watchface on your Garmin device you wish to provide data for. You can independently select which datafield to use in the next section.\n\n" +
+                        "• Trio – The original Trio watchface, developed by Ivan Valkou.\n" +
+                        "• Swissalpine – Originally developed for AAPS, adapted to work with Trio.\n\n" +
                         "You must use this configuration setting here BEFORE you switch the watchface on your Garmin device to another watchface.\n\n" +
                         "You must use this configuration setting here BEFORE you switch the watchface on your Garmin device to another watchface.\n\n" +
                         "⚠️ Changing the watchface will automatically disable data transmission and lock that setting for 20 seconds to allow time for you to switch the watchface on your Garmin device."
                         "⚠️ Changing the watchface will automatically disable data transmission and lock that setting for 20 seconds to allow time for you to switch the watchface on your Garmin device."
                 ),
                 ),
@@ -210,6 +212,8 @@ struct WatchConfigGarminAppConfigView: View {
                 hintLabel: "Choose Garmin Datafield",
                 hintLabel: "Choose Garmin Datafield",
                 hintText: Text(
                 hintText: Text(
                     "Choose which datafield on your Garmin device you wish to provide data for. The datafield can be used independently from the watchface selection.\n\n" +
                     "Choose which datafield on your Garmin device you wish to provide data for. The datafield can be used independently from the watchface selection.\n\n" +
+                        "• Trio – The original Trio datafield, developed by Pierre.\n" +
+                        "• Swissalpine – Originally developed for AAPS, adapted to work with Trio.\n\n" +
                         "Select 'None' if you don't want to use a datafield, or want to preserve battery while not exercising."
                         "Select 'None' if you don't want to use a datafield, or want to preserve battery while not exercising."
                 ),
                 ),
                 sheetTitle: String(localized: "Help", comment: "Help sheet title")
                 sheetTitle: String(localized: "Help", comment: "Help sheet title")
@@ -233,7 +237,14 @@ struct WatchConfigGarminAppConfigView: View {
                 shouldDisplayHint: $shouldDisplayHint3,
                 shouldDisplayHint: $shouldDisplayHint3,
                 hintLabel: "Choose data support",
                 hintLabel: "Choose data support",
                 hintText: Text(
                 hintText: Text(
-                    "Choose which data types, along with BG and IOB etc., you want to show on your Garmin device. That data type will be shown both on watchface and datafield."
+                    "Choose which data types, along with BG and IOB etc., you want to show on your Garmin device. That data type will be shown both on watchface and datafield.\n\n" +
+                        "Data Choice 1 options:\n" +
+                        "• COB – Carbs On Board\n" +
+                        "• ISF – Insulin Sensitivity Factor\n" +
+                        "• Sens Ratio – Sensitivity Ratio\n\n" +
+                        "Data Choice 2 options:\n" +
+                        "• TBR – Temp Basal Rate\n" +
+                        "• evBG – Eventual (predicted future) Blood Glucose"
                 ),
                 ),
                 sheetTitle: String(localized: "Help", comment: "Help sheet title")
                 sheetTitle: String(localized: "Help", comment: "Help sheet title")
             )
             )