Skip to content

Make Second Tab Configurable #420

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
bjorkert merged 2 commits into from
Jul 5, 2025
Merged

Make Second Tab Configurable #420

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
acd3063
Make Second Tab Configurable
bjorkert Jul 3, 2025
ab3b3ea
Lint fix
bjorkert Jul 5, 2025
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
8 changes: 8 additions & 0 deletions LoopFollow.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
DD0C0C6D2C48606200DBADDF /* CarbMetric.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0C0C6C2C48606200DBADDF /* CarbMetric.swift */; };
DD0C0C702C4AFFE800DBADDF /* RemoteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0C0C6F2C4AFFE800DBADDF /* RemoteViewController.swift */; };
DD0C0C722C4B000800DBADDF /* TrioNightscoutRemoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0C0C712C4B000800DBADDF /* TrioNightscoutRemoteView.swift */; };
DD12D4852E1705D9004E0112 /* AlarmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD12D4842E1705D9004E0112 /* AlarmViewController.swift */; };
DD12D4872E1705E6004E0112 /* AlarmsContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD12D4862E1705E6004E0112 /* AlarmsContainerView.swift */; };
DD13BC752C3FD6210062313B /* InfoType.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD13BC742C3FD6200062313B /* InfoType.swift */; };
DD13BC772C3FD64E0062313B /* InfoData.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD13BC762C3FD64E0062313B /* InfoData.swift */; };
DD13BC792C3FE63A0062313B /* InfoManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD13BC782C3FE63A0062313B /* InfoManager.swift */; };
Expand Down Expand Up @@ -403,6 +405,8 @@
DD0C0C6C2C48606200DBADDF /* CarbMetric.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarbMetric.swift; sourceTree = "<group>"; };
DD0C0C6F2C4AFFE800DBADDF /* RemoteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteViewController.swift; sourceTree = "<group>"; };
DD0C0C712C4B000800DBADDF /* TrioNightscoutRemoteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrioNightscoutRemoteView.swift; sourceTree = "<group>"; };
DD12D4842E1705D9004E0112 /* AlarmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmViewController.swift; sourceTree = "<group>"; };
DD12D4862E1705E6004E0112 /* AlarmsContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmsContainerView.swift; sourceTree = "<group>"; };
DD13BC742C3FD6200062313B /* InfoType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoType.swift; sourceTree = "<group>"; };
DD13BC762C3FD64E0062313B /* InfoData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoData.swift; sourceTree = "<group>"; };
DD13BC782C3FE63A0062313B /* InfoManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1113,6 +1117,7 @@
DDCF9A7E2D85FCE6004DF4DD /* Alarm */ = {
isa = PBXGroup;
children = (
DD12D4862E1705E6004E0112 /* AlarmsContainerView.swift */,
DDDC31CA2E13A7D2009EA0F3 /* AddAlarm */,
DDCC3A502DDC5BD4006F1C10 /* DataStructs */,
DDC6CA3B2DD7B9050060EE25 /* AlarmType */,
Expand Down Expand Up @@ -1481,6 +1486,7 @@
FCC68871248A736700A0279D /* ViewControllers */ = {
isa = PBXGroup;
children = (
DD12D4842E1705D9004E0112 /* AlarmViewController.swift */,
FC97881B2485969B00A7906C /* MainViewController.swift */,
FC97881D2485969B00A7906C /* NightScoutViewController.swift */,
FCFEECA1248857A600402A7F /* SettingsViewController.swift */,
Expand Down Expand Up @@ -1852,6 +1858,7 @@
DD7F4C072DD5042F00D449E9 /* OverrideStartAlarmEditor.swift in Sources */,
DDCC3A4B2DDBB5E4006F1C10 /* BatteryCondition.swift in Sources */,
DDDF6F492D479AF000884336 /* NoRemoteView.swift in Sources */,
DD12D4872E1705E6004E0112 /* AlarmsContainerView.swift in Sources */,
DD83164A2DE4C504004467AA /* SettingsStepperRow.swift in Sources */,
DD0650ED2DCE9371004D3B41 /* HighBgAlarmEditor.swift in Sources */,
DD7F4C172DD63FA700D449E9 /* RecBolusCondition.swift in Sources */,
Expand Down Expand Up @@ -1978,6 +1985,7 @@
DD4AFB3B2DB55CB600BB593F /* TimeOfDay.swift in Sources */,
DDEF503C2D31BE2D00999A5D /* TaskScheduler.swift in Sources */,
DD0650EB2DCE8385004D3B41 /* LowBGCondition.swift in Sources */,
DD12D4852E1705D9004E0112 /* AlarmViewController.swift in Sources */,
DD0C0C6B2C48562000DBADDF /* InsulinMetric.swift in Sources */,
DD493AD92ACF2171009A6922 /* Carbs.swift in Sources */,
DD493AE92ACF2445009A6922 /* BGData.swift in Sources */,
Expand Down
23 changes: 23 additions & 0 deletions LoopFollow/Alarm/AlarmsContainerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// LoopFollow
// AlarmsContainerView.swift
// Created by Jonas Björkert.

import SwiftUI

struct AlarmsContainerView: View {
var body: some View {
NavigationStack {
AlarmListView()
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
NavigationLink {
AlarmSettingsView()
} label: {
Image(systemName: "gearshape")
}
}
}
}
.preferredColorScheme(Storage.shared.forceDarkMode.value ? .dark : nil)
}
}
29 changes: 29 additions & 0 deletions LoopFollow/ViewControllers/AlarmViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// LoopFollow
// AlarmViewController.swift
// Created by Jonas Björkert.

import SwiftUI
import UIKit

class AlarmViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()

let alarmsView = AlarmsContainerView()

let hostingController = UIHostingController(rootView: alarmsView)

addChild(hostingController)
view.addSubview(hostingController.view)

hostingController.view.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
hostingController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
hostingController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
hostingController.view.topAnchor.constraint(equalTo: view.topAnchor),
hostingController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
])

hostingController.didMove(toParent: self)
}
}
53 changes: 53 additions & 0 deletions LoopFollow/ViewControllers/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ func IsNightscoutEnabled() -> Bool {
return !Storage.shared.url.value.isEmpty
}

private enum SecondTab {
case remote
case alarms
}

class MainViewController: UIViewController, UITableViewDataSource, ChartViewDelegate, UNUserNotificationCenterDelegate, UIScrollViewDelegate {
@IBOutlet var BGText: UILabel!
@IBOutlet var DeltaText: UILabel!
Expand Down Expand Up @@ -273,9 +278,57 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
}
.store(in: &cancellables)

Storage.shared.remoteType.$value
.receive(on: DispatchQueue.main)
.sink { [weak self] remoteType in
if remoteType == .none {
// If remote is disabled, show the Alarms tab.
self?.updateSecondTab(to: .alarms)
} else {
// Otherwise, show the Remote tab.
self?.updateSecondTab(to: .remote)
}
}
.store(in: &cancellables)

updateQuickActions()
}

private func updateSecondTab(to tab: SecondTab) {
guard let tabBarController = tabBarController,
var viewControllers = tabBarController.viewControllers,
viewControllers.count > 1
else {
return
}

let storyboard = UIStoryboard(name: "Main", bundle: nil)
let newViewController: UIViewController
let newTabBarItem: UITabBarItem

switch tab {
case .remote:
newViewController = storyboard.instantiateViewController(withIdentifier: "RemoteViewController")
newTabBarItem = UITabBarItem(
title: "Remote",
image: UIImage(systemName: "antenna.radiowaves.left.and.right"),
tag: 1
)
case .alarms:
newViewController = storyboard.instantiateViewController(withIdentifier: "AlarmViewController")
newTabBarItem = UITabBarItem(
title: "Alarms",
image: UIImage(systemName: "alarm"),
tag: 1
)
}

newViewController.tabBarItem = newTabBarItem
viewControllers[1] = newViewController

tabBarController.setViewControllers(viewControllers, animated: false)
}

// Update the Home Screen Quick Action for toggling the "Speak BG" feature based on the current speakBG setting.
func updateQuickActions() {
let iconName = Storage.shared.speakBG.value ? "pause.circle.fill" : "play.circle.fill"
Expand Down