Release v3.0.2 (#114)

* [iOS] [13314] Fixes venue map zoom defaults.

* Restores OAuth2 access revoked notification handling.

Updates aerogear-ios-oauth2 lib.

* [iOS] [13370] Splash fallbacks to loaded summit name and date display.

* [iOS] [13431] Updates NOW button logic.

* Version bump to 3.0.2.

Author: gcutrini

Cartfile.resolved

@@ -14,4 +14,4 @@ github "OpenStack-Mobile/XCDYouTubeKit" "2.5.3"
 github "xmartlabs/XLPagerTabStrip" "7.0.0"
 github "OpenStack-Mobile/AFHorizontalDayPicker" "74c3521f935039b2b6e945380ecd06752076ec8a"
 github "OpenStack-Mobile/aerogear-ios-http" "60ed79d74e53127efef9ba49fe5d777f40bf2719"
-github "OpenStack-Mobile/aerogear-ios-oauth2" "4bea335d4a9720d0f051eb59ff455a32bb87bb74"
+github "OpenStack-Mobile/aerogear-ios-oauth2" "b8c84cf4110d8e2dd2e86d907819ba15005e8502"

OpenStack Summit/CoreSummit/Store.swift

@@ -102,14 +102,12 @@ public final class Store {
         // config OAuth and HTTP
         configOAuthAccounts()
 
-        /* Removed from lib
         NotificationCenter.default.removeObserver(self, name: OAuth2Module.revokeNotification, object: nil)
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(revokedAccess),
             name: OAuth2Module.revokeNotification,
             object: nil)
-        */
     }
 
     // MARK: - Accessors

OpenStack Summit/OpenStack Summit/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift

@@ -149,6 +149,27 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
                 dateFormatter.dateFormat = "d, yyyy"
                 let stringDateTo = dateFormatter.string(from: summit.end)
 
+                self.summitDateLabel.text = stringDateFrom + stringDateTo
+            }
+            
+        } else if let currentSummit = currentSummit {
+            
+            self.summitNameLabel.text = currentSummit.name.uppercased()
+            
+            if let datesLabel = currentSummit.datesLabel {
+                
+                self.summitDateLabel.text = datesLabel
+            }
+            else {
+                
+                let dateFormatter = DateFormatter()
+                dateFormatter.timeZone = TimeZone(identifier: currentSummit.timeZone)
+                dateFormatter.dateFormat = "MMMM d-"
+                let stringDateFrom = dateFormatter.string(from: currentSummit.start)
+                
+                dateFormatter.dateFormat = "d, yyyy"
+                let stringDateTo = dateFormatter.string(from: currentSummit.end)
+                
                 self.summitDateLabel.text = stringDateFrom + stringDateTo
             }
         }

OpenStack Summit/OpenStack Summit/MenuViewController.swift

@@ -109,14 +109,12 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         revealViewController().view.addGestureRecognizer(revealViewController().panGestureRecognizer())
 
         // session notifications
-        /*
         NotificationCenter.default.removeObserver(self, name: OAuth2Module.revokeNotification, object: nil)
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(MenuViewController.revokedAccess(_:)),
             name: OAuth2Module.revokeNotification,
             object: nil)
-        */
 
         // observe unread notifications
         unreadTeamMessagesObserver = PushNotificationManager.shared.unreadTeamMessages

OpenStack Summit/OpenStack Summit/ScheduleViewController.swift

@@ -411,8 +411,56 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     private func nowEventIndex() -> Int? {
 
         let now = Date()
+        var candidatePos: Int? = nil
+        var candidateEndDate: Date? = nil
+        var candidateAlreadyStarted = false
+        var candidatePosFallback: Int? = nil
 
-        return self.dayEvents.index(where: { $0.end >= now && $0.track != "General" })
+        for (index, event) in self.dayEvents.enumerated() {
+            
+            let endDate = event.end as NSDate
+            
+            if endDate.mt_is(after: now) || endDate.isEqual(to: now) && event.eventType == "Presentation" {
+                
+                let startDate = event.start as NSDate
+                let oneHourAgo = (now as NSDate).mt_oneHourPrevious()
+                
+                // already started
+                let currentAlreadyStarted = startDate.mt_is(before: now) || startDate.mt_is(before: now)
+                // started over more than hour ago
+                if currentAlreadyStarted && startDate.mt_is(before: oneHourAgo) {
+                    
+                    candidatePosFallback = index
+                    continue
+                }
+                
+                if candidateAlreadyStarted && !currentAlreadyStarted {
+                    
+                    continue
+                }
+                
+                if candidateEndDate == nil || (candidateEndDate! as NSDate).mt_is(after: event.end) {
+                    
+                    candidatePos = index
+                    candidateAlreadyStarted = currentAlreadyStarted
+                    candidateEndDate = event.end
+                }
+            }
+        }
+        
+        if candidatePos == nil {
+            
+            candidatePos = candidatePosFallback
+        }
+        
+        if candidatePos == nil {
+            
+            return self.dayEvents.count - 1
+        }
+        else {
+            
+            return candidatePos
+        }
     }
 
     // MARK: - AFHorizontalDayPickerDelegate

OpenStack Summit/OpenStack Summit/VenuesMapViewController.swift

@@ -17,6 +17,7 @@ final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, Indic
     // MARK: - Properties
 
     var mapView: GMSMapView!
+    
     private(set) var dictionary = [GMSMarker: Identifier]()
 
     // MARK: - Loading
@@ -68,9 +69,11 @@ final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, Indic
             dictionary[marker] = venue.identifier
         }
 
+        let zoom: Float = venues.count == 1 ? 7 : 2
+        
         let update = GMSCameraUpdate.fit(bounds)
         mapView.moveCamera(update)
-        mapView.animate(toZoom: mapView.camera.zoom - 1)
+        mapView.animate(toZoom: mapView.camera.zoom - zoom)
     }
 
     // MARK: - GMSMapViewDelegate

OpenStack Summit/OpenStackSummitWatch Extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

OpenStack Summit/OpenStackSummitWatch/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>