Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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 @@ -188,14 +188,14 @@ public struct WMFActivityTabView: View {
private func loggedOutList(proxy: ScrollViewProxy) -> some View {
if viewModel.sections.count == 0 {
VStack {
if viewModel.shouldShowLogInPrompt {
Section {
loggedOutView
.accessibilityElement(children: .contain)
.listRowInsets(EdgeInsets())
}
.listRowSeparator(.hidden)

Section {
loggedOutView
.accessibilityElement(children: .contain)
.listRowInsets(EdgeInsets())
}
.listRowSeparator(.hidden)

HStack {
Spacer()
WMFEmptyView(
Expand All @@ -211,14 +211,12 @@ public struct WMFActivityTabView: View {
.background(Color(uiColor: theme.paperBackground).edgesIgnoringSafeArea(.all))
} else {
List {
if viewModel.shouldShowLogInPrompt {
Section {
loggedOutView
.accessibilityElement(children: .contain)
.listRowInsets(EdgeInsets())
}
.listRowSeparator(.hidden)
Section {
loggedOutView
.accessibilityElement(children: .contain)
.listRowInsets(EdgeInsets())
}
.listRowSeparator(.hidden)
}
.scrollContentBackground(.hidden)
.listStyle(.grouped)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ public final class WMFActivityTabViewModel: ObservableObject {
@Published public var timelineViewModel: TimelineViewModel
@Published public var emptyViewModel: WMFEmptyViewModel
@Published public var customizeViewModel: WMFActivityTabCustomizeViewModel
@Published public var shouldShowLogInPrompt: Bool = false
@Published var sections: [TimelineViewModel.TimelineSection] = [] {
didSet {
recomputeShouldShowEmptyState()
Expand Down Expand Up @@ -239,10 +238,6 @@ public final class WMFActivityTabViewModel: ObservableObject {
.store(in: &cancellables)

self.timelineViewModel.activityTabViewModel = self

Task {
await self.updateShouldShowLoginPrompt()
}
}

// MARK: - Loading
Expand Down Expand Up @@ -372,10 +367,6 @@ public final class WMFActivityTabViewModel: ObservableObject {
self.emptyViewModel = Self.generateEmptyViewModel(localizedStrings: localizedStrings, isLoggedIn: authState == .loggedIn)
self.customizeViewModel.isLoggedIn = authState == .loggedIn

Task {
await self.updateShouldShowLoginPrompt()
}

if self.authenticationState != .loggedIn {
updateUsername(username: nil)
timelineViewModel.setUser(username: nil)
Expand Down Expand Up @@ -454,9 +445,4 @@ public final class WMFActivityTabViewModel: ObservableObject {
func formatDate(_ dateTime: Date) -> String {
DateFormatter.wmfMonthDayYearDateFormatter.string(from: dateTime)
}

func updateShouldShowLoginPrompt() async {
let shouldShow = await dataController.shouldShowLoginPrompt(for: authenticationState)
shouldShowLogInPrompt = shouldShow
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -137,41 +137,6 @@ public actor WMFActivityTabDataController {

return Array(weeklyCounts.reversed())
}

public func shouldShowLoginPrompt(for state: LoginState) -> Bool {
switch state {
case .loggedIn:
return false
case .temp:
return !tempAccountUserHasDismissedActivityTabLogInPrompt
case .loggedOut:
return !loggedOutUserHasDismissedActivityTabLogInPrompt
}
}

public var loggedOutUserHasDismissedActivityTabLogInPrompt: Bool {
get {
return (try? userDefaultsStore?.load(key: WMFUserDefaultsKey.activityTabUserDismissLogin.rawValue)) ?? false
} set {
try? userDefaultsStore?.save(key: WMFUserDefaultsKey.activityTabUserDismissLogin.rawValue, value: newValue)
}
}

public var tempAccountUserHasDismissedActivityTabLogInPrompt: Bool {
get {
return (try? userDefaultsStore?.load(key: WMFUserDefaultsKey.activityTabTempAccountUserDismissLogin.rawValue)) ?? false
} set {
try? userDefaultsStore?.save(key: WMFUserDefaultsKey.activityTabTempAccountUserDismissLogin.rawValue, value: newValue)
}
}

public func setLoggedOutUserHasDismissedActivityTabLogInPrompt(_ value: Bool) async {
loggedOutUserHasDismissedActivityTabLogInPrompt = value
}

public func setTempAccountUserHasDismissedActivityTabLogInPrompt(_ value: Bool) async {
tempAccountUserHasDismissedActivityTabLogInPrompt = value
}

public var hasSeenActivityTab: Bool {
get {
Expand Down
2 changes: 0 additions & 2 deletions WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public enum WMFUserDefaultsKey: String {
case hasSeenActivityTabNewOnboarding = "has-seen-activity-tab-new-onboarding"
case hasSeenActiviyTabSurvey = "has-seen-activity-tab-survey"
case hasSeenExploreSurvey = "has-seen-explore-survey"
case activityTabUserDismissLogin = "activity-tab-user-dismiss-login"
case activityTabTempAccountUserDismissLogin = "activity-tab-temp-account-user-dismiss-login"
case activityTabVisitCount = "activity-tab-visit-count"
case activityTabIsTimeSpentReadingOn = "activity-tab-time-spent-reading"
case activityTabIsReadingInsightsOn = "activity-tab-reading-insights"
Expand Down
Loading