Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions Stanford360/Activity/Model/ActivityManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,4 @@ class ActivityManager: Module, EnvironmentAccessible {
return "Start your activity today and move towards your goal! 💪"
}
}

func saveToStorage() {
do {
let data = try JSONEncoder().encode(activities)
UserDefaults.standard.set(data, forKey: "activities")
print("[ActivityManager] [saveToStorage] Successfully saved activities to UserDefaults")
} catch {
print("[ActivityManager] [saveToStorage] Error ❌ : \(error)")
}
}
}
39 changes: 2 additions & 37 deletions Stanford360/Activity/Model/HealthKitManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ class HealthKitManager: Module, EnvironmentAccessible {
)
}

// func saveActivityToHealthKit(_ activity: Activity) async throws {
// let samples = createHealthKitSamples(for: activity)
// try await healthStore.save(samples)
// }

private func fetchSteps(startDate: Date, endDate: Date) async throws -> Int {
guard let stepType = HKObjectType.quantityType(forIdentifier: .stepCount) else {
throw HealthKitError.fetchingStepsFailed
Expand Down Expand Up @@ -115,37 +110,7 @@ class HealthKitManager: Module, EnvironmentAccessible {
healthStore.execute(query)
}
}

// private func createHealthKitSamples(for activity: Activity) -> [HKSample] {
// var samples: [HKSample] = []
//
// if let stepType = HKObjectType.quantityType(forIdentifier: .stepCount) {
// // Convert activity minutes to steps (assuming moderate pace of 100 steps/minute)
// let estimatedSteps = activity.activeMinutes * 100
// let stepQuantity = HKQuantity(unit: .count(), doubleValue: Double(estimatedSteps))
// let stepSample = HKQuantitySample(
// type: stepType,
// quantity: stepQuantity,
// start: activity.date,
// end: activity.date.addingTimeInterval(60 * Double(activity.activeMinutes))
// )
// samples.append(stepSample)
// }
//
// if let exerciseType = HKObjectType.quantityType(forIdentifier: .appleExerciseTime) {
// let exerciseQuantity = HKQuantity(unit: .minute(), doubleValue: Double(activity.activeMinutes))
// let exerciseSample = HKQuantitySample(
// type: exerciseType,
// quantity: exerciseQuantity,
// start: activity.date,
// end: activity.date.addingTimeInterval(60 * Double(activity.activeMinutes))
// )
// samples.append(exerciseSample)
// }
//
// return samples
// }
//

/// Converts HealthKit metrics into equivalent active minutes
private func calculateActiveMinutes(steps: Int, exerciseMinutes: Int) -> Int {
// Convert steps to minutes (assuming 100 steps per minute of activity)
Expand All @@ -169,7 +134,7 @@ class HealthKitManager: Module, EnvironmentAccessible {
date: date,
steps: healthKitActivity.steps,
activeMinutes: convertedActiveMinutes,
activityType: "HealthKit Import"
activityType: "Walking (HealthKit)"
)
}
}
53 changes: 53 additions & 0 deletions Stanford360/Activity/View/ActivityButtonView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
//
// ActivityButtonView.swift
// Stanford360
//
// Created by Elsa Bismuth on 13/02/2025.
//
// SPDX-FileCopyrightText: 2025 Stanford University
//
// SPDX-License-Identifier: MIT

import SwiftUI

struct ActivityButtonView: View {
let activityName: String
let iconName: String
@Binding var selectedActivity: String

var body: some View {
VStack(spacing: 6) {
Image(systemName: iconName)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 40, height: 40)
.foregroundColor(.blue) // Change color as needed
.accessibilityLabel(activityName)

Text(activityName)
.font(.subheadline)
.foregroundColor(.primary)
}
.frame(width: 65, height: 65)
.padding()
.background(
ZStack {
RoundedRectangle(cornerRadius: 12).fill(Color.white)
if selectedActivity == activityName {
RoundedRectangle(cornerRadius: 12)
.stroke(Color.blue, lineWidth: 3)
}
}
)
.shadow(radius: 2)
.onTapGesture {
selectedActivity = activityName
}
}
}

#Preview {
@Previewable @State var selectedActivity = "Walking"

ActivityButtonView(activityName: "Walking", iconName: "figure.walk", selectedActivity: $selectedActivity)
}
Loading