zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Move selection of “Everything” vs. “Mentions” back to the navigation bar

Browse Source 
Contributes to #399 [BUG] Multiple interactions do not collapse into a single notification
This commit is contained in:
shannon 2025-03-06 12:03:29 -05:00
parent eb469917ed
commit f78f432932
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift
View File

@ -10,6 +10,7 @@ import SwiftUI
class NotificationListViewController: UIHostingController<NotificationListView>
{
fileprivate var viewModel: NotificationListViewModel
private var picker = UISegmentedControl(items: [ ListType.everything.pickerLabel, ListType.mentions.pickerLabel ])
init() {
viewModel = NotificationListViewModel()
@ -35,6 +36,14 @@ class NotificationListViewController: UIHostingController<NotificationListView>
scene: scene, from: self, transition: transition)
}
}
picker.translatesAutoresizingMaskIntoConstraints = false
picker.selectedSegmentIndex = 0
navigationItem.titleView = picker
NSLayoutConstraint.activate([
picker.widthAnchor.constraint(greaterThanOrEqualToConstant: 287)
])
picker.addTarget(self, action: #selector(pickerValueChanged(_:)), for: .valueChanged)
}
required init?(coder aDecoder: NSCoder) {
@ -46,6 +55,10 @@ class NotificationListViewController: UIHostingController<NotificationListView>
viewModel.checkCanGroupNotifications()
}
@objc private func pickerValueChanged(_ sender: UISegmentedControl) {
viewModel.displayedNotifications = ListType(rawValue: sender.selectedSegmentIndex) ?? .everything
}
@objc private func showNotificationPolicySettings(_ sender: Any) {
guard let policy = viewModel.filteredNotificationsViewModel.policy else { return }
Task {
@ -69,9 +82,9 @@ extension NotificationListViewController: NotificationPolicyViewControllerDelega
}
}
private enum ListType {
case everything
case mentions
private enum ListType: Int {
case everything = 0
case mentions = 1
var pickerLabel: String {
switch self {
@ -106,24 +119,6 @@ struct NotificationListView: View {
var body: some View {
VStack {
Spacer().frame(maxHeight: 8)
HStack {
Spacer()
Picker(selection: $viewModel.displayedNotifications) {
ForEach(
[ListType.everything, .mentions]
) {
Text($0.pickerLabel)
.tag($0)
}
} label: {
}
.pickerStyle(.segmented)
.padding(.horizontal)
.fixedSize()
Spacer()
}
ScrollViewReader { proxy in
List {
ForEach(viewModel.notificationItems, id: \.self) { item in // without explicit id, scrollTo(:) does not work
@ -272,7 +267,7 @@ struct NotificationListView: View {
@MainActor
private class NotificationListViewModel: ObservableObject {
@Published var displayedNotifications: ListType = .everything {
var displayedNotifications: ListType = .everything {
didSet {
Task { [weak self] in
guard let self else { return }