admin/WerkoutIOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to fix watch stuff

Browse Source
This commit is contained in:
Trey t
2024-07-01 21:22:12 -05:00
parent cee84d7776
commit f1781744ca
14 changed files with 187 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
iphone/Werkout_watch Watch App/MainWatchView.swift
View File

@@ -8,18 +8,20 @@
import SwiftUI
struct MainWatchView: View {
@StateObject var vm = WatchMainViewModel.shared
@ObservedObject var vm = WatchMainViewModel.shared
@ObservedObject var watchWorkout = WatchWorkout.shared
var body: some View {
VStack {
HStack {
if vm.isInWorkout {
if watchWorkout.isInWorkout {
HStack {
Text(vm.watchPackageModel.currentExerciseName)
.font(.body)
.foregroundColor(.white)
.lineLimit(10)
.fixedSize(horizontal: false, vertical: true)
.frame(maxWidth: .infinity, alignment: .leading)
.frame(maxWidth: .infinity, alignment: .leading)
Divider()
Text("\(vm.watchPackageModel.currentTimeLeft )")
.font(.title)
@@ -27,28 +29,27 @@ struct MainWatchView: View {
.lineLimit(10)
.fixedSize(horizontal: false, vertical: true)
}
}
HStack {
if let heartValue = vm.heartValue {
VStack {
Image(systemName: "heart.fill")
.font(Font.system(size: 22))
.scaledToFit()
.minimumScaleFactor(0.01)
.lineLimit(1)
.foregroundColor(.red)
Text("\(heartValue)")
.font(Font.system(size: 55))
.scaledToFit()
.minimumScaleFactor(0.01)
.lineLimit(1)
.foregroundColor(.red)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
if vm.isInWorkout {
HStack {
if let heartValue = watchWorkout.heartValue {
VStack {
Image(systemName: "heart.fill")
.font(Font.system(size: 22))
.scaledToFit()
.minimumScaleFactor(0.01)
.lineLimit(1)
.foregroundColor(.red)
Text("\(heartValue)")
.font(Font.system(size: 55))
.scaledToFit()
.minimumScaleFactor(0.01)
.lineLimit(1)
.foregroundColor(.red)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
Button(action: {
vm.nextExercise()
}, label: {
@@ -57,12 +58,10 @@ struct MainWatchView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
})
.buttonStyle(BorderedButtonStyle(tint: .green))
} else {
VStack {
Text("No Werkout")
Text("🍑")
}
}
} else {
Text("No Werkout")
Text("🍑")
}
}
}