Pachyderm/Client.swift

@@ -271,11 +271,10 @@ public class Client {
     }
     
     // MARK: - Search
-    public func search(query: String, resolve: Bool? = nil, limit: Int? = nil) -> Request<SearchResults> {
+    public func search(query: String, resolve: Bool? = nil) -> Request<SearchResults> {
         return Request<SearchResults>(method: .get, path: "/api/v2/search", queryParameters: [
                 "q" => query,
-                "resolve" => resolve,
+                "resolve" => resolve
-                "limit" => limit
             ])
     }
     

Pachyderm/Model/Hashtag.swift

@@ -39,13 +39,3 @@ extension Hashtag {
         }
     }
 }
-
-extension Hashtag: Equatable, Hashable {
-    public static func ==(lhs: Hashtag, rhs: Hashtag) -> Bool {
-        return lhs.url == rhs.url
-    }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(url)
-    }
-}

Pachyderm/Model/SearchResults.swift

@@ -11,7 +11,7 @@ import Foundation
 public class SearchResults: Decodable {
     public let accounts: [Account]
     public let statuses: [Status]
-    public let hashtags: [Hashtag]
+    public let hashtags: [String]
     
     private enum CodingKeys: String, CodingKey {
         case accounts

Tusker.xcodeproj/project.pbxproj

@@ -69,8 +69,6 @@
 		D6109A0D214599E100432DC2 /* RequestRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0C214599E100432DC2 /* RequestRange.swift */; };
 		D6109A0F21459B6900432DC2 /* Pagination.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0E21459B6900432DC2 /* Pagination.swift */; };
 		D6109A11214607D500432DC2 /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A10214607D500432DC2 /* Timeline.swift */; };
-		D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */; };
-		D611C2D0232DC61100C86A49 /* HashtagTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */; };
 		D6163F2C21AA0AF1008DAC41 /* MyProfileTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6163F2B21AA0AF1008DAC41 /* MyProfileTableViewController.swift */; };
 		D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF75217E923E00CC0648 /* DraftsManager.swift */; };
 		D627FF79217E950100CC0648 /* DraftsTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627FF78217E950100CC0648 /* DraftsTableViewController.xib */; };
@@ -172,7 +170,6 @@
 		D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */; };
 		D6BC9DB5232D4CE3002CA326 /* NotificationsMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB4232D4CE3002CA326 /* NotificationsMode.swift */; };
 		D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */; };
-		D6BC9DDA232D8BE5002CA326 /* SearchTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD9232D8BE5002CA326 /* SearchTableViewController.swift */; };
 		D6BED170212663DA00F02DA0 /* SwiftSoup.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D6BED174212667E900F02DA0 /* StatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BED173212667E900F02DA0 /* StatusTableViewCell.swift */; };
 		D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */; };
@@ -324,8 +321,6 @@
 		D6109A0C214599E100432DC2 /* RequestRange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestRange.swift; sourceTree = "<group>"; };
 		D6109A0E21459B6900432DC2 /* Pagination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pagination.swift; sourceTree = "<group>"; };
 		D6109A10214607D500432DC2 /* Timeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timeline.swift; sourceTree = "<group>"; };
-		D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HashtagTableViewCell.swift; sourceTree = "<group>"; };
-		D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HashtagTableViewCell.xib; sourceTree = "<group>"; };
 		D6163F2B21AA0AF1008DAC41 /* MyProfileTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyProfileTableViewController.swift; sourceTree = "<group>"; };
 		D627FF75217E923E00CC0648 /* DraftsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsManager.swift; sourceTree = "<group>"; };
 		D627FF78217E950100CC0648 /* DraftsTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DraftsTableViewController.xib; sourceTree = "<group>"; };
@@ -425,7 +420,6 @@
 		D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellnessPrefsView.swift; sourceTree = "<group>"; };
 		D6BC9DB4232D4CE3002CA326 /* NotificationsMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsMode.swift; sourceTree = "<group>"; };
 		D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelinesPageViewController.swift; sourceTree = "<group>"; };
-		D6BC9DD9232D8BE5002CA326 /* SearchTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTableViewController.swift; sourceTree = "<group>"; };
 		D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwiftSoup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6BED173212667E900F02DA0 /* StatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusTableViewCell.swift; sourceTree = "<group>"; };
 		D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerNavigationDelegate.swift; sourceTree = "<group>"; };
@@ -665,15 +659,6 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		D611C2CC232DC5FC00C86A49 /* Hashtag Cell */ = {
-			isa = PBXGroup;
-			children = (
-				D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */,
-				D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */,
-			);
-			path = "Hashtag Cell";
-			sourceTree = "<group>";
-		};
 		D627FF77217E94F200CC0648 /* Drafts */ = {
 			isa = PBXGroup;
 			children = (
@@ -706,7 +691,6 @@
 				D641C785213DD83B004B4513 /* Conversation */,
 				D641C786213DD852004B4513 /* Notifications */,
 				D641C787213DD862004B4513 /* Compose */,
-				D6BC9DD8232D8BCA002CA326 /* Search */,
 				D641C788213DD86D004B4513 /* Large Image */,
 				0411610422B4571E0030A9B7 /* Attachment */,
 				0411610522B457290030A9B7 /* Gallery */,
@@ -1030,14 +1014,6 @@
 			path = "Account Activities";
 			sourceTree = "<group>";
 		};
-		D6BC9DD8232D8BCA002CA326 /* Search */ = {
-			isa = PBXGroup;
-			children = (
-				D6BC9DD9232D8BE5002CA326 /* SearchTableViewController.swift */,
-			);
-			path = Search;
-			sourceTree = "<group>";
-		};
 		D6BED1722126661300F02DA0 /* Views */ = {
 			isa = PBXGroup;
 			children = (
@@ -1054,7 +1030,6 @@
 				D641C78B213DD92F004B4513 /* Profile Header */,
 				D641C78C213DD937004B4513 /* Notifications */,
 				D6A3BC872321F78000FD64D5 /* Account Cell */,
-				D611C2CC232DC5FC00C86A49 /* Hashtag Cell */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1417,7 +1392,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D611C2D0232DC61100C86A49 /* HashtagTableViewCell.xib in Resources */,
 				D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */,
 				D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */,
 				D6A3BC7D232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib in Resources */,
@@ -1544,7 +1518,6 @@
 				D6C7D27D22B6EBF800071952 /* AttachmentsContainerView.swift in Sources */,
 				D6F953F021251A2900CF0F2B /* MastodonController.swift in Sources */,
 				0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */,
-				D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */,
 				D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */,
 				D66362712136338600C9CBA2 /* ComposeViewController.swift in Sources */,
 				D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */,
@@ -1564,7 +1537,6 @@
 				D6AEBB4823216B1D00E5038B /* AccountActivity.swift in Sources */,
 				D6333B772138D94E00CE884A /* ComposeMediaView.swift in Sources */,
 				04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */,
-				D6BC9DDA232D8BE5002CA326 /* SearchTableViewController.swift in Sources */,
 				D627FF7F217E95E000CC0648 /* DraftTableViewCell.swift in Sources */,
 				D6AEBB4A23216F0400E5038B /* UnfollowAccountActivity.swift in Sources */,
 				D663626421360D2300C9CBA2 /* AvatarStyle.swift in Sources */,

Tusker/Screens/Main/MainTabBarViewController.swift

@@ -19,7 +19,6 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
             embedInNavigationController(TimelinesPageViewController()),
             embedInNavigationController(NotificationsPageViewController()),
             ComposeViewController(),
-            embedInNavigationController(SearchTableViewController()),
             embedInNavigationController(MyProfileTableViewController()),
         ]
     }

Tusker/Screens/Search/SearchTableViewController.swift

@@ -1,181 +0,0 @@
-//
-//  SearchTableViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 9/14/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Combine
-import Pachyderm
-
-fileprivate let accountCell = "accountCell"
-fileprivate let statusCell = "statusCell"
-fileprivate let hashtagCell = "hashtagCell"
-
-class SearchTableViewController: EnhancedTableViewController {
-
-    var dataSource: UITableViewDiffableDataSource<Section, Item>!
-    let searchController = UISearchController(searchResultsController: nil)
-    
-    var activityIndicator: UIActivityIndicatorView!
-    
-    let searchSubject = PassthroughSubject<String?, Never>()
-    var currentQuery: String?
-    
-    init() {
-        super.init(style: .grouped)
-        
-        title = NSLocalizedString("Search", comment: "search tab title")
-        tabBarItem.image = UIImage(systemName: "magnifyingglass")
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        tableView.register(UINib(nibName: "AccountTableViewCell", bundle: .main), forCellReuseIdentifier: accountCell)
-        tableView.register(UINib(nibName: "StatusTableViewCell", bundle: .main), forCellReuseIdentifier: statusCell)
-        tableView.register(UINib(nibName: "HashtagTableViewCell", bundle: .main), forCellReuseIdentifier: hashtagCell)
-        
-        dataSource = DataSource(tableView: tableView, cellProvider: { (tableView, indexPath, item) -> UITableViewCell? in
-            switch item {
-            case let .account(id):
-                let cell = tableView.dequeueReusableCell(withIdentifier: accountCell, for: indexPath) as! AccountTableViewCell
-                cell.updateUI(accountID: id)
-                cell.delegate = self
-                return cell
-            case let .hashtag(tag):
-                let cell = tableView.dequeueReusableCell(withIdentifier: hashtagCell, for: indexPath) as! HashtagTableViewCell
-                cell.updateUI(hashtag: tag)
-                cell.delegate = self
-                return cell
-            case let .status(id):
-                let cell = tableView.dequeueReusableCell(withIdentifier: statusCell, for: indexPath) as! StatusTableViewCell
-                cell.updateUI(statusID: id)
-                cell.delegate = self
-                return cell
-            }
-        })
-        
-        searchController.searchResultsUpdater = self
-        searchController.obscuresBackgroundDuringPresentation = false
-        searchController.searchBar.placeholder = NSLocalizedString("Search or Enter URL", comment: "search field placeholder")
-        searchController.searchBar.delegate = self
-        navigationItem.searchController = searchController
-        definesPresentationContext = true
-        
-        activityIndicator = UIActivityIndicatorView(style: .large)
-        activityIndicator.translatesAutoresizingMaskIntoConstraints = false
-        activityIndicator.isHidden = true
-        view.addSubview(activityIndicator)
-        NSLayoutConstraint.activate([
-            activityIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor),
-            activityIndicator.topAnchor.constraint(equalTo: view.topAnchor, constant: 8)
-        ])
-
-        _ = searchSubject
-            .debounce(for: .milliseconds(500), scheduler: RunLoop.main)
-            .map { $0?.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { $0 != self.currentQuery }
-            .sink(receiveValue: performSearch(query:))
-    }
-    
-    func performSearch(query: String?) {
-        guard let query = query, !query.isEmpty else {
-            self.dataSource.apply(NSDiffableDataSourceSnapshot<Section, Item>())
-            return
-        }
-        self.currentQuery = query
-        
-        if self.dataSource.snapshot().numberOfItems == 0 {
-            activityIndicator.isHidden = false
-            activityIndicator.startAnimating()
-        }
-        
-        let request = MastodonController.client.search(query: query, resolve: true, limit: 10)
-        MastodonController.client.run(request) { (response) in
-            guard case let .success(results, _) = response else { fatalError() }
-            
-            DispatchQueue.main.async {
-                self.activityIndicator.isHidden = true
-                self.activityIndicator.stopAnimating()
-            }
-            
-            guard self.currentQuery == query else { return }
-            
-            var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-            if !results.accounts.isEmpty {
-                snapshot.appendSections([.accounts])
-                snapshot.appendItems(results.accounts.map { Item.account($0.id) }, toSection: .accounts)
-                MastodonCache.addAll(accounts: results.accounts)
-            }
-            if !results.hashtags.isEmpty {
-                snapshot.appendSections([.hashtags])
-                snapshot.appendItems(results.hashtags.map { Item.hashtag($0) }, toSection: .hashtags)
-            }
-            if !results.statuses.isEmpty {
-                snapshot.appendSections([.statuses])
-                snapshot.appendItems(results.statuses.map { Item.status($0.id) }, toSection: .statuses)
-                MastodonCache.addAll(statuses: results.statuses)
-                MastodonCache.addAll(accounts: results.statuses.map { $0.account })
-            }
-            self.dataSource.apply(snapshot)
-        }
-    }
-
-}
-
-extension SearchTableViewController {
-    enum Section: CaseIterable {
-        case accounts
-        case hashtags
-        case statuses
-
-        var displayName: String {
-            switch self {
-            case .accounts:
-                return NSLocalizedString("People", comment: "accounts search results section")
-            case .hashtags:
-                return NSLocalizedString("Hashtags", comment: "hashtag search results section")
-            case .statuses:
-                return NSLocalizedString("Posts", comment: "statuses search results section")
-            }
-        }
-    }
-    enum Item: Hashable {
-        case account(String)
-        case hashtag(Hashtag)
-        case status(String)
-    }
-    
-    class DataSource: UITableViewDiffableDataSource<Section, Item> {
-        override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-            return Section.allCases[section].displayName
-        }
-    }
-}
-
-extension SearchTableViewController: UISearchResultsUpdating {
-    func updateSearchResults(for searchController: UISearchController) {
-        searchSubject.send(searchController.searchBar.text)
-    }
-}
-
-extension SearchTableViewController: UISearchBarDelegate {
-    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
-        // perform a search immedaitely when the search button is pressed
-        performSearch(query: searchBar.text?.trimmingCharacters(in: .whitespacesAndNewlines))
-    }
-}
-
-extension SearchTableViewController: StatusTableViewCellDelegate {
-    func statusCollapsedStateChanged() {
-        tableView.beginUpdates()
-        tableView.endUpdates()
-    }
-}

Tusker/Screens/Utilities/EnhancedTableViewController.swift

@@ -55,11 +55,11 @@ extension EnhancedTableViewController {
         }
     }
     
-    override func tableView(_ tableView: UITableView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+    override func tableView(_ tableView: UITableView, willCommitMenuWithAnimator animator: UIContextMenuInteractionCommitAnimating) {
-        if let viewController = animator.previewViewController {
+        if /*animator.preferredCommitStyle == .pop,*/ // preferredCommitStyle is always .dismiss, see FB6113554
-            animator.preferredCommitStyle = .pop
+            let viewController = animator.previewViewController {
             animator.addCompletion {
-                if viewController is LargeImageViewController || viewController is GalleryViewController || viewController is SFSafariViewController {
+                if viewController is LargeImageViewController || viewController is SFSafariViewController {
                     self.present(viewController, animated: true)
                 } else {
                     self.show(viewController, sender: nil)

Tusker/Views/Hashtag Cell/HashtagTableViewCell.swift

@@ -1,34 +0,0 @@
-//
-//  HashtagTableViewCell.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 9/14/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-class HashtagTableViewCell: UITableViewCell {
-
-    var delegate: TuskerNavigationDelegate?
-    
-    @IBOutlet weak var hashtagLabel: UILabel!
-    
-    var hashtag: Hashtag!
-
-    func updateUI(hashtag: Hashtag) {
-        self.hashtag = hashtag
-        
-        hashtagLabel.text = "#\(hashtag.name)"
-    }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        if selected {
-            delegate?.selected(tag: hashtag)
-        }
-    }
-    
-}

Tusker/Views/Hashtag Cell/HashtagTableViewCell.xib

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" 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="14824"/>
-        <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"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="HashtagTableViewCell" customModule="Tusker" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#hashtag" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vVg-1C-zJr">
-                        <rect key="frame" x="16" y="11" width="83" height="22"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                </subviews>
-                <constraints>
-                    <constraint firstItem="vVg-1C-zJr" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="Mnk-L3-dz9"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="vVg-1C-zJr" secondAttribute="bottom" id="qgx-dQ-SGs"/>
-                    <constraint firstItem="vVg-1C-zJr" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="ulh-dS-m0f"/>
-                </constraints>
-            </tableViewCellContentView>
-            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
-            <connections>
-                <outlet property="hashtagLabel" destination="vVg-1C-zJr" id="zJM-sN-cvL"/>
-            </connections>
-            <point key="canvasLocation" x="132" y="154"/>
-        </tableViewCell>
-    </objects>
-</document>