Skip to content

ios26 fixes #2371

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
merged 1 commit into from
Oct 21, 2025
Merged

ios26 fixes #2371

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
49 changes: 26 additions & 23 deletions Loop/Views/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public struct SettingsView: View {
}

case favoriteFoods
case therapySettings
}
}

Expand Down Expand Up @@ -137,24 +136,6 @@ public struct SettingsView: View {
}
.sheet(item: $sheet) { sheet in
switch sheet {
case .therapySettings:
TherapySettingsView(
mode: .settings,
viewModel: TherapySettingsViewModel(
therapySettings: viewModel.therapySettings(),
sensitivityOverridesEnabled: FeatureFlags.sensitivityOverridesEnabled,
adultChildInsulinModelSelectionEnabled: FeatureFlags.adultChildInsulinModelSelectionEnabled,
delegate: viewModel.therapySettingsViewModelDelegate
)
)
.environmentObject(displayGlucosePreference)
.environment(\.dismissAction, self.dismiss)
.environment(\.appName, self.appName)
.environment(\.chartColorPalette, .primary)
.environment(\.carbTintColor, self.carbTintColor)
.environment(\.glucoseTintColor, self.glucoseTintColor)
.environment(\.guidanceColors, self.guidanceColors)
.environment(\.insulinTintColor, self.insulinTintColor)
case .favoriteFoods:
FavoriteFoodsView()
}
Expand Down Expand Up @@ -286,15 +267,37 @@ extension SettingsView {
}
}
}


private var therapySettingsView: some View {
TherapySettingsView(
mode: .settings,
viewModel: TherapySettingsViewModel(
therapySettings: viewModel.therapySettings(),
sensitivityOverridesEnabled: FeatureFlags.sensitivityOverridesEnabled,
adultChildInsulinModelSelectionEnabled: FeatureFlags.adultChildInsulinModelSelectionEnabled,
delegate: viewModel.therapySettingsViewModelDelegate
)
)
.environmentObject(displayGlucosePreference)
.environment(\.dismissAction, self.dismiss)
.environment(\.appName, self.appName)
.environment(\.chartColorPalette, .primary)
.environment(\.carbTintColor, self.carbTintColor)
.environment(\.glucoseTintColor, self.glucoseTintColor)
.environment(\.guidanceColors, self.guidanceColors)
.environment(\.insulinTintColor, self.insulinTintColor)
}

private var configurationSection: some View {
Section(header: SectionHeader(label: NSLocalizedString("Configuration", comment: "The title of the Configuration section in settings"))) {
LargeButton(action: { sheet = .therapySettings },
includeArrow: true,
NavigationLink(destination: therapySettingsView) {
LargeButton(action: { },
includeArrow: false,
imageView: Image("Therapy Icon"),
label: NSLocalizedString("Therapy Settings", comment: "Title text for button to Therapy Settings"),
descriptiveText: NSLocalizedString("Diabetes Treatment", comment: "Descriptive text for Therapy Settings"))

}

ForEach(pluginMenuItems.filter {$0.section == .configuration}) { item in
item.view
}
Expand Down