Fix refresh announcements for ipad (#219)

Author: ASankaran

HackIllinois/DataSources/HIAnnouncementDataSource.swift

@@ -18,13 +18,13 @@ import UserNotifications
 final class HIAnnouncementDataSource {
 
     // Serializes access to isRefreshing.
-    private static let isRefreshineQueue = DispatchQueue(label: "org.hackillinois.org.hi_announcement_data_source.is_refreshing_queue", attributes: .concurrent)
+    private static let isRefreshingQueue = DispatchQueue(label: "org.hackillinois.org.hi_announcement_data_source.is_refreshing_queue", attributes: .concurrent)
     // Tracks if the DataSource is refreshing.
     private static var _isRefreshing = false
     // Setter and getter for isRefreshing.
     public static var isRefreshing: Bool {
-        get { return isRefreshineQueue.sync { _isRefreshing } }
-        set { isRefreshineQueue.sync(flags: .barrier) { _isRefreshing = newValue } }
+        get { return isRefreshingQueue.sync { _isRefreshing } }
+        set { isRefreshingQueue.sync(flags: .barrier) { _isRefreshing = newValue } }
     }
 
     // Waive swiftlint warning

HackIllinois/ViewControllers/HIAdminAnnouncementViewController.swift

@@ -48,7 +48,7 @@ class HIAdminAnnouncementViewController: HIBaseViewController {
         titleTextField.delegate = self
         descriptionTextField.delegate = self
         createAnnouncementButton.addTarget(self, action: #selector(didSelectCreateAnnouncement), for: .touchUpInside)
-        topicButton.addTarget(self, action: #selector(didSelectTopic), for: .touchUpInside)
+        topicButton.addTarget(self, action: #selector(didSelectTopic(sender:)), for: .touchUpInside)
     }
 
     required init?(coder aDecoder: NSCoder) {
@@ -102,14 +102,18 @@ extension HIAdminAnnouncementViewController {
         self.present(confirmAlertController, animated: true, completion: nil)
     }
 
-    @objc func didSelectTopic() {
-        let alert = UIAlertController(title: "Topic", message: "Please Choose Topic", preferredStyle: .actionSheet)
-        for topic in HIAPI.Roles.allRoles {
-            alert.addAction(UIAlertAction(title: topic, style: .default, handler: { (_) in
-                self.topicButton.setTitle(topic, for: .normal)
-                self.currentTopic = topic
-            }))
+    @objc func didSelectTopic(sender: UIButton) {
+        let alert = UIAlertController(title: "Topic", message: "Please select a topic", preferredStyle: .actionSheet)
+        HIAPI.Roles.allRoles.forEach { topic in
+            alert.addAction(
+                UIAlertAction(title: topic, style: .default) { [weak self] _ in
+                    self?.topicButton.setTitle(topic, for: .normal)
+                    self?.currentTopic = topic
+                }
+            )
         }
+        alert.popoverPresentationController?.sourceRect = sender.bounds
+        alert.popoverPresentationController?.sourceView = sender
         self.present(alert, animated: true, completion: nil)
     }
 }

HackIllinois/ViewControllers/HIAnnouncementsViewController.swift

@@ -67,7 +67,8 @@ extension HIAnnouncementsViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        NotificationCenter.default.addObserver(self, selector: #selector(viewDidBecomeActive), name: UIApplication.didBecomeActiveNotification, object: nil)
+        HIAnnouncementDataSource.refresh()
+
         NotificationCenter.default.addObserver(self, selector: #selector(viewWillEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
 
         var rightNavigationItem: UIBarButtonItem?
@@ -82,14 +83,9 @@ extension HIAnnouncementsViewController {
         NotificationCenter.default.removeObserver(self)
     }
 
-    @objc func viewDidBecomeActive() {
-        try? fetchedResultsController.performFetch()
-        animateTableViewReload()
-    }
-
     @objc func viewWillEnterForeground() {
         try? fetchedResultsController.performFetch()
-        animateTableViewReload()
+        HIAnnouncementDataSource.refresh()
     }
 }
 

HackIllinois/ViewControllers/HIUserDetailViewController.swift

@@ -53,7 +53,7 @@ class HIUserDetailViewController: HIBaseViewController {
 
 // MARK: - Actions
 extension HIUserDetailViewController {
-    @objc func didSelectLogoutButton(_ sender: Any) {
+    @objc func didSelectLogoutButton(_ sender: UIBarButtonItem) {
         let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
         alert.addAction(
             UIAlertAction(title: "Logout", style: .destructive) { _ in
@@ -63,6 +63,7 @@ extension HIUserDetailViewController {
         alert.addAction(
             UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
         )
+        alert.popoverPresentationController?.barButtonItem = sender
         present(alert, animated: true, completion: nil)
     }
 }