Merge pull request #84 from pyconjp/release/v2.0.0

Release for v2.0.0

.swiftlint.yml

@@ -1,5 +1,5 @@
 disabled_rules:
-# FourceCastを許可
+# ForceCastを許可
 - force_cast
 # FourceTryを許可
 - force_try

Cartfile

@@ -1,4 +1,6 @@
 # PyCon JP use Library
-github "Alamofire/Alamofire" ~> 4.0
-github "Alamofire/AlamofireImage" ~> 3.0
+github "ishkawa/APIKit" ~> 3.0
+github "antitypical/Result" ~> 3.0
+github "onevcat/Kingfisher" ~> 3.0
 github "realm/realm-cocoa" ~> 2.0
+github "kishikawakatsumi/SpreadsheetView"

PyConJP/Application/AppDelegate.swift

@@ -1,77 +1,57 @@
 //
 //  AppDelegate.swift
-//  PyConJP2016
+//  PyConJP
 //
 //  Created by Yutaro Muta on 2016/02/16.
 //  Copyright © 2016 PyCon JP. All rights reserved.
 //
 
 import UIKit
+import APIKit
 import RealmSwift
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, TalksAPIProtocol, ErrorAlertProtocol {
+class AppDelegate: UIResponder, UIApplicationDelegate, ReceiveLocalNotificationProtocol, ErrorAlertProtocol {
 
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        //        let settings = UIUserNotificationSettings(forTypes: [UIUserNotificationType.Alert, UIUserNotificationType.Badge, UIUserNotificationType.Sound], categories: nil)
-        //        UIApplication.sharedApplication().registerUserNotificationSettings(settings)
-        //
-        //        if let _ = launchOptions![UIApplicationLaunchOptionsURLKey] as? [NSObject : AnyObject] {
-        //            if let osVersion = Float64(UIDevice.currentDevice().systemVersion) {
-        //                if osVersion >= 9.0 {
-        //                }
-        //            }
-        //        }
-        //        if let launchOptions = launchOptions {
-        //            if let localNotification = launchOptions[UIApplicationLaunchOptionsLocalNotificationKey] as? UILocalNotification {
-        //                self.application(application, didReceiveLocalNotification: localNotification)
-        //            }
-        //        }
 
-        getTalks { result in
-            switch result {
-            case .success:
-            	NotificationCenter.default.post(name: Notification.Name(rawValue: PCJNotificationConfig.CompleteFetchDataNotification), object: nil)
-            case .failure(let error):
-                self.showErrorAlart(with: error)
-            }
-        }
+        getTalksFromAPI()
 
-        UINavigationBar.appearance().barTintColor = UIColor.PyConJP2016.red
+        UINavigationBar.appearance().barTintColor = UIColor.PyConJP2017.navy
         UINavigationBar.appearance().tintColor = .white
         UINavigationBar.appearance().titleTextAttributes = [NSForegroundColorAttributeName: UIColor.white]
 
-        UITabBar.appearance().tintColor = UIColor.PyConJP2016.blue
-        UITabBarItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont.boldSystemFont(ofSize: 10), NSForegroundColorAttributeName: UIColor.PyConJP2016.blue], for: .selected)
+        UITabBar.appearance().tintColor = UIColor.PyConJP2017.yellow
+        UITabBarItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont.boldSystemFont(ofSize: 10), NSForegroundColorAttributeName: UIColor.PyConJP2017.yellow], for: .selected)
+
+        let configuration = Realm.Configuration(schemaVersion: 1, deleteRealmIfMigrationNeeded: true)
+        Realm.Configuration.defaultConfiguration = configuration
 
         return true
     }
 
-    func applicationWillResignActive(_ application: UIApplication) {
-    }
-
-    func applicationDidEnterBackground(_ application: UIApplication) {
-    }
-
-    func applicationWillEnterForeground(_ application: UIApplication) {
-    }
-
-    func applicationDidBecomeActive(_ application: UIApplication) {
-        UIApplication.shared.applicationIconBadgeNumber = 0
+    func application(_ application: UIApplication, didReceive notification: UILocalNotification) {
+        handle(application, didReceiveLocalNotification: notification)        
+        UIApplication.shared.cancelLocalNotification(notification)
     }
 
-    func applicationWillTerminate(_ application: UIApplication) {
-    }
+}
+
+extension AppDelegate {
 
-    func application(_ application: UIApplication, didReceive notification: UILocalNotification) {
-        if let userInfo = notification.userInfo {
-            let receiveLocalNotificationManager = ReceiveLocalNotificationManager()
-            receiveLocalNotificationManager.application(application, didReceiveLocalNotification: userInfo)
+    fileprivate func getTalksFromAPI() {
+        let request = TalksAPIRequest()
+        Session.send(request) { [weak self](result) in
+            switch result {
+            case .success(let talks):
+                try? SaveTalksRequest().save(talks: talks)
+                NotificationCenter.default.post(name: Notification.Name(rawValue: PCJNotificationConfig.completeFetchDataNotification), object: nil)
+            case .failure(let error):
+                self?.showErrorAlart(with: error)
+            }
         }
-
-        UIApplication.shared.cancelLocalNotification(notification)
     }
 
 }

PyConJP/Application/PCJConfig.swift

@@ -1,12 +1,12 @@
 //
 //  PCJConfig.swift
-//  PyConJP2016
+//  PyConJP
 //
 //  Created by Yutaro Muta on 8/30/2016.
 //  Copyright © 2016 PyCon JP. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 enum PCJConfig {
 

PyConJP/Application/PCJNotificationConfig.swift

@@ -1,15 +1,15 @@
 //
 //  PCJNotificationConfig.swift
-//  PyConJP2016
+//  PyConJP
 //
 //  Created by Yutaro Muta on 2016/07/21.
 //  Copyright © 2016 PyCon JP. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 enum PCJNotificationConfig {
 
-    static let CompleteFetchDataNotification = "CompleteFetchDateNotification"
+    static let completeFetchDataNotification = "CompleteFetchDateNotification"
 
 }

PyConJP/Assets.xcassets/App/Image/Map/Floor/FirstFloorMap.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "floor_1.png",
+      "filename" : "1st-floor@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "floor_1@2x.png",
+      "filename" : "1st-floor@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "floor_1@3x.png",
+      "filename" : "1st-floor@3x.png",
       "scale" : "3x"
     }
   ],

PyConJP/Assets.xcassets/App/Image/Map/Floor/SecondFloorMap.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "floor_2.png",
+      "filename" : "2nd-floor@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "floor_2@2x.png",
+      "filename" : "2nd-floor@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "floor_2@3x.png",
+      "filename" : "2nd-floor@3x.png",
       "scale" : "3x"
     }
   ],

PyConJP/Assets.xcassets/App/Image/Map/Floor/ThirdFloorMap.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "floor_3.png",
+      "filename" : "3rd-floor@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "floor_3@2x.png",
+      "filename" : "3rd-floor@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "floor_3@3x.png",
+      "filename" : "3rd-floor@3x.png",
       "scale" : "3x"
     }
   ],

PyConJP/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "Portrait 5.5.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "Landscape 5.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "landscape",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "Portrait 4.7.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Portrait 3.5.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "filename" : "Portrait 4.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}