Release v3.0.9 (#122)

* [iOS] [14551] Open Infrastructure Summit changes.

- Changes app icons and summit logos.
- Replaces OpenStack Summit references to Open Infrastructure Summit.

* [iOS] [14576] Adds app sponsor at bottom of menu.

* [CoreSummit] [iOS] [14573] Adds room filter.

 Hides room and venue filters until show date.

* [iOS] [watchOS] [14551] Replaces app icons.

* [iOS] [watchOS] Changes app name.

 From OpenStack Summit to Open Infrastructure Summit.

* Version bump to 3.0.9

* [iOS] [14536] Changes about description.

* [iOS] [14635] Adds date format fix to Splash and About summit dates.

* [iOS] Fixes summit website and code of conduct links.

OpenStack Summit/CoreSummit/EventManagedObject.swift

@@ -195,6 +195,7 @@ public extension EventManagedObject {
                        tracks: [Identifier] = [],
                        trackGroups: [Identifier] = [],
                        levels: [Level] = [],
+                       rooms: [Identifier] = [],
                        venues: [Identifier] = [],
                        summit: Identifier,
                        context: NSManagedObjectContext) throws -> [EventManagedObject] {
@@ -238,6 +239,14 @@ public extension EventManagedObject {
             predicates.append(levelsPredicate)
         }
 
+        if rooms.isEmpty == false {
+
+            //let roomsPredicate = NSPredicate(format: "location.id IN %@", rooms)
+            let roomsPredicate: Predicate = (#keyPath(EventManagedObject.location.id)).in(rooms)
+
+            predicates.append(roomsPredicate)
+        }
+
         if venues.isEmpty == false {
 
             // NSPredicate(format: "venue.id IN %@", venues)

OpenStack Summit/CoreSummit/VenueRoomManagedObject.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 public final class VenueRoomManagedObject: LocationManagedObject {
 
@@ -48,3 +49,42 @@ extension VenueRoom: CoreDataEncodable {
         return managedObject
     }
 }
+
+// MARK - Fetches
+
+public extension VenueRoomManagedObject {
+
+    static var sortDescriptors: [NSSortDescriptor] {
+
+        return [NSSortDescriptor(key: #keyPath(VenueRoomManagedObject.name), ascending: true)]
+    }
+}
+
+public extension VenueRoom {
+
+    /// Fetch all rooms that have some event associated with them.
+    static func scheduled(for summit: Identifier, context: NSManagedObjectContext) throws -> [VenueRoom] {
+
+        // NSPredicate(format: "location != nil AND summit == %@", summitManagedObject))
+        let eventsPredicate: Predicate = .keyPath(#keyPath(EventManagedObject.location)) != .value(.null)
+            && #keyPath(EventManagedObject.summit.id) == summit
+
+        let events = try context.managedObjects(EventManagedObject.self, predicate: eventsPredicate)
+
+        let locations = Set(events.compactMap({ $0.location }))
+            .sorted(by: { $0.name < $1.name })
+
+        var rooms = [VenueRoomManagedObject]()
+
+        for location in locations {
+
+            if let room = location as? VenueRoomManagedObject {
+
+                rooms.append(room)
+            }
+        }
+
+        return VenueRoom.from(managedObjects: rooms)
+    }
+}
+

OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj

@@ -5330,6 +5330,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DISPLAY_NAME = "Open Infrastructure Summit";
 				FRAMEWORK_SEARCH_PATHS = $SRCROOT/../Carthage/Build/WatchOS;
 				IBSC_MODULE = OpenStackSummitWatch_Extension;
 				INFOPLIST_FILE = OpenStackSummitWatch/Info.plist;
@@ -5518,6 +5519,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "$(CONFIGURATION).entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DISPLAY_NAME = "Open Infrastracture Summit";
 				FRAMEWORK_SEARCH_PATHS = (
 					$SRCROOT/../Carthage/Build/iOS,
 					$SRCROOT/../Vendor,

OpenStack Summit/OpenStack Summit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

OpenStack Summit/OpenStack Summit.xcodeproj/xcshareddata/xcschemes/OpenStack Summit.xcscheme

@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -53,10 +52,9 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

OpenStack Summit/OpenStack Summit/AboutViewController.swift

@@ -88,19 +88,28 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
 
     @IBAction func showLink(_ sender: UIButton) {
 
+        var summitWebsite = "https://www.openstack.org"
+        var codeOfConduct = "https://www.openstack.org/legal/community-code-of-conduct"
+
+        if let summitManagedObject = self.currentSummit {
+
+            summitWebsite = summitManagedObject.webpageURL
+            codeOfConduct = "\(summitWebsite)/code-of-conduct"
+        }
+
         let link = Link(rawValue: sender.tag)!
 
         switch link {
 
-        case .openStackWebsite:
+        case .summitWebsite:
 
-            let url = URL(string: "https://openstack.org")!
+            let url = URL(string: summitWebsite)!
 
             open(url)
 
         case .codeOfConduct:
 
-            let url = URL(string: "https://www.openstack.org/summit/barcelona-2016/code-of-conduct")!
+            let url = URL(string: codeOfConduct)!
 
             open(url)
 
@@ -198,12 +207,22 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         }
         else {
 
+            let calendar = Calendar.current
+
+            var startDateFormat = "MMMM dd-"
+            var endDateFormat = "dd, yyyy"
+
+            if !calendar.isDate(summit.end, equalTo: summit.start, toGranularity: .month) {
+
+                startDateFormat = "MMMM dd - "
+                endDateFormat = "MMMM dd, yyyy"
+            }
+
             let dateFormatter = DateFormatter()
             dateFormatter.timeZone = TimeZone(identifier: summit.timeZone)
-            dateFormatter.dateFormat = "MMMM dd-"
+            dateFormatter.dateFormat = startDateFormat
             let stringDateFrom = dateFormatter.string(from: summit.start)
-
-            dateFormatter.dateFormat = "dd, yyyy"
+            dateFormatter.dateFormat = endDateFormat
             let stringDateTo = dateFormatter.string(from: summit.end)
 
             cell.dateLabel.text = "\(stringDateFrom)\(stringDateTo)"
@@ -368,7 +387,7 @@ private extension AboutViewController {
 
     enum Link: Int {
 
-        case openStackWebsite
+        case summitWebsite
         case codeOfConduct
         case appSupport
         case generalInquiries

OpenStack Summit/OpenStack Summit/AppDelegate.swift

@@ -32,7 +32,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 
         // print app info
-        print("Launching OpenStack Summit v\(AppVersion) Build \(AppBuild)")
+        print("Launching OpenInfrastructure Summit v\(AppVersion) Build \(AppBuild)")
         print("Using Environment: \(AppEnvironment.rawValue)")
 
         // update app build preference

OpenStack Summit/OpenStack Summit/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,49 +1,51 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "iPhone_Spotlight@2x.png",
+      "filename" : "iPhone_Settings_iOS7-12@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "iPhone_Spotlight@3x.png",
+      "filename" : "iPhone_Settings_iOS7-12@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "iPhone_Spotlight_iOS7-9@2x.png",
+      "filename" : "iPhone_Spotlight_iOS7-12@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "iPhone_Spotlight_iOS7-9@3x.png",
+      "filename" : "iPhone_Spotlight_iOS7-12@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "iPhone_App_iOS7-9@2x.png",
+      "filename" : "iPhone_App_iOS7-12@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "iPhone_App_iOS7-9@3x.png",
+      "filename" : "iPhone_App_iOS7-12@3x.png",
       "scale" : "3x"
     },
     {
@@ -52,8 +54,9 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
@@ -71,37 +74,37 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "iPad_Spotlight_iOS7-9.png",
+      "filename" : "iPad_Spotlight_iOS7-12.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "iPad_Spotlight_iOS7-9@2x.png",
+      "filename" : "iPad_Spotlight_iOS7-12@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "iPad_App_iOS7-9.png",
+      "filename" : "iPad_App_iOS7-12.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "iPad_App_iOS7-9@2x.png",
+      "filename" : "iPad_App_iOS7-12@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "iPad_ProApp_iOS9@2x.png",
+      "filename" : "iPad_ProApp_iOS12@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "AppStore.png",
+      "filename" : "AppStore.jpeg",
       "scale" : "1x"
     }
   ],

OpenStack Summit/OpenStack Summit/Assets.xcassets/summit-logo.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "logo.pdf"
     }
   ],
   "info" : {