Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +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 = await dataController.isTimelineOfBehaviorOn
let isTimelineOfBehaviorOn = isLoggedIn ? await dataController.isTimelineOfBehaviorOn : false

self.isTimeSpentReadingOn = isTimeSpentReadingOn
self.isReadingInsightsOn = isReadingInsightsOn
Expand Down Expand Up @@ -82,11 +82,11 @@ public final class WMFActivityTabCustomizeViewModel: ObservableObject {

$isTimelineOfBehaviorOn
.sink { [weak self] value in
guard let self else { return }
guard let self, self.isLoggedIn else { return }

Task {
await self.dataController.updateIsTimelineOfBehaviorOn(value)
}

}
.store(in: &cancellables)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ public struct WMFActivityTabCustomizeView: View {
isOn: $viewModel.isTimelineOfBehaviorOn
)
.listRowBackground(Color(theme.paperBackground).edgesIgnoringSafeArea([.all]))
.onChange(of: viewModel.isTimelineOfBehaviorOn) { newValue in
guard newValue == true else { return }
guard viewModel.isLoggedIn else {
viewModel.isTimelineOfBehaviorOn = false
viewModel.presentLoggedInToastAction?()
return
}
}
} footer: {
Text(viewModel.localizedStrings.footer)
.font(Font(WMFFont.for(.caption1)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ public struct WMFActivityTabView: View {
loggedInList(proxy: proxy)
}
} else {
if !viewModel.customizeViewModel.isTimelineOfBehaviorOn {
customizedEmptyState()
} else {
loggedOutList(proxy: proxy)
}
loggedOutList(proxy: proxy)
}
}
}
Expand Down Expand Up @@ -188,7 +184,6 @@ public struct WMFActivityTabView: View {
private func loggedOutList(proxy: ScrollViewProxy) -> some View {
if viewModel.sections.count == 0 {
VStack {

Section {
loggedOutView
.accessibilityElement(children: .contain)
Expand Down
Loading