Skip to content

zeroOffset #22

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
Mirza-Samad-Ahmed-Baig wants to merge 1 commit into
base: main
Choose a base branch
from
Open

zeroOffset #22

Show file tree
Hide file tree
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
74 changes: 49 additions & 25 deletions TrackWeight/ScaleView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,33 +77,57 @@ struct ScaleView: View {
.foregroundStyle(.gray)
}

Button(action: {
viewModel.zeroScale()
}) {
HStack(spacing: 8) {
Image(systemName: "arrow.clockwise")
.font(.system(size: min(max(geometry.size.width * 0.02, 14), 18), weight: .semibold))
Text("Zero Scale")
.font(.system(size: min(max(geometry.size.width * 0.02, 14), 18), weight: .semibold))
}
.foregroundStyle(.white)
.frame(width: min(max(geometry.size.width * 0.2, 140), 180),
height: min(max(geometry.size.height * 0.08, 40), 55))
.background(
RoundedRectangle(cornerRadius: 25)
.fill(
LinearGradient(
colors: [.blue, .teal],
startPoint: .leading,
endPoint: .trailing
HStack(spacing: 10) {
Button(action: {
viewModel.zeroScale()
}) {
HStack(spacing: 8) {
Image(systemName: "arrow.clockwise")
.font(.system(size: min(max(geometry.size.width * 0.02, 14), 18), weight: .semibold))
Text("Zero Scale")
.font(.system(size: min(max(geometry.size.width * 0.02, 14), 18), weight: .semibold))
}
.foregroundStyle(.white)
.frame(width: min(max(geometry.size.width * 0.2, 140), 180),
height: min(max(geometry.size.height * 0.08, 40), 55))
.background(
RoundedRectangle(cornerRadius: 25)
.fill(
LinearGradient(
colors: [.blue, .teal],
startPoint: .leading,
endPoint: .trailing
)
)
)
)
)
}
.buttonStyle(.plain)
.opacity(viewModel.hasTouch ? 1 : 0)
.scaleEffect(viewModel.hasTouch ? 1 : 0.8)
.animation(.spring(response: 0.4, dampingFraction: 0.8), value: viewModel.hasTouch)

// Reset calibration button - always visible
Button(action: {
viewModel.resetCalibration()
}) {
HStack(spacing: 6) {
Image(systemName: "xmark.circle")
.font(.system(size: min(max(geometry.size.width * 0.018, 12), 16), weight: .medium))
Text("Reset")
.font(.system(size: min(max(geometry.size.width * 0.018, 12), 16), weight: .medium))
}
.foregroundStyle(.red)
.frame(width: min(max(geometry.size.width * 0.12, 80), 100),
height: min(max(geometry.size.height * 0.06, 30), 40))
.background(
RoundedRectangle(cornerRadius: 20)
.stroke(.red.opacity(0.5), lineWidth: 1.5)
)
}
.buttonStyle(.plain)
.opacity(viewModel.zeroOffset != 0 ? 0.7 : 0.3)
.disabled(viewModel.zeroOffset == 0)
}
.buttonStyle(.plain)
.opacity(viewModel.hasTouch ? 1 : 0)
.scaleEffect(viewModel.hasTouch ? 1 : 0.8)
.animation(.spring(response: 0.4, dampingFraction: 0.8), value: viewModel.hasTouch)
}
.frame(height: min(max(geometry.size.height * 0.15, 80), 100)) // Fixed space for button + instruction
.frame(maxWidth: .infinity) // Ensure full width for centering
Expand Down
19 changes: 17 additions & 2 deletions TrackWeight/ScaleViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,23 @@ import Combine
@MainActor
final class ScaleViewModel: ObservableObject {
@Published var currentWeight: Float = 0.0
@Published var zeroOffset: Float = 0.0
@Published var zeroOffset: Float = 0.0 {
didSet {
// Persist zero offset to UserDefaults when it changes
UserDefaults.standard.set(zeroOffset, forKey: "TrackWeight.zeroOffset")
}
}
@Published var isListening = false
@Published var hasTouch = false

private let manager = OMSManager.shared
private var task: Task<Void, Never>?

init() {
// Restore saved zero offset from UserDefaults
self.zeroOffset = UserDefaults.standard.float(forKey: "TrackWeight.zeroOffset")
}

func startListening() {
if manager.startListening() {
isListening = true
Expand Down Expand Up @@ -46,11 +56,16 @@ final class ScaleViewModel: ObservableObject {
}
}

func resetCalibration() {
zeroOffset = 0.0
// This will automatically persist to UserDefaults via the didSet observer
}

private func processTouchData(_ touchData: [OMSTouchData]) {
if touchData.isEmpty {
hasTouch = false
currentWeight = 0.0
zeroOffset = 0.0 // Reset zero when finger is lifted
// Do not reset zeroOffset when finger is lifted - preserve calibration
} else {
hasTouch = true
let rawWeight = touchData.first?.pressure ?? 0.0
Expand Down