|
@@ -732,7 +732,10 @@ extension Home {
|
|
|
|
|
|
|
|
}.padding(.horizontal, 10).padding(.bottom, UIDevice.adjustPadding(min: nil, max: 10))
|
|
}.padding(.horizontal, 10).padding(.bottom, UIDevice.adjustPadding(min: nil, max: 10))
|
|
|
.overlay(alignment: .bottom) {
|
|
.overlay(alignment: .bottom) {
|
|
|
- bolusProgressBar(progress).padding(.horizontal, 18).offset(y: 48)
|
|
|
|
|
|
|
+ // Use a geo-based offset here to position progress bar independent of device size
|
|
|
|
|
+ let offset = geo.size.height * 0.0725
|
|
|
|
|
+ bolusProgressBar(progress).padding(.horizontal, 18)
|
|
|
|
|
+ .offset(y: offset)
|
|
|
}.clipShape(RoundedRectangle(cornerRadius: 15))
|
|
}.clipShape(RoundedRectangle(cornerRadius: 15))
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1026,7 +1029,7 @@ extension Home {
|
|
|
.font(.system(size: 40))
|
|
.font(.system(size: 40))
|
|
|
.foregroundStyle(Color.tabBar)
|
|
.foregroundStyle(Color.tabBar)
|
|
|
.padding(.bottom, 1)
|
|
.padding(.bottom, 1)
|
|
|
- .padding(.horizontal, 20)
|
|
|
|
|
|
|
+ .padding(.horizontal, 22.5)
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
|
}.ignoresSafeArea(.keyboard, edges: .bottom).blur(radius: state.waitForSuggestion ? 8 : 0)
|
|
}.ignoresSafeArea(.keyboard, edges: .bottom).blur(radius: state.waitForSuggestion ? 8 : 0)
|
|
@@ -1046,7 +1049,7 @@ extension Home {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //TODO: Consolidate all mmol parsing methods (in TagCloudView, NightscoutManager and HomeRootView) to one central func
|
|
|
|
|
|
|
+ // TODO: Consolidate all mmol parsing methods (in TagCloudView, NightscoutManager and HomeRootView) to one central func
|
|
|
private func parseReasonConclusion(_ reasonConclusion: String, isMmolL _: Bool) -> String {
|
|
private func parseReasonConclusion(_ reasonConclusion: String, isMmolL _: Bool) -> String {
|
|
|
let patterns = [
|
|
let patterns = [
|
|
|
"minGuardBG\\s*-?\\d+\\.?\\d*<-?\\d+\\.?\\d*",
|
|
"minGuardBG\\s*-?\\d+\\.?\\d*<-?\\d+\\.?\\d*",
|