Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Read notification-setting from CoreData (IOS-14) 

aka subscription
This commit is contained in:
Nathan Mattes 2023-09-25 18:18:27 +02:00
parent 00fa7e1220
commit f2180034ee
5 changed files with 64 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mastodon/Coordinator/SceneCoordinator.swift
View File

@ -543,7 +543,8 @@ private extension SceneCoordinator {
let settingsCoordinator = SettingsCoordinator(presentedOn: presentedOn,
accountName: accountName,
setting: setting)
setting: setting,
appContext: appContext)
settingsCoordinator.delegate = self
settingsCoordinator.start()

34
Mastodon/Scene/Settings/Notification Settings/NotificationSettings.swift
View File

@ -2,6 +2,8 @@
import Foundation
import MastodonLocalization
import MastodonSDK
import CoreDataStack
struct NotificationSettingsSection: Hashable {
let entries: [NotificationSettingEntry]
@ -34,6 +36,19 @@ enum NotificationPolicy: Hashable, CaseIterable {
return L10n.Scene.Settings.Notifications.Policy.noone
}
}
var subscriptionPolicy: Mastodon.API.Subscriptions.Policy {
switch self {
case .anyone:
return .all
case .followers:
return .follower
case .follow:
return .followed
case .noone:
return .none
}
}
}
enum NotificationAlert: Hashable, CaseIterable {
@ -56,3 +71,22 @@ enum NotificationAlert: Hashable, CaseIterable {
}
}
}
extension Subscription {
var notificationPolicy: NotificationPolicy? {
guard let policy else { return nil }
switch policy {
case .all:
return .anyone
case .followed:
return .follow
case .follower:
return .followers
case .none:
return .noone
case ._other(_):
return .noone
}
}
}

7
Mastodon/Scene/Settings/Notification Settings/NotificationSettingsViewController.swift
View File

@ -1,6 +1,7 @@
// Copyright © 2023 Mastodon gGmbH. All rights reserved.
import UIKit
import CoreDataStack
import MastodonLocalization
protocol NotificationSettingsViewControllerDelegate: AnyObject {
@ -17,10 +18,8 @@ class NotificationSettingsViewController: UIViewController {
let sections: [NotificationSettingsSection]
var viewModel: NotificationSettingsViewModel
init() {
//TODO: @zeitschlag Read Settings
viewModel = NotificationSettingsViewModel(selectedPolicy: .follow)
init(currentSetting: Setting?) {
viewModel = NotificationSettingsViewModel(selectedPolicy: currentSetting?.activeSubscription?.notificationPolicy ?? .noone)
sections = [
NotificationSettingsSection(entries: [.policy]),
NotificationSettingsSection(entries: NotificationAlert.allCases.map { NotificationSettingEntry.alert($0) } )

41
Mastodon/Scene/Settings/SettingsCoordinator.swift
View File

@ -21,11 +21,13 @@ class SettingsCoordinator: NSObject, Coordinator {
private let settingsViewController: SettingsViewController
let setting: Setting
let appContext: AppContext
init(presentedOn: UIViewController, accountName: String, setting: Setting) {
init(presentedOn: UIViewController, accountName: String, setting: Setting, appContext: AppContext) {
self.presentedOn = presentedOn
navigationController = UINavigationController()
self.setting = setting
self.appContext = appContext
settingsViewController = SettingsViewController(accountName: accountName)
}
@ -46,26 +48,29 @@ extension SettingsCoordinator: SettingsViewControllerDelegate {
func didSelect(_ viewController: UIViewController, entry: SettingsEntry) {
switch entry {
case .general:
let generalSettingsViewController = GeneralSettingsViewController(setting: setting)
generalSettingsViewController.delegate = self
case .general:
let generalSettingsViewController = GeneralSettingsViewController(setting: setting)
generalSettingsViewController.delegate = self
navigationController.pushViewController(generalSettingsViewController, animated: true)
case .notifications:
let notificationViewController = NotificationSettingsViewController()
notificationViewController.delegate = self
navigationController.pushViewController(generalSettingsViewController, animated: true)
case .notifications:
navigationController.pushViewController(notificationViewController, animated: true)
case .aboutMastodon:
let aboutViewController = AboutViewController()
aboutViewController.delegate = self
let currentSetting = appContext.settingService.currentSetting.value
let notificationViewController = NotificationSettingsViewController(currentSetting: currentSetting)
notificationViewController.delegate = self
navigationController.pushViewController(aboutViewController, animated: true)
case .supportMastodon:
break
// present support-screen
case .logout(_):
delegate?.logout(self)
self.navigationController.pushViewController(notificationViewController, animated: true)
case .aboutMastodon:
let aboutViewController = AboutViewController()
aboutViewController.delegate = self
navigationController.pushViewController(aboutViewController, animated: true)
case .supportMastodon:
break
// present support-screen
case .logout(_):
delegate?.logout(self)
}
}
}

4
MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/Subscription.swift
View File

@ -13,8 +13,8 @@ public typealias NotificationSubscription = Subscription
extension Subscription {
public var policy: Mastodon.API.Subscriptions.Policy {
return Mastodon.API.Subscriptions.Policy(rawValue: policyRaw) ?? .all
public var policy: Mastodon.API.Subscriptions.Policy? {
return Mastodon.API.Subscriptions.Policy(rawValue: policyRaw)
}
}