resolve merge conflicts

uclaradio · Jan 15, 2017 · 9370749 · 9370749
2 parents 962cc9c + 0e51071
commit 9370749
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/... Radio/UCLA Radio.xcworkspace/xcuserdata/Chris.xcuserdatad/UserInterfaceState.xcuserstate b/... Radio/UCLA Radio.xcworkspace/xcuserdata/Chris.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/UCLA Radio/UCLA Radio/data/RadioAPI.swift b/UCLA Radio/UCLA Radio/data/RadioAPI.swift
@@ -39,11 +39,11 @@ class RadioAPI {
                 } else {
                     nowPlaying = nil
                 }
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: NowPlayingUpdatedNotification), object: nil)
+                NotificationCenter.default.post(name: Notification.Name(rawValue: NowPlayingUpdatedNotification), object: nil)
             case .failure:
                 // no show playing right now
                 nowPlaying = nil
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: NowPlayingUpdatedNotification), object: nil)
+                NotificationCenter.default.post(name: Notification.Name(rawValue: NowPlayingUpdatedNotification), object: nil)
             }
         }
     }
@@ -88,7 +88,8 @@ class RadioAPI {
                 delegate?.failedToFetchData(error)
         }
     }
-
+
+    static let updatedGiveawaysNotificationName = Notification.Name(rawValue: "DidFetchUpdatedTicketGiveaways")
     static func fetchGiveaways(_ delegate: APIFetchDelegate?) {
         fetchSomethingCached(giveawaysRoute, key: "events", success: { (result, cached) in
             if let eventsMonthsArray = result as? NSArray {
@@ -98,6 +99,9 @@ class RadioAPI {
                 }
                 else {
                     delegate?.didFetchData(giveaways)
+                    NotificationCenter.default.post(name: updatedGiveawaysNotificationName, object: nil, userInfo: [
+                        "hasGiveaways": (giveaways.count > 0)
+                    ])
                 }
             }
             else {

diff --git a/UCLA Radio/UCLA Radio/menu/MenuViewController.swift b/UCLA Radio/UCLA Radio/menu/MenuViewController.swift
@@ -25,14 +25,16 @@ class MenuItem {
     }
 }
 
+fileprivate let defaultItems = [
+    MenuItem(title: "Schedule", storyboardID: ScheduleViewController.storyboardID),
+    MenuItem(title: "DJs", storyboardID: DJListViewController.storyboardID),
+    MenuItem(title: "About", storyboardID: AboutViewController.storyboardID)
+]
+
+fileprivate let giveawayItem = MenuItem(title: "Tickets", storyboardID: EventsViewController.storyboardID)
+
 class MenuViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
-
-    fileprivate let items = [
-        MenuItem(title: "Schedule", storyboardID: ScheduleViewController.storyboardID),
-        MenuItem(title: "DJs", storyboardID: DJListViewController.storyboardID),
-        MenuItem(title: "Tickets", storyboardID: EventsViewController.storyboardID),
-        MenuItem(title: "About", storyboardID: AboutViewController.storyboardID)
-    ]
+    private var items = [MenuItem]()
 
     var tableView = UITableView(frame: CGRect.zero, style: .grouped)
     var triangleView: TrianglifyView!
@@ -47,6 +49,9 @@ class MenuViewController: UIViewController, UITableViewDataSource, UITableViewDe
         triangleView = TrianglifyView()
         view.addSubview(triangleView)
         triangleView.translatesAutoresizingMaskIntoConstraints = false
+
+        items = defaultItems
+        NotificationCenter.default.addObserver(self, selector: #selector(didUpdateGiveawaysNotification), name: RadioAPI.updatedGiveawaysNotificationName, object: nil)
 
         tableView.dataSource = self
         tableView.delegate = self
@@ -90,6 +95,21 @@ class MenuViewController: UIViewController, UITableViewDataSource, UITableViewDe
             navigationController.pushViewController(viewController, animated: true)
         }
     }
+
+    // MARK: - Data
+
+    func didUpdateGiveawaysNotification(notification: Notification) {
+        if let userInfo = notification.userInfo,
+            let hasGiveaways = userInfo["hasGiveaways"] as? Bool,
+            hasGiveaways {
+            // should add tickets row if not already there
+            items = defaultItems
+            items.insert(giveawayItem, at: 2)
+        } else {
+            items = defaultItems
+        }
+        tableView.reloadData()
+    }
 
     // MARK: - UITableViewDataSource