Merge pull request #5607 from wikimedia/T407681_punchlist_2

l-olson1214 · web-flow · commit be8ad0e0b247 · 2025-12-18T09:32:34.000-05:00
T407681: punchlist 7, 8, 9, 11
diff --git a/WMFComponents/Sources/WMFComponents/Components/Activity Tab/View Models/WMFActivityTabCustomizeViewModel.swift b/WMFComponents/Sources/WMFComponents/Components/Activity Tab/View Models/WMFActivityTabCustomizeViewModel.swift
@@ -38,13 +38,7 @@ public final class WMFActivityTabCustomizeViewModel: ObservableObject {
         let isTimeSpentReadingOn = isLoggedIn ? await dataController.isTimeSpentReadingOn : false
         let isReadingInsightsOn = isLoggedIn ? await dataController.isReadingInsightsOn : false
         let isEditingInsightsOn = isLoggedIn ?  await dataController.isEditingInsightsOn : false
-        let isTimelineOfBehaviorOn: Bool
-        
-        if isLoggedIn {
-            isTimelineOfBehaviorOn = await dataController.isTimelineOfBehaviorOnLoggedIn
-        } else {
-            isTimelineOfBehaviorOn = await dataController.isTimelineOfBehaviorOnLoggedOut
-        }
+        let isTimelineOfBehaviorOn = await dataController.isTimelineOfBehaviorOn
         
         self.isTimeSpentReadingOn = isTimeSpentReadingOn
         self.isReadingInsightsOn = isReadingInsightsOn
@@ -90,11 +84,7 @@ public final class WMFActivityTabCustomizeViewModel: ObservableObject {
             .sink { [weak self] value in
                 guard let self else { return }
                 Task {
-                    if self.isLoggedIn {
-                        await self.dataController.updateIsTimelineOfBehaviorOnLoggedIn(value)
-                    } else {
-                        await self.dataController.updateIsTimelineOfBehaviorOnLoggedOut(value)
-                    }
+                    await self.dataController.updateIsTimelineOfBehaviorOn(value)
                 }
                 
             }
diff --git a/WMFData/Sources/WMFData/Data Controllers/Activity Tab/WMFActivityTabDataController.swift b/WMFData/Sources/WMFData/Data Controllers/Activity Tab/WMFActivityTabDataController.swift
@@ -67,29 +67,15 @@ public actor WMFActivityTabDataController {
         }
     }
 
-    public var isTimelineOfBehaviorOnLoggedIn: Bool {
+    public var isTimelineOfBehaviorOn: Bool {
         get {
             return (try? userDefaultsStore?.load(
-                key: WMFUserDefaultsKey.activityTabIsTimelineOfBehaviorOnLoggedIn.rawValue
+                key: WMFUserDefaultsKey.activityTabIsTimelineOfBehaviorOn.rawValue
             )) ?? true
         }
         set {
             try? userDefaultsStore?.save(
-                key: WMFUserDefaultsKey.activityTabIsTimelineOfBehaviorOnLoggedIn.rawValue,
-                value: newValue
-            )
-        }
-    }
-    
-    public var isTimelineOfBehaviorOnLoggedOut: Bool {
-        get {
-            return (try? userDefaultsStore?.load(
-                key: WMFUserDefaultsKey.activityTabIsTimelineOfBehaviorOnLoggedOut.rawValue
-            )) ?? true
-        }
-        set {
-            try? userDefaultsStore?.save(
-                key: WMFUserDefaultsKey.activityTabIsTimelineOfBehaviorOnLoggedOut.rawValue,
+                key: WMFUserDefaultsKey.activityTabIsTimelineOfBehaviorOn.rawValue,
                 value: newValue
             )
         }
@@ -107,12 +93,8 @@ public actor WMFActivityTabDataController {
         isEditingInsightsOn = value
     }
     
-    public func updateIsTimelineOfBehaviorOnLoggedIn(_ value: Bool) {
-        isTimelineOfBehaviorOnLoggedIn = value
-    }
-    
-    public func updateIsTimelineOfBehaviorOnLoggedOut(_ value: Bool) {
-        isTimelineOfBehaviorOnLoggedOut = value
+    public func updateIsTimelineOfBehaviorOn(_ value: Bool) {
+        isTimelineOfBehaviorOn = value
     }
 
     public func getTimeReadPast7Days() async throws -> (Int, Int)? {
diff --git a/WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift b/WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift
@@ -39,6 +39,5 @@ public enum WMFUserDefaultsKey: String {
     case activityTabIsTimeSpentReadingOn = "activity-tab-time-spent-reading"
     case activityTabIsReadingInsightsOn = "activity-tab-reading-insights"
     case activityTabIsEditingInsightsOn = "activity-tab-editing-insights"
-    case activityTabIsTimelineOfBehaviorOnLoggedIn = "activity-tab-timeline-of-behavior-logged-in"
-    case activityTabIsTimelineOfBehaviorOnLoggedOut = "activity-tab-timeline-of-behavior-logged-out"
+    case activityTabIsTimelineOfBehaviorOn = "activity-tab-timeline-of-behavior"
 }
diff --git a/Wikipedia/Code/ActivityTabViewController.swift b/Wikipedia/Code/ActivityTabViewController.swift
@@ -320,8 +320,6 @@ final class WMFActivityTabHostingController: WMFComponentHostingController<WMFAc
         )
 
         let navController = WMFComponentNavigationController(rootViewController: hostedView, modalPresentationStyle: .pageSheet)
-        navController.sheetPresentationController?.detents = [.large()]
-        navController.sheetPresentationController?.prefersGrabberVisible = true
 
         return navController
     }

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,5 @@ public enum WMFUserDefaultsKey: String {`
`39`	`39`	`case activityTabIsTimeSpentReadingOn = "activity-tab-time-spent-reading"`
`40`	`40`	`case activityTabIsReadingInsightsOn = "activity-tab-reading-insights"`
`41`	`41`	`case activityTabIsEditingInsightsOn = "activity-tab-editing-insights"`
`42`		`- case activityTabIsTimelineOfBehaviorOnLoggedIn = "activity-tab-timeline-of-behavior-logged-in"`
`43`		`- case activityTabIsTimelineOfBehaviorOnLoggedOut = "activity-tab-timeline-of-behavior-logged-out"`
	`42`	`+ case activityTabIsTimelineOfBehaviorOn = "activity-tab-timeline-of-behavior"`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,6 @@ final class WMFActivityTabHostingController: WMFComponentHostingController<WMFAc`
`320`	`320`	`)`
`321`	`321`
`322`	`322`	`let navController = WMFComponentNavigationController(rootViewController: hostedView, modalPresentationStyle: .pageSheet)`
`323`		`- navController.sheetPresentationController?.detents = [.large()]`
`324`		`- navController.sheetPresentationController?.prefersGrabberVisible = true`
`325`	`323`
`326`	`324`	`return navController`
`327`	`325`	`}`