Bordered button. And formatting

FreeAPS/Sources/Modules/Home/DurationButton.swift

@@ -30,7 +30,10 @@ struct durationButton<T: DurationButton>: View {
         } label: {
             Text(NSLocalizedString(states[currentIndex].title, comment: "Duration displayed in statPanel")).font(.caption2)
                 .foregroundColor(.secondary)
-                .fontWeight(.bold)
         }
+
+        .buttonBorderShape(.automatic)
+        .controlSize(.mini)
+        .buttonStyle(.bordered)
     }
 }

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -242,15 +242,15 @@ extension Home {
 
                         let hba1c_all = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
-                        let average_ = numberFormatter
+                        let average_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Average.day ?? 0) as NSNumber) ?? ""
-                        let median_ = numberFormatter
+                        let median_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Median.day ?? 0) as NSNumber) ?? ""
-                        let tir_low = numberFormatter
+                        let tir_low = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypos.day ?? 0) as NSNumber) ?? ""
-                        let tir_high = numberFormatter
+                        let tir_high = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypers.day ?? 0) as NSNumber) ?? ""
-                        let tir_ = numberFormatter
+                        let tir_ = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.TIR.day ?? 0) as NSNumber) ?? ""
                         let hba1c_ = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.day ?? 0) as NSNumber) ?? ""
@@ -264,15 +264,15 @@ extension Home {
                     case .week:
                         let hba1c_all = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
-                        let average_ = numberFormatter
+                        let average_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Average.week ?? 0) as NSNumber) ?? ""
-                        let median_ = numberFormatter
+                        let median_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Median.week ?? 0) as NSNumber) ?? ""
-                        let tir_low = numberFormatter
+                        let tir_low = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypos.week ?? 0) as NSNumber) ?? ""
-                        let tir_high = numberFormatter
+                        let tir_high = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypers.week ?? 0) as NSNumber) ?? ""
-                        let tir_ = numberFormatter
+                        let tir_ = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.TIR.week ?? 0) as NSNumber) ?? ""
                         let hba1c_ = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.week ?? 0) as NSNumber) ?? ""
@@ -286,16 +286,16 @@ extension Home {
                     case .month:
                         let hba1c_all = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
-                        let average_ = numberFormatter
+                        let average_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Average.month ?? 0) as NSNumber) ?? ""
-                        let median_ = numberFormatter
+                        let median_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Median.month ?? 0) as NSNumber) ?? ""
-                        let tir_low = numberFormatter
+                        let tir_low = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypos.month ?? 0) as NSNumber) ?? ""
-                        let tir_high = numberFormatter
+                        let tir_high = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypers.month ?? 0) as NSNumber) ??
                             ""
-                        let tir_ = numberFormatter
+                        let tir_ = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.TIR.month ?? 0) as NSNumber) ?? ""
                         let hba1c_ = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.month ?? 0) as NSNumber) ?? ""
@@ -309,23 +309,23 @@ extension Home {
                     case .ninetyDays:
                         let hba1c_all = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
-                        let average_ = numberFormatter
+                        let average_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Average.ninetyDays ?? 0) as NSNumber) ??
                             ""
-                        let median_ = numberFormatter
+                        let median_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Median.ninetyDays ?? 0) as NSNumber) ??
                             ""
-                        let tir_low = numberFormatter
+                        let tir_low = tirFormatter
                             .string(
                                 from: (state.statistics?.Statistics.Distribution.Hypos.ninetyDays ?? 0) as NSNumber
                             ) ??
                             ""
-                        let tir_high = numberFormatter
+                        let tir_high = tirFormatter
                             .string(
                                 from: (state.statistics?.Statistics.Distribution.Hypers.ninetyDays ?? 0) as NSNumber
                             ) ??
                             ""
-                        let tir_ = numberFormatter
+                        let tir_ = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.TIR.ninetyDays ?? 0) as NSNumber) ??
                             ""
                         let hba1c_ = numberFormatter
@@ -340,16 +340,16 @@ extension Home {
                     case .total:
                         let hba1c_all = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
-                        let average_ = numberFormatter
+                        let average_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Average.total ?? 0) as NSNumber) ?? ""
-                        let median_ = numberFormatter
+                        let median_ = targetFormatter
                             .string(from: (state.statistics?.Statistics.Glucose.Median.total ?? 0) as NSNumber) ?? ""
-                        let tir_low = numberFormatter
+                        let tir_low = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypos.total ?? 0) as NSNumber) ?? ""
-                        let tir_high = numberFormatter
+                        let tir_high = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.Hypers.total ?? 0) as NSNumber) ??
                             ""
-                        let tir_ = numberFormatter
+                        let tir_ = tirFormatter
                             .string(from: (state.statistics?.Statistics.Distribution.TIR.total ?? 0) as NSNumber) ?? ""
                         let hba1c_ = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
@@ -361,7 +361,7 @@ extension Home {
                         averageTIRhca1c(hba1c_all, average_, median_, tir_low, tir_high, tir_, hba1c_, sd_, cv_)
                     }
                 }
-                .frame(maxWidth: .infinity, maxHeight: 120, alignment: .center)
+                .frame(maxWidth: .infinity, maxHeight: 130, alignment: .center)
             }
         }