Skip to content

LOOP-5581 Make entire insulin selection row tappable #724

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

Merged
ps2 merged 2 commits into from
Jan 28, 2026
Merged

LOOP-5581 Make entire insulin selection row tappable #724

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
efe3c67
Support an optional leading view, mainly to support insulin selection…
ps2 Jan 27, 2026
463fb9f
Merge branch 'dev' into ps2/LOOP-5581/tap-entire-row
ps2 Jan 27, 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
32 changes: 30 additions & 2 deletions LoopKitUI/Views/CheckmarkListItem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,44 @@

import SwiftUI

public struct CheckmarkListItem: View {
public struct CheckmarkListItem<LeadingView: View>: View {

var title: Text
var titleFont: Font
var description: Text
@Binding var isSelected: Bool
let isEnabled: Bool
let leadingView: LeadingView?

public init(title: Text, titleFont: Font = .headline, description: Text, isSelected: Binding<Bool>, isEnabled: Bool = true) {
public init(
title: Text,
titleFont: Font = .headline,
description: Text,
isSelected: Binding<Bool>,
isEnabled: Bool = true,
@ViewBuilder leadingView: () -> LeadingView
) {
self.title = title
self.titleFont = titleFont
self.description = description
self._isSelected = isSelected
self.isEnabled = isEnabled
self.leadingView = leadingView()
}

public init(
title: Text,
titleFont: Font = .headline,
description: Text,
isSelected: Binding<Bool>,
isEnabled: Bool = true
) where LeadingView == EmptyView {
self.title = title
self.titleFont = titleFont
self.description = description
self._isSelected = isSelected
self.isEnabled = isEnabled
self.leadingView = nil
}

@ViewBuilder
Expand All @@ -37,6 +61,10 @@ public struct CheckmarkListItem: View {

private var content: some View {
HStack(spacing: 0) {
if let leadingView = leadingView {
leadingView
}

VStack(alignment: .leading, spacing: 4) {
title
.font(titleFont)
Expand Down
53 changes: 25 additions & 28 deletions LoopKitUI/Views/InsulinTypeChooser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,20 @@ public struct InsulinTypeChooser: View {
public var body: some View {
ForEach(supportedInsulinTypes, id: \.self) { insulinType in
if let insulinType = insulinType {
HStack {
CheckmarkListItem(
title: Text(insulinType.title),
description: Text(insulinType.description),
isSelected: Binding(
get: { self.insulinType == insulinType },
set: { isSelected in
if isSelected {
withAnimation {
self.insulinType = insulinType
}
}
}
)
) {
ZStack {
Image(frameworkImage: "vial_color")
.renderingMode(.template)
Expand All @@ -41,38 +54,22 @@ public struct InsulinTypeChooser: View {
}
.padding([.trailing])
.frame(height: 70)
CheckmarkListItem(
title: Text(insulinType.title),
description: Text(insulinType.description),
isSelected: Binding(
get: { self.insulinType == insulinType },
set: { isSelected in
if isSelected {
withAnimation {
self.insulinType = insulinType
}
}
}
)
)
}
} else {
HStack {
CheckmarkListItem(
title: Text(LocalizedString("Unset", comment: "Title for selection when no insulin type is selected.")),
description: Text(LocalizedString("The currently selected fast acting insulin model will be used as a default.", comment: "Description for selection when no insulin type is selected.")),
isSelected: Binding(
get: { self.insulinType == nil },
set: { isSelected in
if isSelected {
withAnimation {
self.insulinType = nil
}
CheckmarkListItem(
title: Text(LocalizedString("Unset", comment: "Title for selection when no insulin type is selected.")),
description: Text(LocalizedString("The currently selected fast acting insulin model will be used as a default.", comment: "Description for selection when no insulin type is selected.")),
isSelected: Binding(
get: { self.insulinType == nil },
set: { isSelected in
if isSelected {
withAnimation {
self.insulinType = nil
}
}
)
}
)
}
)
}
}
}
Expand Down