Finished refresh control on both user and team invite lists

Sluggo-Issue-Tracker · Jun 2, 2021 · d333ac7 · d333ac7
1 parent 39a4ae2
commit d333ac7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/Sluggo/Storyboards/PendingInvites.storyboard b/Sluggo/Storyboards/PendingInvites.storyboard
@@ -11,12 +11,12 @@
         <scene sceneID="JQZ-R2-Zc7">
             <objects>
                 <tableViewController id="J7t-uV-EQA" customClass="PendingInvitesViewController" customModule="Sluggo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="45" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="T72-92-ffa">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="45" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="T72-92-ffa">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationLevel="1" indentationWidth="10" reuseIdentifier="pInviteCell" rowHeight="44" id="pyK-ed-07x" customClass="InviteTableCell" customModule="Sluggo" customModuleProvider="target">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="gray" indentationLevel="1" indentationWidth="10" reuseIdentifier="pInviteCell" rowHeight="44" id="pyK-ed-07x" customClass="InviteTableCell" customModule="Sluggo" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="28" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pyK-ed-07x" id="XaT-gg-Tsn">

diff --git a/Sluggo/View Controllers/AdminInviteViewController.swift b/Sluggo/View Controllers/AdminInviteViewController.swift
@@ -25,6 +25,8 @@ class AdminInviteViewController: UITableViewController {
     override func viewDidLoad() {
         self.configureRefreshControl()
         self.handleRefreshAction()
+        NotificationCenter.default.addObserver(self, selector: #selector(handleRefreshAction),
+                                               name: .refreshTeamInvites, object: nil)
 
     }
 

diff --git a/Sluggo/View Controllers/PendingInvitesViewController.swift b/Sluggo/View Controllers/PendingInvitesViewController.swift
@@ -28,8 +28,8 @@ class PendingInvitesViewController: UITableViewController {
     override func viewDidLoad() {
         self.configureRefreshControl()
         self.handleRefreshAction()
-
-        self.tableView.allowsSelection = (generateSegueableController != nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleRefreshAction),
+                                               name: .refreshInvites, object: nil)
     }
 
     func configureRefreshControl() {
@@ -46,8 +46,10 @@ class PendingInvitesViewController: UITableViewController {
                 as? InviteTableCell else {fatalError("Could not load InviteTableCell")}
         let inviteeTeam = self.inviteeTeams[indexPath.row]
         cell.textLabel?.text = inviteeTeam.team.name
+
         cell.acceptButton.tag = indexPath.row
         cell.acceptButton.addTarget(self, action: #selector(doAcceptInvitation(sender:)), for: .touchUpInside)
+
         cell.rejectButton.tag = indexPath.row
         cell.rejectButton.addTarget(self, action: #selector(doRejectInvitation(sender:)), for: .touchUpInside)
 
@@ -84,7 +86,8 @@ class PendingInvitesViewController: UITableViewController {
         inviteManager.acceptUserInvite(invite: invite) { result in
             self.processResult(result: result) { _ in
                 DispatchQueue.main.async {
-                    NotificationCenter.default.post(name: .refreshTrigger, object: self)
+                    NotificationCenter.default.post(name: .refreshInvites, object: self)
+                    NotificationCenter.default.post(name: .refreshTeams, object: self)
                     self.navigationController?.popViewController(animated: false)
                 }
             }
@@ -99,7 +102,7 @@ class PendingInvitesViewController: UITableViewController {
         inviteManager.rejectUserInvite(invite: invite) { result in
             self.processResult(result: result) { _ in
                 DispatchQueue.main.async {
-                    NotificationCenter.default.post(name: .refreshTrigger, object: self)
+                    NotificationCenter.default.post(name: .refreshInvites, object: self)
                     self.navigationController?.popViewController(animated: false)
                 }
             }
@@ -111,6 +114,10 @@ class PendingInvitesViewController: UITableViewController {
     }
 }
 
+extension Notification.Name {
+    static let refreshInvites = Notification.Name(rawValue: "SLGRefreshInvitesNotification")
+}
+
 // MARK: Invite Table Cell
 class InviteTableCell: UITableViewCell {
 

diff --git a/Sluggo/View Controllers/TeamTableViewController.swift b/Sluggo/View Controllers/TeamTableViewController.swift
@@ -20,6 +20,8 @@ class TeamTableViewController: UITableViewController {
     override func viewDidLoad() {
         self.configureRefreshControl()
         self.handleRefreshAction()
+        NotificationCenter.default.addObserver(self, selector: #selector(handleRefreshAction),
+                                               name: .refreshTeams, object: nil)
     }
 
     func configureRefreshControl() {
@@ -97,3 +99,7 @@ class TeamTableViewController: UITableViewController {
         }
     }
 }
+
+extension Notification.Name {
+    static let refreshTeams = Notification.Name(rawValue: "SLGRefreshTeamsNotification")
+}