Minor changes to remove warnings, improve style

cuappdev · Jan 22, 2019 · 11e1f60 · 11e1f60
1 parent 248299c
commit 11e1f60
Show file tree

Hide file tree

Showing 15 changed files with 250 additions and 59 deletions.
diff --git a/...pp Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json b/...pp Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Eatery Watch App Extension/Assets.xcassets/Complication.complicationset/Contents.json b/Eatery Watch App Extension/Assets.xcassets/Complication.complicationset/Contents.json
@@ -0,0 +1,48 @@
+{
+  "assets" : [
+    {
+      "idiom" : "watch",
+      "filename" : "Circular.imageset",
+      "role" : "circular"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Extra Large.imageset",
+      "role" : "extra-large"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Graphic Bezel.imageset",
+      "role" : "graphic-bezel"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Graphic Circular.imageset",
+      "role" : "graphic-circular"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Graphic Corner.imageset",
+      "role" : "graphic-corner"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Graphic Large Rectangular.imageset",
+      "role" : "graphic-large-rectangular"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Modular.imageset",
+      "role" : "modular"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Utilitarian.imageset",
+      "role" : "utilitarian"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json b/...Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...tension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json b/...tension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...sion/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json b/...sion/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...ension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json b/...ension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...ts.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json b/...ts.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...App Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json b/...App Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json b/...Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : "<=145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Eatery Watch App Extension/Assets.xcassets/Contents.json b/Eatery Watch App Extension/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Eatery.xcodeproj/project.pbxproj b/Eatery.xcodeproj/project.pbxproj
diff --git a/Eatery/Controllers/MealTableViewController.swift b/Eatery/Controllers/MealTableViewController.swift
@@ -104,9 +104,9 @@ class MealTableViewController: UITableViewController {
             return 1
         }
 
-        if menu.count == 1, eatery.eateryType != .Dining, let first = menu.first {
+        if menu.count == 1, eatery.eateryType != .Dining, let item = menu.first {
             // display menu items (of the only "dining station") as a table
-            return menu.first?.value.count ?? 0
+            return item.value.count
         } else {
             // display the menu items
             return menu.count
@@ -118,7 +118,7 @@ class MealTableViewController: UITableViewController {
             return emptyMenuCell(in: tableView, forRowAt: indexPath)
         }
 
-        if menu.count == 1 && eatery.eateryType != .Dining {
+        if menu.count == 1, eatery.eateryType != .Dining {
             return menuItemCell(in: tableView, forRowAt: indexPath)
         } else {
             return diningStationsCell(in: tableView, forRowAt: indexPath)

diff --git a/Eatery/Models/Eatery.swift b/Eatery/Models/Eatery.swift
@@ -88,26 +88,32 @@ public enum Area: String {
     case Central = "Central"
 }
 
-private func makeFormatter () -> DateFormatter {
-    let formatter = DateFormatter()
-    formatter.dateFormat = "YYYY-MM-dd"
-    return formatter
-}
-
 /// Represents a Cornell Dining Facility and information about it
 /// such as open times, menus, location, etc.
 public struct Eatery: Hashable {
 
+    public typealias MenuCategory = String
+
+    public typealias Menu = [MenuCategory: [MenuItem]]
+
+    /// A string of the form YYYY-MM-dd
+    public typealias DateString = String
+
+    public typealias EventName = String
+
     public static func == (lhs: Eatery, rhs: Eatery) -> Bool {
         return lhs.id == rhs.id
     }
 
-    private static let dateFormatter = makeFormatter()
+    private static let dateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "YYYY-MM-dd"
+        return formatter
+    }()
 
     public var hashValue: Int {
         return id
     }
-
 
     /// Unique Identifier
     public let id: Int
@@ -141,11 +147,11 @@ public struct Eatery: Hashable {
 
     /// A menu of constant dining items. Exists if this eatery's menu
     /// never changes. This should be used if it exists.
-    public var diningItems: [String: [MenuItem]]?
+    public var diningItems: Menu?
 
     /// A constant hardcoded menu if this Eatery has one.
     /// This should be used if it exists yet diningItems does not.
-    public let hardcodedMenu: [String: [MenuItem]]?
+    public let hardcodedMenu: Menu?
 
     /// GPS Location
     public let location: CLLocation
@@ -157,12 +163,11 @@ public struct Eatery: Hashable {
     /// Maps the date the event occurs to a list of the event name
     /// to the event itself e.g.:
     /// [ "2015-03-01": ["Lunch": Event]]
-    public let events: [String: [String: Event]]
+    public let events: [DateString: [EventName: Event]]
 
     /// ="This is an external eatery, i.e. a completely hardcoded eatery"
     public let external: Bool
 
-
     // Gives a string full of all the menus for this eatery today
     // this is used for searching.
     private var _todaysEventsString: String? = nil
@@ -181,7 +186,6 @@ public struct Eatery: Hashable {
         }
     }
 
-
     init(id: Int, name: String, nameShort: String, slug: String, eateryType: EateryType, about: String, phone: String, area: Area, address: String, paymentMethods: [PaymentType], diningItems: [String : [MenuItem]]?, events: [String: [String: Event]], hardcodedMenu: [String : [MenuItem]]?, location: CLLocation, external: Bool) {
         self.id = id
         self.name = name
@@ -224,7 +228,6 @@ public struct Eatery: Hashable {
         return false
     }
 
-    //
     /**
      Tells if eatery is open within the calendar date given. This is distinct from `isOpenOnDate` in that it does not check a specific time, just the day, month, and year.
 
@@ -310,18 +313,18 @@ public struct Eatery: Hashable {
      and the food items available for the category as a string list. Used to easily iterate
      over all items in the hardcoded menu. Ex: [("Entrees",["Chicken", "Steak", "Fish"]), ("Fruit", ["Apples"])]
      */
-    private func getMenuIterable(_ menuList: [String: [MenuItem]]?) -> [(String,[String])] {
-        guard let menu = menuList else { return [] }
+    private func getMenuIterable(_ menu: Menu?) -> [(String,[String])] {
+        guard let menu = menu else { return [] }
         return menu.map({ (name, items) -> (String, [String]) in
             (name, items.map({ ($0.name) }))
         })
     }
 
-    public func getHardcodeMenuIterable() -> [(String,[String])] {
+    public func getHardcodeMenuIterable() -> [(String, [String])] {
         return getMenuIterable(hardcodedMenu)
     }
 
-    public func getDiningItemMenuIterable() -> [(String,[String])] {
+    public func getDiningItemMenuIterable() -> [(String, [String])] {
         return getMenuIterable(diningItems)
     }
 

diff --git a/Eatery/Network/NetworkManager.swift b/Eatery/Network/NetworkManager.swift
@@ -64,10 +64,9 @@ struct NetworkManager {
 
                 let timeDateFormatter = DateFormatter()
                 timeDateFormatter.dateFormat = "YYYY-MM-dd:h:mma"
-                timeDateFormatter.locale = Locale(identifier: "en_US_POSIX")
+                timeDateFormatter.locale = Locale(identifier: "en_US_POSIX") // force the date formatter to use 12-hour time
                 eatery.operatingHours.compactMap { $0 }.forEach { operatingHour in
                     let dateString = operatingHour.date
-                    let date = dateFormatter.date(from: dateString) ?? Date()
 
                     let events = operatingHour.events.compactMap { $0 }
                     var allMenuItems: [MenuItem] = []

diff --git a/Pods-Eatery.debug.xcconfig b/Pods-Eatery.debug.xcconfig
@@ -0,0 +1,11 @@
+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ARCL" "${PODS_CONFIGURATION_BUILD_DIR}/Apollo" "${PODS_CONFIGURATION_BUILD_DIR}/FLEX" "${PODS_CONFIGURATION_BUILD_DIR}/Hero" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" "${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON-iOS" "${PODS_ROOT}/Crashlytics/iOS" "${PODS_ROOT}/Fabric/iOS"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/ARCL/ARCL.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Apollo/Apollo.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/FLEX/FLEX.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Hero/Hero.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON-iOS/SwiftyJSON.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ARCL" -framework "Apollo" -framework "Crashlytics" -framework "FLEX" -framework "Fabric" -framework "Hero" -framework "Kingfisher" -framework "NVActivityIndicatorView" -framework "Security" -framework "SnapKit" -framework "SwiftyJSON" -framework "SystemConfiguration" -framework "UIKit"
+OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
+PODS_ROOT = ${SRCROOT}/Pods