From f909c1da10e1d27584b702fc996128dbaaaa32af Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 19 May 2024 15:14:03 -0400 Subject: [PATCH] Fix selecting follow request push notification Closes #474 --- Tusker.xcodeproj/project.pbxproj | 4 + ...lowRequestNotificationViewController.swift | 144 ++++++++++++++++++ .../NotificationLoadingViewController.swift | 3 +- 3 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 Tusker/Screens/Notifications/FollowRequestNotificationViewController.swift diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index 2125d706..d38a2348 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -36,6 +36,7 @@ D60E2F2E244248BF005F8713 /* MastodonCachePersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */; }; D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */; }; D6114E1127F899B30080E273 /* TrendingLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */; }; + D6187BED2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */; }; D61A45E628DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */; }; D61A45E828DF477D002BE511 /* LoadingCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */; }; D61A45EA28DF51EE002BE511 /* TimelineLikeCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */; }; @@ -467,6 +468,7 @@ D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonCachePersistentStore.swift; sourceTree = ""; }; D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusesViewController.swift; sourceTree = ""; }; D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinksViewController.swift; sourceTree = ""; }; + D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowRequestNotificationViewController.swift; sourceTree = ""; }; D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmLoadMoreCollectionViewCell.swift; sourceTree = ""; }; D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingCollectionViewCell.swift; sourceTree = ""; }; D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineLikeCollectionViewController.swift; sourceTree = ""; }; @@ -1164,6 +1166,7 @@ D646DCD92A081A2C0059ECEB /* PollFinishedNotificationCollectionViewCell.swift */, D646DCDB2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift */, D68245112BCA1F4000AFB38B /* NotificationLoadingViewController.swift */, + D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */, ); path = Notifications; sourceTree = ""; @@ -2234,6 +2237,7 @@ D65A261D2BC39399005EB5D8 /* PushInstanceSettingsView.swift in Sources */, D65C6BF525478A9C00A6E89C /* BackgroundableViewController.swift in Sources */, D61DC84D28F500D200B82C6E /* ProfileViewController.swift in Sources */, + D6187BED2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift in Sources */, D600891F29848DE2005B4D00 /* AddInstancePinnedTimelineView.swift in Sources */, D693A72F25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift in Sources */, D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */, diff --git a/Tusker/Screens/Notifications/FollowRequestNotificationViewController.swift b/Tusker/Screens/Notifications/FollowRequestNotificationViewController.swift new file mode 100644 index 00000000..52294702 --- /dev/null +++ b/Tusker/Screens/Notifications/FollowRequestNotificationViewController.swift @@ -0,0 +1,144 @@ +// +// FollowRequestNotificationViewController.swift +// Tusker +// +// Created by Shadowfacts on 5/19/24. +// Copyright © 2024 Shadowfacts. All rights reserved. +// + +import UIKit +import Pachyderm + +class FollowRequestNotificationViewController: UIViewController, CollectionViewController { + + private let mastodonController: MastodonController + private let notification: Pachyderm.Notification + + var collectionView: UICollectionView! { + view as? UICollectionView + } + private var dataSource: UICollectionViewDiffableDataSource! + + init(notification: Pachyderm.Notification, mastodonController: MastodonController) { + precondition(notification.kind == .followRequest) + self.mastodonController = mastodonController + self.notification = notification + + super.init(nibName: nil, bundle: nil) + + title = "Follow Request" + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func loadView() { + let layout = UICollectionViewCompositionalLayout { sectionIndex, environment in + var config = UICollectionLayoutListConfiguration(appearance: .grouped) + config.backgroundColor = .appGroupedBackground + let section = NSCollectionLayoutSection.list(using: config, layoutEnvironment: environment) + section.readableContentInset(in: environment) + return section + } + view = UICollectionView(frame: .zero, collectionViewLayout: layout) + collectionView.delegate = self + collectionView.dragDelegate = self + collectionView.allowsFocus = true + dataSource = createDataSource() + } + + private func createDataSource() -> UICollectionViewDiffableDataSource { + let followRequestCell = UICollectionView.CellRegistration { [unowned self] cell, indexPath, itemIdentifier in + cell.delegate = self + cell.updateUI(notification: self.notification) + } + return UICollectionViewDiffableDataSource(collectionView: collectionView) { collectionView, indexPath, itemIdentifier in + return collectionView.dequeueConfiguredReusableCell(using: followRequestCell, for: indexPath, item: ()) + } + } + + override func viewDidLoad() { + super.viewDidLoad() + + var snapshot = NSDiffableDataSourceSnapshot() + snapshot.appendSections([.notifications]) + snapshot.appendItems([.notification]) + dataSource.apply(snapshot, animatingDifferences: false) + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + clearSelectionOnAppear(animated: animated) + } +} + +extension FollowRequestNotificationViewController { + enum Section { + case notifications + } + enum Item { + case notification + } +} + +extension FollowRequestNotificationViewController: UICollectionViewDelegate { + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + selected(account: notification.account.id) + } + + func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? { + guard let cell = collectionView.cellForItem(at: indexPath) else { + return nil + } + let accountID = notification.account.id + return UIContextMenuConfiguration { + ProfileViewController(accountID: accountID, mastodonController: self.mastodonController) + } actionProvider: { _ in + let cell = cell as! FollowRequestNotificationCollectionViewCell + let acceptRejectChildren = [ + UIAction(title: "Accept", image: UIImage(systemName: "checkmark.circle"), handler: { _ in cell.acceptButtonPressed() }), + UIAction(title: "Reject", image: UIImage(systemName: "xmark.circle"), handler: { _ in cell.rejectButtonPressed() }), + ] + let acceptRejectMenu: UIMenu + if #available(iOS 16.0, *) { + acceptRejectMenu = UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren) + } else { + acceptRejectMenu = UIMenu(options: .displayInline, children: acceptRejectChildren) + } + return UIMenu(children: [ + acceptRejectMenu, + UIMenu(options: .displayInline, children: self.actionsForProfile(accountID: accountID, source: .view(cell))), + ]) + } + } + + func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: any UIContextMenuInteractionCommitAnimating) { + MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: self) + } +} + +extension FollowRequestNotificationViewController: UICollectionViewDragDelegate { + func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: any UIDragSession, at indexPath: IndexPath) -> [UIDragItem] { + let provider = NSItemProvider(object: notification.account.url as NSURL) + let activity = UserActivityManager.showProfileActivity(id: notification.account.id, accountID: mastodonController.accountInfo!.id) + activity.displaysAuxiliaryScene = true + provider.registerObject(activity, visibility: .all) + return [UIDragItem(itemProvider: provider)] + } +} + +extension FollowRequestNotificationViewController: TuskerNavigationDelegate { + var apiController: MastodonController! { mastodonController } +} + +extension FollowRequestNotificationViewController: MenuActionProvider { +} + +extension FollowRequestNotificationViewController: StatusBarTappableViewController { + func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult { + collectionView.scrollToTop() + return .stop + } +} diff --git a/Tusker/Screens/Notifications/NotificationLoadingViewController.swift b/Tusker/Screens/Notifications/NotificationLoadingViewController.swift index 5bb28e7e..2bdf9767 100644 --- a/Tusker/Screens/Notifications/NotificationLoadingViewController.swift +++ b/Tusker/Screens/Notifications/NotificationLoadingViewController.swift @@ -89,8 +89,7 @@ class NotificationLoadingViewController: UIViewController { case .follow: vc = ProfileViewController(accountID: notification.account.id, mastodonController: mastodonController) case .followRequest: - // todo - return + vc = FollowRequestNotificationViewController(notification: notification, mastodonController: mastodonController) case .unknown: showLoadingError(Error.unknownType) return