From 9b61389f269195c56a28b1ddc96eb3d6b0a75e95 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 7 Nov 2024 15:30:55 +0100 Subject: [PATCH] reservoir & concentration --- .../Sources/Modules/Home/View/Header/PumpView.swift | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift b/FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift index b94efc0d77..48218206f8 100644 --- a/FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift +++ b/FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift @@ -101,19 +101,22 @@ struct PumpView: View { Spacer() - if let reservoir = reservoir { + if let insulin = reservoir { + let reservoirThreshold = reservoirFormatter + .string(from: (50 * Decimal(concentration.last?.concentration ?? 1)) as NSNumber) ?? "" HStack { Image(systemName: "drop.fill") .resizable() .aspectRatio(contentMode: .fit) .frame(maxHeight: 12) .foregroundColor(reservoirColor) - if reservoir == 0xDEAD_BEEF { - Text("50+ " + NSLocalizedString("U", comment: "Insulin unit")).font(.callout).fontWeight(.bold) + if insulin == 0xDEAD_BEEF { + Text("\(reservoirThreshold)+ " + NSLocalizedString("U", comment: "Insulin unit")).font(.callout) + .fontWeight(.bold) } else { Text( reservoirFormatter - .string(from: reservoir as NSNumber)! + NSLocalizedString(" U", comment: "Insulin unit") + .string(from: (insulin * Decimal(concentration.last?.concentration ?? 1)) as NSNumber) ?? "" ) .font(.callout).fontWeight(.bold) }