Add context menu for follow notifications

Add context menu for status action notifications
Add context menu for account cell
2019-09-06 17:59:57 -04:00 · 2019-09-06 17:56:45 -04:00 · 2019-09-06 17:50:27 -04:00 · 2019-09-06 17:45:49 -04:00 · 2019-09-06 17:09:28 -04:00
10 changed files with 54 additions and 70 deletions
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@ -149,11 +149,9 @@
 		D6A3BC802321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7E2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift */; };
 		D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC7F2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib */; };
 		D6A3BC852321F6C100FD64D5 /* AccountListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC832321F6C100FD64D5 /* AccountListTableViewController.swift */; };
-		D6A3BC862321F6C100FD64D5 /* AccountListTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC842321F6C100FD64D5 /* AccountListTableViewController.xib */; };
 		D6A3BC8A2321F79B00FD64D5 /* AccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC882321F79B00FD64D5 /* AccountTableViewCell.swift */; };
 		D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC892321F79B00FD64D5 /* AccountTableViewCell.xib */; };
 		D6A3BC8F2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */; };
-		D6A3BC902321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC8E2321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib */; };
 		D6A5FAF1217B7E05003DB2D9 /* ComposeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */; };
 		D6A5FAFB217B86CE003DB2D9 /* OnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAFA217B86CE003DB2D9 /* OnboardingViewController.xib */; };
 		D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; };
@ -396,11 +394,9 @@
 		D6A3BC7E2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowNotificationGroupTableViewCell.swift; sourceTree = "<group>"; };
 		D6A3BC7F2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FollowNotificationGroupTableViewCell.xib; sourceTree = "<group>"; };
 		D6A3BC832321F6C100FD64D5 /* AccountListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountListTableViewController.swift; sourceTree = "<group>"; };
-		D6A3BC842321F6C100FD64D5 /* AccountListTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountListTableViewController.xib; sourceTree = "<group>"; };
 		D6A3BC882321F79B00FD64D5 /* AccountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTableViewCell.swift; sourceTree = "<group>"; };
 		D6A3BC892321F79B00FD64D5 /* AccountTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountTableViewCell.xib; sourceTree = "<group>"; };
 		D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListTableViewController.swift; sourceTree = "<group>"; };
-		D6A3BC8E2321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StatusActionAccountListTableViewController.xib; sourceTree = "<group>"; };
 		D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeViewController.xib; sourceTree = "<group>"; };
 		D6A5FAFA217B86CE003DB2D9 /* OnboardingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingViewController.xib; sourceTree = "<group>"; };
 		D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIActivity+Types.swift"; sourceTree = "<group>"; };
@ -959,7 +955,6 @@
 			isa = PBXGroup;
 			children = (
 				D6A3BC832321F6C100FD64D5 /* AccountListTableViewController.swift */,
-				D6A3BC842321F6C100FD64D5 /* AccountListTableViewController.xib */,
 			);
 			path = "Account List";
 			sourceTree = "<group>";
@ -977,7 +972,6 @@
 			isa = PBXGroup;
 			children = (
 				D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */,
-				D6A3BC8E2321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib */,
 			);
 			path = "Status Action Account List";
 			sourceTree = "<group>";
@ -1380,7 +1374,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D6A3BC862321F6C100FD64D5 /* AccountListTableViewController.xib in Resources */,
 				D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */,
 				D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */,
 				D6A3BC7D232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib in Resources */,
@ -1394,7 +1387,6 @@
 				D627FF79217E950100CC0648 /* DraftsTableViewController.xib in Resources */,
 				D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */,
 				0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */,
-				D6A3BC902321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib in Resources */,
 				D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */,
 				D60C07E421E8176B0057FAA8 /* ComposeMediaView.xib in Resources */,
 				D667E5E12134937B0057A976 /* StatusTableViewCell.xib in Resources */,
--- a/List/AccountListTableViewController.swift
+++ b/List/AccountListTableViewController.swift
@ -8,7 +8,7 @@

 import UIKit

-class AccountListTableViewController: UITableViewController {
+class AccountListTableViewController: EnhancedTableViewController {
        
    private let accountCell = "accountCell"
    
@ -17,7 +17,7 @@ class AccountListTableViewController: UITableViewController {
    init(accountIDs: [String]) {
        self.accountIDs = accountIDs
        
-        super.init(nibName: "AccountListTableViewController", bundle: .main)
+        super.init(style: .grouped)
    }
    
    required init?(coder: NSCoder) {
--- a/List/AccountListTableViewController.xib
+++ b/List/AccountListTableViewController.xib
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AccountListTableViewController" customModule="Tusker" customModuleProvider="target">
-            <connections>
-                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-            <viewLayoutGuide key="safeArea" id="vLr-E1-eTs"/>
-            <connections>
-                <outlet property="dataSource" destination="-1" id="Tng-2m-Rnh"/>
-                <outlet property="delegate" destination="-1" id="9aC-8N-iBw"/>
-            </connections>
-            <point key="canvasLocation" x="132" y="154"/>
-        </tableView>
-    </objects>
-</document>
--- a/Tusker/Screens/Compose/ComposeViewController.swift
+++ b/Tusker/Screens/Compose/ComposeViewController.swift
@ -431,6 +431,9 @@ class ComposeViewController: UIViewController {
        guard let text = statusTextView.text,
            !text.isEmpty else { return }
        
+        // save a draft before posting the status, so if a crash occurs during posting, the status won't be lost
+        saveDraft()
+
        // disable post button while sending post request
        postBarButtonItem.isEnabled = false
        
--- a/List/StatusActionAccountListTableViewController.swift
+++ b/List/StatusActionAccountListTableViewController.swift
@ -8,7 +8,7 @@

 import UIKit

-class StatusActionAccountListTableViewController: UITableViewController {
+class StatusActionAccountListTableViewController: EnhancedTableViewController {
        
    private let statusCell = "statusCell"
    private let accountCell = "accountCell"
@ -20,7 +20,7 @@ class StatusActionAccountListTableViewController: UITableViewController {
        self.statusID = statusID
        self.accountIDs = accountIDs
        
-        super.init(nibName: "StatusActionAccountListTableViewController", bundle: .main)
+        super.init(style: .grouped)
    }
    
    required init?(coder: NSCoder) {
--- a/List/StatusActionAccountListTableViewController.xib
+++ b/List/StatusActionAccountListTableViewController.xib
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StatusActionAccountListTableViewController" customModule="Tusker" customModuleProvider="target">
-            <connections>
-                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-            <viewLayoutGuide key="safeArea" id="vLr-E1-eTs"/>
-            <connections>
-                <outlet property="dataSource" destination="-1" id="Tng-2m-Rnh"/>
-                <outlet property="delegate" destination="-1" id="9aC-8N-iBw"/>
-            </connections>
-            <point key="canvasLocation" x="132" y="154"/>
-        </tableView>
-    </objects>
-</document>
--- a/Tusker/Screens/Utilities/Previewing.swift
+++ b/Tusker/Screens/Utilities/Previewing.swift
@ -69,6 +69,13 @@ extension MenuPreviewProvider {
        ]
    }
    
+    func actionsForNotificationGroup(_ group: NotificationGroup) -> [UIAction] {
+//        let notifications = group.notificationIDs.compactMap(MastodonCache.notification(for:))
+        return [
+            // todo: clear notifications option
+        ]
+    }
+
    private func createAction(identifier: String, title: String, systemImageName: String, handler: @escaping UIActionHandler) -> UIAction {
        return UIAction(title: title, image: UIImage(systemName: systemImageName), identifier: UIAction.Identifier(identifier), discoverabilityTitle: nil, attributes: [], state: .off, handler: handler)
    }
--- a/Cell/AccountTableViewCell.swift
+++ b/Cell/AccountTableViewCell.swift
@ -65,3 +65,11 @@ class AccountTableViewCell: UITableViewCell {
    }
    
 }
+
+extension AccountTableViewCell: MenuPreviewProvider {
+    
+    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
+        return (content: { ProfileTableViewController(accountID: self.accountID) }, actions: { self.actionsForProfile(accountID: self.accountID) })
+    }
+    
+}
--- a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
@ -155,9 +155,22 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
        
        if selected {
            let notifications = group.notificationIDs.compactMap(MastodonCache.notification(for:))
-            let accountIDs = notifications.compactMap { $0.account.id }
+            let accountIDs = notifications.map { $0.account.id }
            delegate?.showStatusActionAccountList(statusID: statusID, accountIDs: accountIDs, action: notifications.first!.kind)
        }
    }
    
 }
+
+extension ActionNotificationGroupTableViewCell: MenuPreviewProvider {
+    
+    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
+        return (content: {
+            let accountIDs = self.group.notificationIDs.compactMap(MastodonCache.notification(for:)).map { $0.account.id }
+            return StatusActionAccountListTableViewController(statusID: self.statusID, accountIDs: accountIDs)
+        }, actions: {
+            return self.actionsForNotificationGroup(self.group)
+        })
+    }
+    
+}
--- a/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
@ -130,3 +130,20 @@ class FollowNotificationGroupTableViewCell: UITableViewCell {
    }
    
 }
+
+extension FollowNotificationGroupTableViewCell: MenuPreviewProvider {
+    
+    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
+        return (content: {
+            let accountIDs = self.group.notificationIDs.compactMap(MastodonCache.notification(for:)).map { $0.account.id }
+            if accountIDs.count == 1 {
+                return ProfileTableViewController(accountID: accountIDs.first!)
+            } else {
+                return AccountListTableViewController(accountIDs: accountIDs)
+            }
+        }, actions: {
+            return self.actionsForNotificationGroup(self.group)
+        })
+    }
+    
+}
Author	SHA1	Message	Date
Shadowfacts	49380692f3	Add context menu for follow notifications	2019-09-06 17:59:57 -04:00
Shadowfacts	8723921cec	Add context menu for status action notifications	2019-09-06 17:56:45 -04:00
Shadowfacts	817ebcb7eb	Add context menu for account cell	2019-09-06 17:50:27 -04:00
Shadowfacts	9522509f8f	Remove unnecessary XIBs	2019-09-06 17:45:49 -04:00
Shadowfacts	006af1ab79	Save status draft while posting to prevent data loss due to crashes Closes #33	2019-09-06 17:09:28 -04:00