feat: add health data usage descriptions and IDEWorkspaceChecks.plist

mateuschaves · Mar 7, 2024 · c1e99e2 · c1e99e2
1 parent ea33191
commit c1e99e2
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 69 deletions.
diff --git a/PulsePomodoro Watch App/ContentView.swift b/PulsePomodoro Watch App/ContentView.swift
@@ -13,9 +13,18 @@ struct ContentView: View {
     var body: some View {
         NavigationStack {
             VStack {
+                Text("Focus time")
+                    .font(.caption)
+                    .fontWeight(.bold)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .scenePadding()
+                    .padding(
+                        EdgeInsets(top: -20, leading: 0, bottom: 0, trailing: 0)
+                    )
+                Spacer()
                 Stepper(value: $minutes, in: 0...60, step: 1) {
                     Text("\(minutes) minutes")
-                        .font(.headline)
+                        .font(.caption2)
                 }
                 .padding(.top, 18)
                 .padding(.bottom, 18)
@@ -25,11 +34,20 @@ struct ContentView: View {
                     label: {
                         Text("Confirm")
                     })
-            }.navigationTitle("Focus time")
+            }
+            .padding()
+
         }.onAppear(perform: {
             heartRateMonitor.requestAuthorization()
         })
     }
 }
 
+struct ContentView_Preview: PreviewProvider {
+    static var previews: some View {
+        NavigationStack {
+            ContentView()
+        }
+    }
+}
 
diff --git a/PulsePomodoro Watch App/views/PomodoroResumeView.swift b/PulsePomodoro Watch App/views/PomodoroResumeView.swift
@@ -2,12 +2,15 @@ import Foundation
 import SwiftUI
 
 struct PomodoroResumeView: View {
+    @Environment(\.presentationMode) var presentationMode
 
     var timeFocused: Int
     var startDate: Date
+    var cycles: Int
 
     @State private var averageHr = 0
     @State private var averageBreath = 0
+    @State private var goToHome = false
 
     let heartRateMonitor = HeartRateMonitor()
 
@@ -21,7 +24,7 @@ struct PomodoroResumeView: View {
                         .padding(EdgeInsets(
                             top: 2, leading: 0, bottom: 0, trailing: 0
                         ))
-                    Text("\(formatSecondsToMMSS(seconds: timeFocused))")
+                    Text("\(formatSecondsToMMSS(seconds: timeFocused)) in \(cycles) cycles")
                         .frame(maxWidth: .infinity, alignment: .leading)
                         .foregroundStyle(Color.yellow)
                         .fontWeight(Font.Weight.bold)
@@ -83,10 +86,28 @@ struct PomodoroResumeView: View {
             }
             .navigationBarTitle("Summary")
             .navigationBarTitleDisplayMode(.inline)
+
             .padding()
         }.onAppear(perform: {
             self.savePomodoro()
         })
+        .navigationBarBackButtonHidden(true)
+        .toolbar {
+            ToolbarItem(placement: .topBarLeading) {
+                Button(action: {
+                    self.goToHome = true
+                }) {
+                    Image(systemName: "xmark")
+                }
+            }
+        }
+        .navigationDestination(
+            isPresented: self.$goToHome
+        ) {
+            ContentView()
+        }
+        .navigationBarBackButtonHidden(true)
+        .toolbar(.hidden)
     }
 
     func formatSecondsToMMSS(seconds: Int) -> String {
@@ -121,7 +142,7 @@ struct PomodoroResumeView: View {
             if let heartRate = heartRate, let respiratoryRate = respiratoryRate {
                 self.averageHr = heartRate
                 self.averageBreath = respiratoryRate
-
+                    
                 print("Heart rate on last \(timeFocused) seconds was \(heartRate)")
                 let isHeartRateNormal = heartRateMonitor.isRestingHeartRateNormal(heartRate: heartRate)
 
@@ -161,7 +182,8 @@ struct PomodoroResumeView_Previews: PreviewProvider {
         NavigationStack {
             PomodoroResumeView(
                 timeFocused: 300,
-                startDate: Date()
+                startDate: Date(),
+                cycles: 2
             )
         }
     }

diff --git a/PulsePomodoro Watch App/views/RemainingMinutesView.swift b/PulsePomodoro Watch App/views/RemainingMinutesView.swift
@@ -14,49 +14,79 @@ struct RemainingMinutesView: View {
     @State private var cycles = 0
     @State private var totalTimeFocused = 0
 
+    @State private var timeInactiveInSecods = 0
+    @State private var startInactiveDate = Date()
+    @State private var endInactiveDate = Date()
+
+    @Environment(\.scenePhase) var scenePhase
+    @Environment(\.presentationMode) var presentationMode
+
+
     var body: some View {
-        Text("\(self.formatSecondsToMMSS(seconds: remainingSeconds))")
-            .font(.largeTitle)
-            .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
-            .onAppear {
-                startCountdown()
-                WKExtension.shared().isFrontmostTimeoutExtended = true
-            }
-        HStack {
-            NavigationLink(
-                destination: PomodoroResumeView(
-                    timeFocused: self.totalTimeFocused,
-                    startDate: self.startDate
-                ),
-                label: {
-                    Image(systemName: "checkmark")
-                        .foregroundStyle(Color.green)
-                        .font(.title2)
-                        .padding(
-                            EdgeInsets(
-                                top: 0,
-                                leading: 0,
-                                bottom: 0,
-                                trailing: 26
+        NavigationStack {
+            Text("\(self.formatSecondsToMMSS(seconds: remainingSeconds))")
+                .font(.largeTitle)
+                .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
+                .onAppear {
+                    startCountdown()
+                }
+            HStack {
+                NavigationLink(
+                    destination: PomodoroResumeView(
+                        timeFocused: self.totalTimeFocused,
+                        startDate: self.startDate,
+                        cycles: self.cycles
+                    ),
+                    label: {
+                        Image(systemName: "checkmark")
+                            .foregroundStyle(Color.green)
+                            .font(.title2)
+                            .padding(
+                                EdgeInsets(
+                                    top: 0,
+                                    leading: 0,
+                                    bottom: 0,
+                                    trailing: 26
+                                )
                             )
-                        )
+                    }
+                )
+                .buttonStyle(PlainButtonStyle())
+                .disabled(!isTimeOver)
+                .onTapGesture {
+                    if (isTimeOver) {
+                        handleEndCountdown()
+                    }
                 }
-            ).buttonStyle(PlainButtonStyle())
+
+                Image(systemName: $isPaused.wrappedValue || $isTimeOver.wrappedValue ? "play" : "pause")
+                    .foregroundStyle(Color.yellow)
+                    .font(.title2)
+                    .padding(EdgeInsets(top: 0, leading: 26, bottom: 0, trailing: 0))
+                    .onTapGesture(perform: {
+                        if (self.isTimeOver) {
+                            self.startCountdown()
+                            self.isTimeOver.toggle()
+                        } else {
+                            self.isPaused.toggle()
+                        }
+                    })
+            }
+            .padding(EdgeInsets(top: 16, leading: 0, bottom: 0, trailing: 0))
+            Spacer()
+            Text("\(self.cycles) cycles")
+                .padding()
+                .fontWeight(Font.Weight.thin)
 
-            Image(systemName: $isPaused.wrappedValue || $isTimeOver.wrappedValue ? "play" : "pause")
-                .foregroundStyle(Color.yellow)
-                .font(.title2)
-                .padding(EdgeInsets(top: 0, leading: 26, bottom: 0, trailing: 0))
-                .onTapGesture(perform: {
-                    if (self.isTimeOver) {
-                        self.startCountdown()
-                        self.isTimeOver.toggle()
-                    } else {
-                        self.isPaused.toggle()
-                    }
-                })
+        }.onChange(of: scenePhase)  { newPhase in
+            if newPhase == .active {
+                self.endInactiveDate = Date()
+                self.timeInactiveInSecods = Int(self.endInactiveDate.timeIntervalSince(self.startInactiveDate))
+                self.remainingSeconds = max(0, self.remainingSeconds - self.timeInactiveInSecods)
+              } else if newPhase == .inactive {
+                self.startInactiveDate =  Date()
+              }
         }
-        .padding(EdgeInsets(top: 16, leading: 0, bottom: 0, trailing: 0))
     }
 
     func handleEndCountdown() {
@@ -66,7 +96,7 @@ struct RemainingMinutesView: View {
         self.cycles += 1
         self.totalTimeFocused += timerSeconds
     }
-
+    
 
     func startCountdown() {
         remainingSeconds = timerSeconds

diff --git a/PulsePomodoro-Watch-App-Info.plist b/PulsePomodoro-Watch-App-Info.plist
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>NSHealthShareUsageDescription</key>
+	<string>We need this data to monitor your heart rate while you are using pomodoro</string>
+	<key>NSHealthUpdateUsageDescription</key>
+	<string>We need this data to monitor your heart rate while you are using pomodoro</string>
+</dict>
 </plist>