Move eventualBG to the legend panel

FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift

@@ -4,7 +4,6 @@ struct CurrentGlucoseView: View {
     @Binding var recentGlucose: BloodGlucose?
     @Binding var delta: Int?
     @Binding var units: GlucoseUnits
-    @Binding var eventualBG: Int?
 
     private var glucoseFormatter: NumberFormatter {
         let formatter = NumberFormatter()
@@ -43,20 +42,7 @@ struct CurrentGlucoseView: View {
                 )
                 .font(.system(size: 24, weight: .bold))
                 .fixedSize()
-                VStack {
-                    image
-                    if let eventualBG = eventualBG {
-                        if units == .mmolL {
-                            Text(
-                                glucoseFormatter
-                                    .string(from: Decimal(eventualBG).asMmolL as NSNumber)!
-                            )
-                            .font(.system(size: 10, weight: .regular)).foregroundColor(.secondary)
-                        } else {
-                            Text("\(eventualBG)").font(.system(size: 10, weight: .regular)).foregroundColor(.secondary)
-                        }
-                    }
-                }
+                image.padding(.bottom, 2)
 
             }.padding(.leading, 4)
             HStack(alignment: .lastTextBaseline, spacing: 2) {

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

@@ -46,8 +46,7 @@ extension Home {
                 CurrentGlucoseView(
                     recentGlucose: $viewModel.recentGlucose,
                     delta: $viewModel.glucoseDelta,
-                    units: $viewModel.units,
-                    eventualBG: $viewModel.eventualBG
+                    units: $viewModel.units
                 )
                 .onTapGesture {
                     viewModel.openCGM()
@@ -159,7 +158,6 @@ extension Home {
             HStack(alignment: .center) {
                 Group {
                     Circle().fill(Color.loopGreen).frame(width: 8, height: 8)
-                        .padding(.leading, 8)
                     Text("BG")
                         .font(.system(size: 12, weight: .bold)).foregroundColor(.loopGreen)
                 }
@@ -187,6 +185,15 @@ extension Home {
                     Text("UAM")
                         .font(.system(size: 12, weight: .bold)).foregroundColor(.uam)
                 }
+
+                if let eventualBG = viewModel.eventualBG {
+                    Text(
+                        "⇢ " + numberFormatter.string(
+                            from: (viewModel.units == .mmolL ? eventualBG.asMmolL : Decimal(eventualBG)) as NSNumber
+                        )!
+                    )
+                    .font(.system(size: 12, weight: .bold)).foregroundColor(.secondary)
+                }
             }
             .frame(maxWidth: .infinity, maxHeight: 30)
         }