Skip to content

Fix Xcode 26 layout issue in bolus and carb entry views #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gestrich wants to merge 1 commit into
base: dev
Choose a base branch
from
+47 −39
Open

Fix Xcode 26 layout issue in bolus and carb entry views #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions LoopCaregiver/LoopCaregiver/Views/Actions/BolusInputView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,29 +85,33 @@ struct BolusInputView: View {
Form {
if let recommendedBolus = remoteDataSource.recommendedBolus {
LabeledContent {
Text(LocalizationUtils.presentableStringFromBolusAmount(recommendedBolus))
Text("U")
.frame(width: unitFrameWidth)
HStack {
Text(LocalizationUtils.presentableStringFromBolusAmount(recommendedBolus))
Text("U")
.frame(width: unitFrameWidth)
}
} label: {
Text("Recommended Bolus")
}
}
LabeledContent {
TextField(
"0",
text: $bolusAmount
)
.multilineTextAlignment(.trailing)
.keyboardType(.decimalPad)
.focused($bolusInputViewIsFocused)
.onAppear(perform: {
bolusInputViewIsFocused = true
if let recommendedBolus = remoteDataSource.recommendedBolus {
bolusAmount = LocalizationUtils.presentableStringFromBolusAmount(recommendedBolus)
}
})
Text("U")
.frame(width: unitFrameWidth)
HStack {
TextField(
"0",
text: $bolusAmount
)
.multilineTextAlignment(.trailing)
.keyboardType(.decimalPad)
.focused($bolusInputViewIsFocused)
.onAppear(perform: {
bolusInputViewIsFocused = true
if let recommendedBolus = remoteDataSource.recommendedBolus {
bolusAmount = LocalizationUtils.presentableStringFromBolusAmount(recommendedBolus)
}
})
Text("U")
.frame(width: unitFrameWidth)
}
} label: {
Text("Bolus")
}
Expand Down
46 changes: 25 additions & 21 deletions LoopCaregiver/LoopCaregiver/Views/Actions/CarbInputView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,20 @@ struct CarbInputView: View {
var carbEntryForm: some View {
Form {
LabeledContent {
TextField(
"0",
text: $carbInput
)
.multilineTextAlignment(.trailing)
.keyboardType(.decimalPad)
.focused($carbInputViewIsFocused)
.onAppear(perform: {
carbInputViewIsFocused = true
})
Text("g")
.frame(width: unitFrameWidth)
HStack {
TextField(
"0",
text: $carbInput
)
.multilineTextAlignment(.trailing)
.keyboardType(.decimalPad)
.focused($carbInputViewIsFocused)
.onAppear(perform: {
carbInputViewIsFocused = true
})
Text("g")
.frame(width: unitFrameWidth)
}
} label: {
Text("Amount Consumed")
}
Expand Down Expand Up @@ -210,15 +212,17 @@ struct CarbInputView: View {
}

LabeledContent {
TextField(
"",
text: $absorption
)
.multilineTextAlignment(.trailing)
.keyboardType(.decimalPad)
.focused($absorptionInputFieldIsFocused)
Text("hr")
.frame(width: unitFrameWidth)
HStack {
TextField(
"",
text: $absorption
)
.multilineTextAlignment(.trailing)
.keyboardType(.decimalPad)
.focused($absorptionInputFieldIsFocused)
Text("hr")
.frame(width: unitFrameWidth)
}
} label: {
Text("Absorption Time")
}
Expand Down