Skip to content

Pin Send button to prevent keyboard toolbar overlap #604

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
bjorkert wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Pin Send button to prevent keyboard toolbar overlap #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
535e087
Pin Send button below Form to prevent keyboard toolbar overlap
bjorkert Apr 12, 2026
ffef6e8
Remove scrollDismissesKeyboard — keyboard has its own dismiss button
bjorkert Apr 12, 2026
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
37 changes: 21 additions & 16 deletions LoopFollow/Remote/LoopAPNS/LoopAPNSBolusView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,6 @@ struct LoopAPNSBolusView: View {
}
}

Section {
Button(action: sendInsulin) {
if isLoading {
HStack {
ProgressView()
.scaleEffect(0.8)
Text("Sending...")
}
} else {
Text("Send Insulin")
}
}
.disabled(insulinAmount.doubleValue(for: .internationalUnit()) <= 0 || isLoading || isTOTPBlocked)
.frame(maxWidth: .infinity)
}

// TOTP Blocking Warning Section
if isTOTPBlocked && showTOTPWarning {
Section {
Expand Down Expand Up @@ -168,6 +152,27 @@ struct LoopAPNSBolusView: View {
}
}
}
.safeAreaInset(edge: .bottom) {
Button(action: sendInsulin) {
if isLoading {
HStack {
ProgressView()
.scaleEffect(0.8)
Text("Sending...")
}
.frame(maxWidth: .infinity)
} else {
Text("Send Insulin")
.frame(maxWidth: .infinity)
}
}
.buttonStyle(.borderedProminent)
.controlSize(.large)
.disabled(insulinAmount.doubleValue(for: .internationalUnit()) <= 0 || isLoading || isTOTPBlocked)
.padding(.horizontal)
.padding(.vertical, 8)
.background(.bar)
}
.navigationTitle("Insulin")
.navigationBarTitleDisplayMode(.inline)
}
Expand Down
37 changes: 21 additions & 16 deletions LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,22 +232,6 @@ struct LoopAPNSCarbsView: View {
.buttonStyle(.plain)
}
}
Section {
Button(action: sendCarbs) {
if isLoading {
HStack {
ProgressView()
.scaleEffect(0.8)
Text("Sending...")
}
} else {
Text("Send Carbs")
}
}
.disabled(carbsAmount.doubleValue(for: .gram()) <= 0 || isLoading || isTOTPBlocked)
.frame(maxWidth: .infinity)
}

// TOTP Blocking Warning Section
if isTOTPBlocked && showTOTPWarning {
Section {
Expand Down Expand Up @@ -292,6 +276,27 @@ struct LoopAPNSCarbsView: View {
}
}
}
.safeAreaInset(edge: .bottom) {
Button(action: sendCarbs) {
if isLoading {
HStack {
ProgressView()
.scaleEffect(0.8)
Text("Sending...")
}
.frame(maxWidth: .infinity)
} else {
Text("Send Carbs")
.frame(maxWidth: .infinity)
}
}
.buttonStyle(.borderedProminent)
.controlSize(.large)
.disabled(carbsAmount.doubleValue(for: .gram()) <= 0 || isLoading || isTOTPBlocked)
.padding(.horizontal)
.padding(.vertical, 8)
.background(.bar)
}
.navigationTitle("Carbs")
.navigationBarTitleDisplayMode(.inline)
}
Expand Down
51 changes: 32 additions & 19 deletions LoopFollow/Remote/TRC/BolusView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,39 @@ struct BolusView: View {
}
)
}

LoadingButtonView(
buttonText: "Send Bolus",
progressText: "Sending Bolus...",
isLoading: isLoading,
action: {
bolusFieldIsFocused = false
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
let rawValue = self.bolusAmount.doubleValue(for: .internationalUnit())
let steppedAmount = roundedToStep(rawValue)

if steppedAmount > 0 {
bolusAmount = HKQuantity(unit: .internationalUnit(), doubleValue: steppedAmount)
alertType = .confirmBolus
showAlert = true
}
}
.safeAreaInset(edge: .bottom) {
Button {
bolusFieldIsFocused = false
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
let rawValue = self.bolusAmount.doubleValue(for: .internationalUnit())
let steppedAmount = roundedToStep(rawValue)

if steppedAmount > 0 {
bolusAmount = HKQuantity(unit: .internationalUnit(), doubleValue: steppedAmount)
alertType = .confirmBolus
showAlert = true
}
},
isDisabled: isLoading
)
}
} label: {
if isLoading {
HStack {
ProgressView()
.scaleEffect(0.8)
Text("Sending Bolus...")
}
.frame(maxWidth: .infinity)
} else {
Text("Send Bolus")
.frame(maxWidth: .infinity)
}
}
.buttonStyle(.borderedProminent)
.controlSize(.large)
.disabled(isLoading)
.padding(.horizontal)
.padding(.vertical, 8)
.background(.bar)
}
.navigationTitle("Bolus")
.navigationBarTitleDisplayMode(.inline)
Expand Down
59 changes: 36 additions & 23 deletions LoopFollow/Remote/TRC/MealView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,31 +140,44 @@ struct MealView: View {
}
}
}
}
.safeAreaInset(edge: .bottom) {
Button {
carbsFieldIsFocused = false
proteinFieldIsFocused = false
fatFieldIsFocused = false

LoadingButtonView(
buttonText: "Send Meal",
progressText: "Sending Meal Data...",
isLoading: isLoading,
action: {
carbsFieldIsFocused = false
proteinFieldIsFocused = false
fatFieldIsFocused = false

DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
guard carbs.doubleValue(for: .gram()) != 0 ||
protein.doubleValue(for: .gram()) != 0 ||
fat.doubleValue(for: .gram()) != 0
else {
return
}
if !showAlert {
alertType = .confirmMeal
showAlert = true
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
guard carbs.doubleValue(for: .gram()) != 0 ||
protein.doubleValue(for: .gram()) != 0 ||
fat.doubleValue(for: .gram()) != 0
else {
return
}
},
isDisabled: isButtonDisabled
)
if !showAlert {
alertType = .confirmMeal
showAlert = true
}
}
} label: {
if isLoading {
HStack {
ProgressView()
.scaleEffect(0.8)
Text("Sending Meal Data...")
}
.frame(maxWidth: .infinity)
} else {
Text("Send Meal")
.frame(maxWidth: .infinity)
}
}
.buttonStyle(.borderedProminent)
.controlSize(.large)
.disabled(isButtonDisabled)
.padding(.horizontal)
.padding(.vertical, 8)
.background(.bar)
}
.navigationTitle("Meal")
.navigationBarTitleDisplayMode(.inline)
Expand Down