[Feat/#108] 🚨 워크 아웃 세션 #111

mooyoung2309 · 2023-06-28T20:13:07Z

PR 요약

RPReplay_Final1688278005.MP4

store에서 delegate 제거 완료
watchOS와 iOS 통신 완료

📌 변경 사항

✅ PR check list

Linked Issue

close #108

mooyoung2309 · 2023-06-28T20:14:23Z

Projects/App/WatchExtension/Sources/Feature/HomeWorkoutDelegate.swift

+                    let heartRateUnit = HKUnit.count().unitDivided(by: HKUnit.minute())
+                    let heartRate = statistics.mostRecentQuantity()?.doubleValue(for: heartRateUnit) ?? 0
+                    //                viewStore?.send(.setHeartRate(10))
+                    self.heartRate = heartRate
+                    debugPrint("heart \(heartRate)")
+                    //TODO: averageHeartRate 필요성 고민 후 주석 제거
+                    // statistics.averageQuantity()?.doubleValue(for: heartRateUnit) ?? 0
+
+                case HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned):
+                    let calorieUnit = HKUnit.kilocalorie()
+                    let calorie = statistics.sumQuantity()?.doubleValue(for: calorieUnit) ?? 0
+                    self.viewStore?.send(.setCalorie(Int(calorie)))
+                    debugPrint("calorie \(calorie)")


@parkhj0423 @derrickkim0109
이부분에서 왜 viewStore로 send가 안될까요 ? 이부분만 해결하고 싶습니다. 이해가 잘 안돼요 저는..

delegate가 Store의 State로 가지고 있으면 안될거같은 느낌이 들어 스토어에서 빼고 별도의 클래스에서 delegate 구현하고 뷰에서 onChange, onReceive로 Store에 action send 해서 connectivity로 쏘는 방법은 어떄?

@parkhj0423
(onChange, onReceive 처음 들어본 이슈..) delegate를 ObservableObject 감싸고 (예제 코드처럼) onChange에 publish 변수를 넣고 트래킹 하다 send하는 방식 말씀하시는거죠 ?

응 맞아 manager를 StateObject로 가지고 있고, 메인 뷰 에서 onReceive를 통해 @published 변수의 변경을 받아올 수 있어서 그 부분에서 store에 값을 포함한 액션을 보내고 리듀서에서 connectivity로 iOS 앱에 전송 하는 방법이야

parkhj0423

영모는 이슈있으면 알려주세요~

github-actions · 2023-07-02T06:09:54Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

mooyoung2309 · 2023-07-02T06:11:36Z

Projects/Feature/Workout/Sources/Timer/WorkoutTimerStore.swift

+            case let .updateHeartRate(heartRate):
+                state.heartRateToCalc = heartRate
+
+                if let id = state.currentActiveTimerCellID {
+                    state.heartRateToShow = heartRate
+                    guard let timerIndex = state.timerCells.firstIndex(where: { $0.id == id }) else { return .none }
+                    var targetTimer = state.timers[timerIndex]
+                    targetTimer.heartRates.append(heartRate)
+
+                    return .send(.updateTimer(index: timerIndex, timer: targetTimer))
+                }
+
+                return .none
+
+            case let .updateCalorie(calorie):
+                let diff = calorie - state.calorieToCalc
+                state.calorieToCalc = calorie
+
+                if let id = state.currentActiveTimerCellID {
+                    state.calorieToShow += diff
+                    guard let timerIndex = state.timerCells.firstIndex(where: { $0.id == id }) else { return .none }
+                    var targetTimer = state.timers[timerIndex]
+                    targetTimer.calorie += diff


타이머에 심박수와 칼로리를 넣는 로직입니다.
조금은 고민 많이 한 부분인데, 예외 케이스가 좀 더 있을 듯 싶어서 고도화 해나가야함

parkhj0423

WatchConnectivity와 StateObject, OnReceive부분을 말로만 설명했는데 잘 구현했네!! 고생했어

parkhj0423 · 2023-07-02T09:50:30Z

...ts/Feature/Workout/Interface/Sources/End/Components/Cells/WorkoutTimerSummaryCellStore.swift

+    }
+
+    public enum Action: Equatable {
+        case tapped


그냥 Tapped 말고 workoutTimerButtonTapped와 같이 자세히 명시하는것을 추천.

parkhj0423 · 2023-07-02T09:51:50Z

...cts/Feature/Workout/Interface/Sources/End/Components/Cells/WorkoutTimerSummaryCellView.swift

+import SwiftUI
+import ComposableArchitecture
+import Shared
+


import 하는 부분도 우리가 컨벤션을 맞춰야하는데 보통 위에서부터 퍼스트파티 프레임워크, 써드파티, 같은 레이어내의 모듈, 하위모듈 순으로 정리하는게 좋을거같아 이부분은 많이 놓쳐지고 있으니 한번 싹 맞추는 작업이 필요할듯

// workout implements 의 경우 예시 import SwiftUI import ComposableArchitecture import FeatureWorkoutInterface import Domain import Core import Shared

이렇게 통일하면 될까요 ?!

cc. @derrickkim0109

parkhj0423 · 2023-07-02T09:52:54Z

...cts/Feature/Workout/Interface/Sources/End/Components/Cells/WorkoutTimerSummaryCellView.swift

+    }
+
+    public var body: some View {
+        WithViewStore(self.store, observe: { $0 }) { viewStore in


나는 observe: { $0 } 부분을 특정 state가 변경될때만 View Re-Rendering이 발생하게끔 원하지 않는 이상 빼고있어

요거는 당장 다 바꾸는거 좀 많아서, 형꺼 먼저 코드 확인 후에 다음 개발부터 반영해나갈게요 !

어, 이거 그냥 빼도 viewStore.State.값 접근하고 있으면 re-rendering 되는구조인게 맞나요 ?!

parkhj0423 · 2023-07-02T09:54:55Z

Projects/Feature/Workout/Interface/Sources/Timer/WorkoutTimerView.swift

+                    .onReceive(watchConnectivityDelegate.$heartRate, perform: { heartRate in
+                        viewStore.send(.updateHeartRate(heartRate))
+                    })
+                    .onReceive(watchConnectivityDelegate.$calorie, perform: { calorie in


.onReceive(watchConnectivityDelegate.$heartRate) { heartRate in
viewStore.send(.updateHeartRate(heartRate))
}
으로 하는게 더 깔끔!

감사합니다 반영완료

github-actions · 2023-07-02T14:49:24Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

feat: healthkit 마무리 작업

9a2ddfc

mooyoung2309 requested review from parkhj0423 and derrickkim0109 June 28, 2023 20:13

github-actions bot added the size/l label Jun 28, 2023

mooyoung2309 commented Jun 28, 2023

View reviewed changes

mooyoung2309 added 3 commits June 30, 2023 00:29

feat: store와 delegate 분리

f1efc0a

feat: enviromnet 로 변경

4297068

feat: connectivity 연동

d3df5be

parkhj0423 approved these changes Jul 1, 2023

View reviewed changes

mooyoung2309 added 2 commits July 2, 2023 01:57

feat: 타이머에 심박수 칼로리 로직 추가

d331332

feat: 워크아웃 세션으로 통신하는 로직 완료

ea5f345

github-actions bot added size/xl and removed size/l labels Jul 2, 2023

mooyoung2309 commented Jul 2, 2023

View reviewed changes

mooyoung2309 self-assigned this Jul 2, 2023

mooyoung2309 requested a review from parkhj0423 July 2, 2023 06:13

parkhj0423 approved these changes Jul 2, 2023

View reviewed changes

refactor: 코드리뷰 반영 완료

1886edd

mooyoung2309 merged commit 30ea4c5 into develop Jul 3, 2023

mooyoung2309 deleted the feat/#108-workout-session branch July 3, 2023 01:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feat/#108] 🚨 워크 아웃 세션 #111

[Feat/#108] 🚨 워크 아웃 세션 #111

mooyoung2309 commented Jun 28, 2023 •

edited

Loading

mooyoung2309 Jun 28, 2023

parkhj0423 Jun 29, 2023

mooyoung2309 Jun 29, 2023

parkhj0423 Jun 29, 2023 •

edited

Loading

parkhj0423 left a comment

github-actions bot commented Jul 2, 2023

mooyoung2309 Jul 2, 2023

parkhj0423 left a comment

parkhj0423 Jul 2, 2023

parkhj0423 Jul 2, 2023

mooyoung2309 Jul 2, 2023

parkhj0423 Jul 2, 2023

mooyoung2309 Jul 2, 2023

mooyoung2309 Jul 2, 2023

parkhj0423 Jul 2, 2023

mooyoung2309 Jul 2, 2023

github-actions bot commented Jul 2, 2023

[Feat/#108] 🚨 워크 아웃 세션 #111

[Feat/#108] 🚨 워크 아웃 세션 #111

Conversation

mooyoung2309 commented Jun 28, 2023 • edited Loading

PR 요약

📌 변경 사항

✅ PR check list

Linked Issue

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

parkhj0423 Jun 29, 2023 • edited Loading

Choose a reason for hiding this comment

parkhj0423 left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 2, 2023

Choose a reason for hiding this comment

parkhj0423 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jul 2, 2023

mooyoung2309 commented Jun 28, 2023 •

edited

Loading

parkhj0423 Jun 29, 2023 •

edited

Loading