From fe98dfe4cae898558e5cc007457333170b09c69a Mon Sep 17 00:00:00 2001
From: Jed Fox <git@jedfox.com>
Date: Sun, 6 Nov 2022 20:01:30 -0500
Subject: [PATCH] DragIndicatorView now handles a11y itself
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…and also gains the button trait
…also the escape gesture now works!
---
 .../Scene/Account/AccountViewController.swift  | 17 ++++++-----------
 .../Scene/Account/View/DragIndicatorView.swift | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Mastodon/Scene/Account/AccountViewController.swift b/Mastodon/Scene/Account/AccountViewController.swift
index e25c75b01..7a0e529cc 100644
--- a/Mastodon/Scene/Account/AccountViewController.swift
+++ b/Mastodon/Scene/Account/AccountViewController.swift
@@ -34,7 +34,9 @@ final class AccountListViewController: UIViewController, NeedsDependency {
         return barButtonItem
     }()
 
-    let dragIndicatorView = DragIndicatorView()
+    lazy var dragIndicatorView = DragIndicatorView { [weak self] in
+        self?.dismiss(animated: true, completion: nil)
+    }
 
     var hasLoaded = false
     private(set) lazy var tableView: UITableView = {
@@ -130,14 +132,6 @@ extension AccountListViewController {
                 self.panModalTransition(to: .shortForm)
             }
             .store(in: &disposeBag)
-        
-        if UIAccessibility.isVoiceOverRunning {
-            let dragIndicatorTapGestureRecognizer = UITapGestureRecognizer.singleTapGestureRecognizer
-            dragIndicatorView.addGestureRecognizer(dragIndicatorTapGestureRecognizer)
-            dragIndicatorTapGestureRecognizer.addTarget(self, action: #selector(AccountListViewController.dragIndicatorTapGestureRecognizerHandler(_:)))
-            dragIndicatorView.isAccessibilityElement = true
-            dragIndicatorView.accessibilityLabel = L10n.Scene.AccountList.dismissAccountSwitcher
-        }
     }
 
     private func setupBackgroundColor(theme: Theme) {
@@ -160,10 +154,11 @@ extension AccountListViewController {
         logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)")
         _ = coordinator.present(scene: .welcome, from: self, transition: .modal(animated: true, completion: nil))
     }
-    
-    @objc private func dragIndicatorTapGestureRecognizerHandler(_ sender: UITapGestureRecognizer) {
+
+    override func accessibilityPerformEscape() -> Bool {
         logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)")
         dismiss(animated: true, completion: nil)
+        return true
     }
 
 }
diff --git a/Mastodon/Scene/Account/View/DragIndicatorView.swift b/Mastodon/Scene/Account/View/DragIndicatorView.swift
index 9e0ab77d5..a04d9cd8c 100644
--- a/Mastodon/Scene/Account/View/DragIndicatorView.swift
+++ b/Mastodon/Scene/Account/View/DragIndicatorView.swift
@@ -15,17 +15,17 @@ final class DragIndicatorView: UIView {
 
     let barView = UIView()
     let separatorLine = UIView.separatorLine
+    let onDismiss: () -> Void
 
-    override init(frame: CGRect) {
-        super.init(frame: frame)
+    init(onDismiss: @escaping () -> Void) {
+        self.onDismiss = onDismiss
+        super.init(frame: .zero)
         _init()
     }
 
     required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        _init()
+        fatalError("init(coder:) is not supported")
     }
-
 }
 
 extension DragIndicatorView {
@@ -52,6 +52,14 @@ extension DragIndicatorView {
             separatorLine.bottomAnchor.constraint(equalTo: bottomAnchor),
             separatorLine.heightAnchor.constraint(equalToConstant: UIView.separatorLineHeight(of: self)),
         ])
+
+        isAccessibilityElement = true
+        accessibilityTraits = .button
+        accessibilityLabel = L10n.Scene.AccountList.dismissAccountSwitcher
     }
 
+    override func accessibilityActivate() -> Bool {
+        self.onDismiss()
+        return true
+    }
 }