[Feat/#21] 홈뷰 앱 사용시간 뷰 추가

Team-HMH · May 13, 2024 · b87f78a · b87f78a
1 parent 3f0c030
commit b87f78a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/HMH_iOS/HMH_iOS/Presentation/Home/ViewModels/HomeViewModel.swift b/HMH_iOS/HMH_iOS/Presentation/Home/ViewModels/HomeViewModel.swift
@@ -43,16 +43,6 @@ class HomeViewModel: ObservableObject {
             AppUsage(appId: "3", appName: "Twitter", goalTime: 30, usedTime: 15)
         ]
     }
-
-    func requestAuthorization() {
-        Task {
-            do {
-                try await AuthorizationCenter.shared.requestAuthorization(for: FamilyControlsMember.individual)
-            } catch {
-                print("스크린타임 권한 설정이 실패: \(error.localizedDescription)")
-            }
-        }
-    }
 }
 
 struct AppUsage: Identifiable {

diff --git a/HMH_iOS/HMH_iOS/Presentation/Home/Views/HomeView.swift b/HMH_iOS/HMH_iOS/Presentation/Home/Views/HomeView.swift
@@ -19,7 +19,18 @@ struct HomeView: View {
         users: .all,
         devices: .init([.iPhone, .iPad])
     )
-
+    @State var appContext: DeviceActivityReport.Context = .init(rawValue: "App Activity")
+    @State var appFilter = DeviceActivityFilter(
+        segment: .daily(
+            during: Calendar.current.dateInterval(
+                of: .day, for: .now
+            )!
+        ),
+        users: .all,
+        devices: .init([.iPhone, .iPad]),
+        applications: ScreenTimeViewModel.shared.selectionToDiscourage.applicationTokens,
+        categories: ScreenTimeViewModel.shared.selectionToDiscourage.categoryTokens
+    )
 
     var body: some View {
         ScrollView {
@@ -72,19 +83,27 @@ struct HomeView: View {
                     }
                 }
                 .padding(.bottom, 60)
-                ForEach(homeViewModel.appsUsage) { appUsage  in
-                    UsageTimeListItemView(appName: appUsage.appName,
-                                          usageTime: Int(appUsage.usedTime), remainingTime: "\(appUsage.goalTime - appUsage.usedTime)")
-                }
+                DeviceActivityReport(appContext, filter: appFilter)
             }
             .background(.blackground)
             .customNavigationBar(title: StringLiteral.NavigationBar.home,
                                  showBackButton: false,
                                  showPointButton: false)
         }
         .onAppear {
-            homeViewModel.requestAuthorization()
-            homeViewModel.generateDummyData()
+            ScreenTimeViewModel.shared.requestAuthorization()
+
+            appFilter = DeviceActivityFilter(
+                segment: .daily(
+                    during: Calendar.current.dateInterval(
+                        of: .day, for: .now
+                    ) ?? DateInterval()
+                ),
+                users: .all,
+                devices: .init([.iPhone]),
+                applications: ScreenTimeViewModel.shared.selectionToDiscourage.applicationTokens,
+                categories: ScreenTimeViewModel.shared.selectionToDiscourage.categoryTokens
+            )
         }
         .background(.blackground)
     }