Skip to content

Added a note regarding the "default to Touchbar" issue. #48

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

Added a note regarding the "default to Touchbar" issue. #48

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
6c384d8
Added a note regarding the "default to Touchbar" issue.
Ronak99 Jul 27, 2025
6ad8125
show device selector only if there are more than 1 devices
Ronak99 Jul 28, 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
4 changes: 2 additions & 2 deletions TrackWeight/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct ContentView: View {
HomeView {
showHomePage = false
}
.frame(minWidth: 700, minHeight: 500)
.frame(minWidth: 700, minHeight: 700)
} else {
TabView(selection: $selectedTab) {
TrackWeightView()
Expand All @@ -38,7 +38,7 @@ struct ContentView: View {
}
.tag(2)
}
.frame(minWidth: 700, minHeight: 500)
.frame(minWidth: 700, minHeight: 700)
}
}
}
Expand Down
69 changes: 66 additions & 3 deletions TrackWeight/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
//

import SwiftUI
import OpenMultitouchSupport

struct HomeView: View {
let onBegin: () -> Void
@StateObject private var viewModel = ContentViewModel()

var body: some View {
VStack(spacing: 40) {
Expand Down Expand Up @@ -71,8 +73,69 @@ struct HomeView: View {
.frame(maxWidth: 500)
}

Spacer()

// Select a device first
if viewModel.availableDevices.count > 1 {
VStack(spacing: 20) {
// Device Card
SettingsCard {
VStack(spacing: 12) {
// Status Row
HStack {
HStack(spacing: 12) {
Text("Verify Device Selection")
.font(.headline)
.fontWeight(.medium)
}

Spacer()


Text("\(viewModel.availableDevices.count) device\(viewModel.availableDevices.count == 1 ? "" : "s")")
.font(.caption)
.foregroundColor(.secondary)

}

// Device Selector

VStack(alignment: .leading, spacing: 12) {
HStack {
Image(systemName: "exclamationmark.triangle")
.font(.system(size: 16, weight: .medium))
.font(.caption)
.foregroundColor(.orange)
Text("OMS may default to the Touch Bar on Macs equipped with it. You can change the selected device in the settings tab. Please ensure you've selected the correct trackpad.")
.font(.system(size: 12, weight: .medium))
.foregroundColor(.orange)
}
.padding(.horizontal)
HStack {
Picker("", selection: Binding(
get: { viewModel.selectedDevice },
set: { device in
if let device = device {
viewModel.selectDevice(device)
}
}
)) {
ForEach(viewModel.availableDevices, id: \.self) { device in
Text(device.deviceName)
.tag(device as OMSDeviceInfo?)
}
}
.pickerStyle(MenuPickerStyle())

Spacer()
}

}
.frame(width: 450)
}
}
}
.frame(maxWidth: 480)
.padding(.horizontal, 40)
}
// Begin button
Button(action: onBegin) {
HStack(spacing: 10) {
Expand All @@ -99,7 +162,7 @@ struct HomeView: View {
.scaleEffect(1.0)
.animation(.spring(response: 0.3, dampingFraction: 0.8), value: true)
.padding(.vertical, 10)

Spacer()
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
Expand Down