Skip to content

Commit 4a90e48

Browse files
Remove obsolete reference to Setting
Fixes build failure after migrating Setting out of CoreData
1 parent 4199f96 commit 4a90e48

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

Mastodon/Scene/Settings/General Settings/GeneralSettingsViewController.swift

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct GeneralSettingsViewModel {
1919
}
2020

2121
protocol GeneralSettingsViewControllerDelegate: AnyObject {
22-
func save(_ viewController: UIViewController, setting: Setting, viewModel: GeneralSettingsViewModel)
22+
func save(_ viewController: UIViewController, viewModel: GeneralSettingsViewModel)
2323
func showLanguagePicker(_ viewModel: GeneralSettingsViewModel, onLanguageSelected: @escaping OnLanguageSelected)
2424
}
2525

@@ -31,11 +31,10 @@ class GeneralSettingsViewController: UIViewController {
3131
var tableViewDataSource: GeneralSettingsDiffableTableViewDataSource?
3232

3333
private(set) var viewModel: GeneralSettingsViewModel
34-
let setting: Setting
3534

3635
let sections: [GeneralSettingsSection]
3736

38-
init(appContext: AppContext, setting: Setting) {
37+
init(appContext: AppContext) {
3938
tableView = UITableView(frame: .zero, style: .insetGrouped)
4039
tableView.translatesAutoresizingMaskIntoConstraints = false
4140
tableView.register(GeneralSettingSelectionCell.self, forCellReuseIdentifier: GeneralSettingSelectionCell.reuseIdentifier)
@@ -83,8 +82,6 @@ class GeneralSettingsViewController: UIViewController {
8382
defaultPostLanguage: UserDefaults.shared.defaultPostLanguage
8483
)
8584

86-
self.setting = setting
87-
8885
super.init(nibName: nil, bundle: nil)
8986

9087
tableView.delegate = self
@@ -198,7 +195,7 @@ extension GeneralSettingsViewController: UITableViewDelegate {
198195
}
199196

200197
tableView.deselectRow(at: indexPath, animated: true)
201-
delegate?.save(self, setting: setting, viewModel: viewModel)
198+
delegate?.save(self, viewModel: viewModel)
202199
}
203200
}
204201

@@ -225,6 +222,6 @@ extension GeneralSettingsViewController: GeneralSettingToggleTableViewCellDelega
225222
}
226223
}
227224

228-
delegate?.save(self, setting: self.setting, viewModel: viewModel)
225+
delegate?.save(self, viewModel: viewModel)
229226
}
230227
}

Mastodon/Scene/Settings/SettingsCoordinator.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ extension SettingsCoordinator: SettingsViewControllerDelegate {
7878
switch entry {
7979
case .general:
8080

81-
let generalSettingsViewController = GeneralSettingsViewController(appContext: appContext, setting: setting)
81+
let generalSettingsViewController = GeneralSettingsViewController(appContext: appContext)
8282
generalSettingsViewController.delegate = self
8383

8484
navigationController.pushViewController(generalSettingsViewController, animated: true)
@@ -189,7 +189,8 @@ extension SettingsCoordinator: ASWebAuthenticationPresentationContextProviding {
189189

190190
//MARK: - GeneralSettingsViewControllerDelegate
191191
extension SettingsCoordinator: GeneralSettingsViewControllerDelegate {
192-
func save(_ viewController: UIViewController, setting: Setting, viewModel: GeneralSettingsViewModel) {
192+
193+
func save(_ viewController: UIViewController, viewModel: GeneralSettingsViewModel) {
193194
UserDefaults.shared.customUserInterfaceStyle = viewModel.selectedAppearence.interfaceStyle
194195
UserDefaults.shared.preferredStaticEmoji = viewModel.playAnimations == false
195196
UserDefaults.shared.preferredStaticAvatar = viewModel.playAnimations == false

0 commit comments

Comments
 (0)