Merge pull request #61 from durul/master

Animations TODO completed.

Author: JakeLin

Podfile.lock

@@ -15,4 +15,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2ec46d3741ab466dee64c9e763366836879c1f6e
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.1.beta.1

README.md

@@ -60,10 +60,10 @@ There is two major version for the app released before.
 * Core Location
 
 ## TODO
-* App indexing like CoreSpotlight and `NSUserActivity`
+* <s>App indexing like CoreSpotlight and `NSUserActivity`</s> 
 * <s>Unit Tests</s>
 * UI Tests
-* Animations  
+* <s>Animations</s>  
 
 ## How to build
 

SwiftWeather.xcodeproj/project.pbxproj

@@ -446,7 +446,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		3211EE071253F1D6513A17BA /* [CP] Embed Pods Frameworks */ = {
@@ -506,7 +506,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		ADD0EBFC1C562E52002D8392 /* ShellScript */ = {

SwiftWeather/AppDelegate.swift

@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-
   func application(_ application: UIApplication,
       didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.
@@ -51,5 +50,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // applicationDidEnterBackground:.
   }
 
-
 }

SwiftWeather/WeatherViewController.swift

@@ -4,46 +4,108 @@
 //
 
 import UIKit
+import CoreSpotlight
+import MobileCoreServices
 
+//MARK: - UIViewController Properties
 class WeatherViewController: UIViewController {
 
+  //MARK: - IBOutlets
   @IBOutlet weak var locationLabel: UILabel!
   @IBOutlet weak var iconLabel: UILabel!
   @IBOutlet weak var temperatureLabel: UILabel!
   @IBOutlet var forecastViews: [ForecastView]!
 
+  let identifier = "WeatherIdentifier"
+  
+    //MARK: - Super Methods
   override func viewDidLoad() {
     super.viewDidLoad()
     viewModel = WeatherViewModel()
     viewModel?.startLocationService()
   }
 
+  override func viewWillAppear(_ animated: Bool) {
+    super.viewWillAppear(animated)
+    
+    locationLabel.center.x  -= view.bounds.width
+    iconLabel.center.x -= view.bounds.width
+    temperatureLabel.center.x -= view.bounds.width
+    
+    iconLabel.alpha = 0.0
+    locationLabel.alpha = 0.0
+    temperatureLabel.alpha = 0.0
+  }
+
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
+    
+    UIView.animate(withDuration: 0.5, animations: {
+     self.locationLabel.center.x += self.view.bounds.width
+    })
+    
+    UIView.animate(withDuration: 0.5, delay: 0.3, usingSpringWithDamping: 0.2, initialSpringVelocity: 0.0, options: [], animations: {
+     self.iconLabel.center.x += self.view.bounds.width
+    }, completion: nil)
+    
+    UIView.animate(withDuration: 0.5, delay: 0.4, usingSpringWithDamping: 0.2, initialSpringVelocity: 0.0, options: [], animations: {
+     self.temperatureLabel.center.x += self.view.bounds.width
+    }, completion: nil)
+    
+    
+    UIView.animate(withDuration: 0.5, delay: 0.3, options: [], animations: {
+     self.iconLabel.alpha = 1.0
+    }, completion: nil)
+    
+    UIView.animate(withDuration: 0.5, delay: 0.4, options: [], animations: {
+     self.locationLabel.alpha = 1.0
+    }, completion: nil)
+    
+    UIView.animate(withDuration: 0.5, delay: 0.5, options: [], animations: {
+     self.temperatureLabel.alpha = 1.0
+    }, completion: nil)
+    
+  }
+    
+
   // MARK: ViewModel
   var viewModel: WeatherViewModel? {
     didSet {
-      viewModel?.location.observe {
+     viewModel?.location.observe {
         [unowned self] in
         self.locationLabel.text = $0
-      }
-
-      viewModel?.iconText.observe {
+        
+        let attributeSet = CSSearchableItemAttributeSet(itemContentType: kUTTypeText as String)
+        attributeSet.title = self.locationLabel.text
+        
+        let item = CSSearchableItem(uniqueIdentifier: self.identifier, domainIdentifier: "com.rushjet.SwiftWeather", attributeSet: attributeSet)
+        CSSearchableIndex.default().indexSearchableItems([item]){error in
+            if let error =  error {
+                print("Indexing error: \(error.localizedDescription)")
+            } else {
+                print("Location item successfully indexed")
+            }
+        }
+    }
+    
+     viewModel?.iconText.observe {
         [unowned self] in
         self.iconLabel.text = $0
-      }
-
-      viewModel?.temperature.observe {
+    }
+    
+     viewModel?.temperature.observe {
         [unowned self] in
         self.temperatureLabel.text = $0
-      }
-
-      viewModel?.forecasts.observe {
+    }
+    
+     viewModel?.forecasts.observe {
         [unowned self] (forecastViewModels) in
         if forecastViewModels.count >= 4 {
-          for (index, forecastView) in self.forecastViews.enumerated() {
-            forecastView.loadViewModel(forecastViewModels[index])
-          }
+            for (index, forecastView) in self.forecastViews.enumerated() {
+                forecastView.loadViewModel(forecastViewModels[index])
+            }
+            }
         }
       }
     }
   }
-}