Skip to content

T407681: punchlist 7, 8, 9, 11 #5607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l-olson1214 merged 4 commits into from
Dec 18, 2025
Merged

T407681: punchlist 7, 8, 9, 11 #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1846580
Do not split off timeline flags by auth status
tonisevener Dec 17, 2025
2ff3dce
Remove grabber
tonisevener Dec 17, 2025
54ed1a9
Merge branch 'main' into T407681_punchlist_2
tonisevener Dec 17, 2025
a8d0fb5
Merge branch 'main' into T407681_punchlist_2
l-olson1214 Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .../WMFComponents/Components/Activity Tab/View Models/WMFActivityTabCustomizeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}

}
Expand Down
28 changes: 5 additions & 23 deletions WMFData/Sources/WMFData/Data Controllers/Activity Tab/WMFActivityTabDataController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
Expand All @@ -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)? {
Expand Down
3 changes: 1 addition & 2 deletions WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 0 additions & 2 deletions Wikipedia/Code/ActivityTabViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down