Merge pull request #3 from jurvis/structured

Fix data loading, update event model with new track ids, and storyboard loading identifiers

Author: jogendra

FOSSAsia/ApiClient.swift

@@ -12,7 +12,7 @@ typealias ApiRequestCompletionHandler = (Data?, Error?) -> Void
 
 struct ApiClient {
 
-    static let url = "https://raw.githubusercontent.com/fossasia/2016.fossasia.org/gh-pages/schedule/"
+    static let url = "https://raw.githubusercontent.com/fossasia/open-event-scraper/master/out/"
 
     let eventInfo: EventInfo
 

FOSSAsia/Event.swift

@@ -10,12 +10,13 @@ import Foundation
 
 struct Event {
     enum Track: Int, CustomStringConvertible {
-        case techKids1 = 1
-        case techKids2, openTechIOT, openTech, webTech, exhibition, hardwareIOT, python, databases, bigOpenData, devOps, privSec, isc, scienceHackDay, linux, design
+        case openTechIOT = 1
+        case openTech, techKids1, techKids2, techKids3, hardwareIOT, devOps, webTech, python, bigOpenData, databases, isc, privSec, scienceHackDay, linux, design, exhibition, social
         var description: String {
             switch self {
             case .techKids1: return "Tech Kids I"
             case .techKids2: return "Tech Kids II"
+            case .techKids3: return "Tech Kids III"
             case .openTechIOT: return "OpenTech and IOT"
             case .openTech: return "OpenTech Workshops"
             case .webTech: return "WebTech"
@@ -30,20 +31,21 @@ struct Event {
             case .scienceHackDay: return "Science Hack Day"
             case .linux: return "Linux and MiniDebConf"
             case .design: return "Design, VR, 3D"
+            case .social: return "Social Event"
             }
         }
 
         func getTrackColor() -> UIColor {
             switch self {
-            case .techKids1, .techKids2:
+            case .techKids1, .techKids2, .techKids3:
                 return UIColor(hexString: "8E8E93")!
             case .openTechIOT:
                 return UIColor(hexString: "FF4D4D")!
             case .openTech:
                 return UIColor(hexString: "FF8E4C")!
             case .webTech:
                 return UIColor(hexString: "FFCF4C")!
-            case .exhibition:
+            case .exhibition, .social:
                 return UIColor(hexString: "EAFF4C")!
             case .hardwareIOT:
                 return UIColor(hexString: "B8FF4C")!

FOSSAsia/FavoritesScheduleViewController.swift

@@ -17,7 +17,7 @@ class FavoritesScheduleViewController: EventsBaseViewController, SwipeToFavorite
 
     struct StoryboardConstants {
         static let storyboardName = "ScheduleVC"
-        static let viewControllerId = String(describing: FavoritesScheduleViewController())
+        static let viewControllerId = String(describing: FavoritesScheduleViewController.self)
     }
 
     override func viewDidLoad() {

FOSSAsia/ScheduleViewController.swift

@@ -15,7 +15,7 @@ class ScheduleViewController: EventsBaseViewController, SwipeToFavoriteCellPrese
     // Constants for Storyboard/VC
     struct StoryboardConstants {
         static let storyboardName = "ScheduleVC"
-        static let viewControllerId = String(describing: ScheduleViewController())
+        static let viewControllerId = String(describing: ScheduleViewController.self)
     }
 
     lazy var filteredEvents: [EventViewModel] = self.allEvents

FOSSAsia/ScheduleViewModelDelegate.swift

@@ -25,9 +25,9 @@ extension ScheduleViewController {
         let updateString = "Last updated: " + (now as NSDate).formattedDate(withFormat: "dd MMMM yyyy, HH:mm:ss", locale: Locale.autoupdatingCurrent)
         self.refreshControl.attributedTitle = NSAttributedString(string: updateString)
         if self.refreshControl.isRefreshing {
-            OperationQueue.main.addOperation({ [unowned self] () -> Void in
+            DispatchQueue.main.async {
                 self.refreshControl.endRefreshing()
-            })
+            }
         }
     }
 }