Mastodon
/
metatext-app-ios-iphone-ipad
mirror of https://github.com/metabolist/metatext
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix preferences when browsing

This commit is contained in:
Justin Mazzocchi 2021-01-31 08:10:34 -08:00
parent e50b2bddad
commit cdec2e0082
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ServiceLayer/Sources/ServiceLayer/Services/IdentityService.swift
View File

@ -190,10 +190,10 @@ public extension IdentityService {
contentDatabase.pickerEmojisPublisher() contentDatabase.pickerEmojisPublisher()
} }
func updatePreferences(_ preferences: Identity.Preferences) -> AnyPublisher<Never, Error> { func updatePreferences(_ preferences: Identity.Preferences, authenticated: Bool) -> AnyPublisher<Never, Error> {
identityDatabase.updatePreferences(preferences, id: id) identityDatabase.updatePreferences(preferences, id: id)
.collect() .collect()
.filter { _ in preferences.useServerPostingReadingPreferences } .filter { _ in preferences.useServerPostingReadingPreferences && authenticated }
.flatMap { _ in refreshServerPreferences() } .flatMap { _ in refreshServerPreferences() }
.eraseToAnyPublisher() .eraseToAnyPublisher()
} }

6
ViewModels/Sources/ViewModels/View Models/PreferencesViewModel.swift
View File

@ -26,7 +26,11 @@ public final class PreferencesViewModel: ObservableObject {
$preferences $preferences
.dropFirst() .dropFirst()
.flatMap(identityContext.service.updatePreferences) .flatMap {
identityContext.service.updatePreferences(
$0,
authenticated: identityContext.identity.authenticated)
}
.assignErrorsToAlertItem(to: \.alertItem, on: self) .assignErrorsToAlertItem(to: \.alertItem, on: self)
.sink { _ in } .sink { _ in }
.store(in: &cancellables) .store(in: &cancellables)

6
Views/SwiftUI/PreferencesView.swift
View File

@ -59,7 +59,8 @@ struct PreferencesView: View {
Toggle("preferences.reading-expand-spoilers", Toggle("preferences.reading-expand-spoilers",
isOn: $viewModel.preferences.readingExpandSpoilers) isOn: $viewModel.preferences.readingExpandSpoilers)
} }
.disabled(viewModel.preferences.useServerPostingReadingPreferences) .disabled(viewModel.preferences.useServerPostingReadingPreferences
&& viewModel.identityContext.identity.authenticated)
} }
Section(header: Text("preferences.app")) { Section(header: Text("preferences.app")) {
Picker("preferences.status-word", Picker("preferences.status-word",
@ -100,6 +101,8 @@ struct PreferencesView: View {
.disabled(reduceMotion) .disabled(reduceMotion)
Toggle("preferences.show-reblog-and-favorite-counts", Toggle("preferences.show-reblog-and-favorite-counts",
isOn: $identityContext.appPreferences.showReblogAndFavoriteCounts) isOn: $identityContext.appPreferences.showReblogAndFavoriteCounts)
if viewModel.identityContext.identity.authenticated
&& !viewModel.identityContext.identity.pending {
Picker("preferences.home-timeline-position-on-startup", Picker("preferences.home-timeline-position-on-startup",
selection: $identityContext.appPreferences.homeTimelineBehavior) { selection: $identityContext.appPreferences.homeTimelineBehavior) {
ForEach(AppPreferences.PositionBehavior.allCases) { option in ForEach(AppPreferences.PositionBehavior.allCases) { option in
@ -114,6 +117,7 @@ struct PreferencesView: View {
} }
} }
} }
}
.navigationTitle("preferences") .navigationTitle("preferences")
.alertItem($viewModel.alertItem) .alertItem($viewModel.alertItem)
} }