Merge pull request #60 from Team-HMH/refactor/#59

Refactor [#59] v 1.0.0 심사 대응

Author: Zoe0929

HMH_iOS/HMHDeviceActivityReport/ActivityModel.swift

@@ -10,6 +10,14 @@ import Foundation
 import ManagedSettings
 
 struct ActivityReport {
+    let totalDuration: Int
+    let titleState: [String]
+    var remainTime: Int
+    var totalGoalTime: Int
+    let apps: [AppDeviceActivity]
+}
+
+struct ChallengeActivity {
     let totalDuration: TimeInterval
     let apps: [AppDeviceActivity]
 }

HMH_iOS/HMHDeviceActivityReport/AppActivityReport.swift

@@ -8,15 +8,101 @@
 import SwiftUI
 import FamilyControls
 
+import Lottie
+
 struct AppActivityView: View {
     var activityReport: ActivityReport
     var body: some View {
-        VStack(alignment: .center) {
+        VStack() {
+            HeaderView(activityReport: activityReport)
+            
+                .padding(.bottom, 40)
             ForEach(activityReport.apps) { eachApp in
                 ListView(eachApp: eachApp)
                     .padding(.horizontal, 20)
             }
-            Spacer()
+        }
+    }
+}
+
+struct HeaderView: View {
+    var activityReport: ActivityReport
+    @ObservedObject var screenTimeViewModel = ScreenTimeViewModel()
+    
+    var body: some View {
+        
+        VStack(alignment: .leading) {
+            ZStack(alignment: .topLeading) {
+                LottieView(animation: .named(activityReport.titleState.isEmpty ? "Main-A-final.json" : activityReport.titleState[0]))
+                    .playing(loopMode: .autoReverse)
+                    .resizable()
+                VStack(alignment: .leading){
+                    Text(activityReport.titleState.isEmpty ? StringLiteral.Home.usageStatusA : activityReport.titleState[1])
+                        .font(.text1_medium_22)
+                        .foregroundStyle(.whiteText)
+                        .frame(alignment: .topLeading)
+                        .padding(EdgeInsets(top: 8,
+                                            leading: 20,
+                                            bottom: 0,
+                                            trailing: 0))
+                    Spacer()
+                    VStack(alignment: .leading) {
+                        Text("목표 사용 시간 \(convertMillisecondsToHourString(milliseconds: activityReport.totalGoalTime)) 중")
+                            .font(.detail4_medium_12)
+                            .foregroundStyle(.gray2)
+                            .frame(alignment: .leading)
+                            .padding(EdgeInsets(top: 0,
+                                                leading: 20,
+                                                bottom: 0,
+                                                trailing: 0))
+                        HStack {
+                            Text("\(convertMillisecondsToHourString(milliseconds: activityReport.totalDuration)) 사용")
+                                .font(.title2_semibold_24)
+                                .foregroundStyle(.whiteText)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                            Spacer()
+                            Text(convertMillisecondsToHourString(milliseconds: activityReport.remainTime) + " 남음")
+                                .font(.detail3_semibold_12)
+                                .foregroundStyle(.whiteText)
+                        }
+                        . padding(EdgeInsets(top: 2,
+                                             leading: 20,
+                                             bottom: 24,
+                                             trailing: 20))
+                        ProgressView(value: Double(activityReport.totalDuration), total: Double(activityReport.totalGoalTime))
+                            .foregroundStyle(.gray5)
+                            .padding(EdgeInsets(top: 0,
+                                                leading: 20,
+                                                bottom: 0,
+                                                trailing: 20))
+                            .tint(.whiteText)
+                    }
+                    .frame(maxHeight: 83)
+                }
+            }
+        }
+        .onAppear() {
+            if activityReport.totalDuration == activityReport.totalGoalTime {
+                screenTimeViewModel.handleSetBlockApplication()
+            }
+        }
+    }
+}
+
+extension HeaderView {
+    func convertMillisecondsToHourString(milliseconds: Int) -> String {
+        let secondsTotal = milliseconds / 1000
+        let hours = secondsTotal / 3600
+        let minutes = (secondsTotal % 3600) / 60
+        
+        if hours > 0 {
+            if minutes > 0 {
+                return "\(hours)시간 \(minutes)분"
+            } else {
+                return "\(hours)시간"
+            }
+        } else {
+            return "\(minutes)분"
         }
     }
 }
@@ -70,5 +156,5 @@ struct ListView: View {
         }
         .frame(height: 72)
     }
-
+    
 }

HMH_iOS/HMHDeviceActivityReport/AppActivityView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import FamilyControls
 
 struct ChallengeActivityView: View {
-    var activityReport: ActivityReport
+    var activityReport: ChallengeActivity
 
     var body: some View {
         VStack(alignment: .center) {

HMH_iOS/HMHDeviceActivityReport/ChallengeActivityView.swift

@@ -0,0 +1,54 @@
+//
+//  ChallengeDeviceActivityReportScene.swift
+//  HMHDeviceActivityReport
+//
+//  Created by 이지희 on 6/21/24.
+//
+
+import SwiftUI
+import DeviceActivity
+
+struct ChallengeActivityReport: DeviceActivityReportScene {
+    let context : DeviceActivityReport.Context = .challengeActivity
+    let content: (ChallengeActivity) -> ChallengeActivityView
+    
+    func makeConfiguration(representing data: DeviceActivityResults<DeviceActivityData>) async -> ChallengeActivity {
+        
+        var totalActivityDuration: Double = 0
+        var list: [AppDeviceActivity] = []
+        
+        /// DeviceActivityResults 데이터에서 화면에 보여주기 위해 필요한 내용을 추출해줍니다.
+        for await eachData in data {
+            /// 특정 시간 간격 동안 사용자의 활동
+            for await activitySegment in eachData.activitySegments {
+                /// 활동 세그먼트 동안 사용자의 카테고리 별 Device Activity
+                for await categoryActivity in activitySegment.categories {
+                    /// 이 카테고리의 totalActivityDuration에 기여한 사용자의 application Activity
+                    for await applicationActivity in categoryActivity.applications {
+                        var id = 0
+                        let appName = (applicationActivity.application.localizedDisplayName ?? "nil") /// 앱 이름
+                        let bundle = (applicationActivity.application.bundleIdentifier ?? "nil") /// 앱 번들id
+                        let duration = applicationActivity.totalActivityDuration /// 앱의 total activity 기간
+                        totalActivityDuration += duration
+                        let numberOfPickups = applicationActivity.numberOfPickups /// 앱에 대해 직접적인 pickup 횟수
+                        let token = applicationActivity.application.token /// 앱의 토큰
+                        let appActivity = AppDeviceActivity(
+                            id: bundle,
+                            displayName: appName,
+                            duration: duration,
+                            remainTime: duration,
+                            numberOfPickups: numberOfPickups,
+                            token: token
+                        )
+                        list.append(appActivity)
+                        id += 1
+                    }
+                }
+                
+            }
+        }
+        
+        /// 필터링된 ActivityReport 데이터들을 반환
+        return ChallengeActivity(totalDuration: totalActivityDuration, apps: list)
+    }
+}