UI Change: Centered and Divided Hide Button and fixed lint errors

CS342 · Mar 11, 2024 · 5b7d05e · 5b7d05e
1 parent 9b44804
commit 5b7d05e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/Prisma/PrivacyControls/DeleteDataView.swift b/Prisma/PrivacyControls/DeleteDataView.swift
@@ -76,19 +76,25 @@ struct DeleteDataView: View {
 
     var hideByCustomRangeSection: some View {
         Section(header: Text("Hide Data by Custom Range")) {
-            DatePicker("Start date", selection: $customHideStartDate, displayedComponents: .date)
-            DatePicker("End date", selection: $customHideEndDate, displayedComponents: .date)
-            Button("Hide") {
-                let startDateString = formatDate(customHideStartDate)
-                let endDateString = formatDate(customHideEndDate)
-                Task {
-                    customRangeTimestamps = await standard.fetchCustomRangeTimeStamps(
-                        selectedTypeIdentifier: categoryIdentifier,
-                        startDate: startDateString,
-                        endDate: endDateString
-                    )
+            VStack {
+                DatePicker("Start date", selection: $customHideStartDate, displayedComponents: .date)
+                DatePicker("End date", selection: $customHideEndDate, displayedComponents: .date)
+
+                Divider()
+
+                Button("Hide") {
+                    let startDateString = formatDate(customHideStartDate)
+                    let endDateString = formatDate(customHideEndDate)
+                    Task {
+                        customRangeTimestamps = await standard.fetchCustomRangeTimeStamps(
+                            selectedTypeIdentifier: categoryIdentifier,
+                            startDate: startDateString,
+                            endDate: endDateString
+                        )
+                    }
+                    switchHiddenInBackend(identifier: categoryIdentifier, timestamps: customRangeTimestamps, alwaysHide: true)
                 }
-                switchHiddenInBackend(identifier: categoryIdentifier, timestamps: customRangeTimestamps, alwaysHide: true)
+//                .frame(maxWidth: .infinity) // Make the button take full width
             }
         }
     }

diff --git a/Prisma/Resources/Localizable.xcstrings b/Prisma/Resources/Localizable.xcstrings
@@ -432,6 +432,9 @@
           }
         }
       }
+    },
+    "Hide" : {
+
     },
     "Hide by Timestamps" : {
 
@@ -695,9 +698,6 @@
           }
         }
       }
-    },
-    "Submit" : {
-
     },
     "TASK_CONTEXT_ACTION_QUESTIONNAIRE" : {
       "localizations" : {

diff --git a/Prisma/Standard/PrismaStandard+HealthKit.swift b/Prisma/Standard/PrismaStandard+HealthKit.swift
@@ -151,7 +151,7 @@ extension PrismaStandard {
 
             // If hideFlag exists, update its value
             if let hideFlagExists = docSnapshot.data()?["hideFlag"] as? Bool {
-                if (alwaysHide) {
+                if alwaysHide {
                     // If alwaysHide is true, always set hideFlag to true regardless of original value
                     try await document.setData(["hideFlag": true], merge: true)
                     print("AlwaysHide is enabled; set hideFlag to true.")
@@ -214,13 +214,17 @@ extension PrismaStandard {
                 let documentDate = String(documentID.prefix(10))
 
                 // check if documentID date is within the start and end date range
-                if (documentDate >= startDate && documentDate <= endDate) {
+                if documentDate >= startDate && documentDate <= endDate {
                     timestampsArr.append(documentID)
                 }
             }
             return timestampsArr
-        } catch let error {
-            print("Error fetching documents: \(error.localizedDescription)")
+        } catch {
+            if let firestoreError = error as? FirestoreError {
+                print("Error fetching documents: \(firestoreError.localizedDescription)")
+            } else {
+                print("Unexpected error: \(error.localizedDescription)")
+            }
             return []
         }
     }