Skip to content

Commit 6675e15

Browse files
gcutriniJpMaxMan
gcutrini
authored and
JpMaxMan
committed
Release v3.0.5 (#118)
* [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. * Updates oauth2 lib with token refresh getter fix. * Version bump to 3.0.3. * Updates oauth lib to allow keychain tokens read when device is locked. * Version bump to 3.0.4. * Resets oauth keychain by changing accounts prefix. * Version bump to 3.0.5. * Revert "Version bump to 3.0.5." This reverts commit 35f3d89. * [CoreSummit] [tvOS] Fixed tvOS compiler crash Hopefully this will be fixed in the future * Revert "[CoreSummit] [tvOS] Fixed tvOS compiler crash" This reverts commit fe5647d. * [CoreSummit] Fixes compiler crash. Removes redundant conformance constraint. * Updates ImageSlideshow dependency. For swift(>=3.2) compatibility. * Updates XCDYouTubeKit dependency. * Swift 4 Migration (#117) * [CoreSummit] Fixes closures syntax. * [CoreSummit] Fixes reduce and sorted closures syntax. * [CoreSummit] Fixes range at syntax. * [watchOS] Fixes reduce and sorted closures syntax. * [watchOS] Fixes html to attributed string conversion. * [iOS] Fixes reduce and sorted closures syntax. * [iOS] Fixes closures syntax. * [iOS] Fixes attributed text keys syntax. * [iOS] Adds new function signature to match expected argument type. * [iOS] Disambiguiates type(of: self) usage. * [iOS] Fixes mocked summit store call. * [macOS] Fixes closures syntax. * [macOS] Fixes html to attributed string conversion. * [macOS] Migrates to swift 4 syntax. * [macOS] Makes segues strings into identifiers. * [iOS] Adds missing event kit default calendar unwrapping. * [iOS] Adds @objc attribute for minimal inference. * [tvOS] Fixes closure syntax. * [tvOS] Fixes html to attributed string conversion. * [tvOS] Coverts metadata identifier syntax. * [CoreSummit] Treats string as collection. * [iOS] Treats string as collection. * Updates R.swift.Library dependency. * Updates XLPagerTabStrip dependency. * Updates Cosmos dependency. * Updates project and settings to target swift 4. objc inference still set to match swift 3 behaviour * [iOS] [12678] Rearranges My Summit tabs. * [iOS] Removes schedule view duplicate constraints. * [iOS] Fixes schedule view content view layout bug. * [iOS] Fixes venue detail slideshow full screen image selection. * [iOS] Renames slideshow input source type. * [iOS] [11351] Links location to floor map. * [iOS] [13513] Adds filter by track. * [iOS] [11887] Adds schedule url deep linking. * Renames schedule active dates methods. * [CoreSummit] Fixes summits request. * [iOS] [13776] Improves splash screen transitioning state. * [iOS] [13776] Fixes splash screen logo size. * [iOS] [13776] Adds day counters to splash screen. * [iOS] [13776] Fixes label instances tracking bug. * [iOS] [13776] Fixes summit name bug. * Version bump to 3.0.5. * [iOS] Adds borders to now button.
1 parent 6cff26e commit 6675e15

113 files changed

Lines changed: 1331 additions & 571 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cartfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ github "PureSwift/Predicate" "master"
33
github "OpenStack-Mobile/aerogear-ios-http" "master"
44
github "OpenStack-Mobile/aerogear-ios-oauth2" "openstack"
55
github "JonasGessner/JGProgressHUD"
6-
github "xmartlabs/XLPagerTabStrip"
6+
github "xmartlabs/XLPagerTabStrip" ~> 8.0
77
github "OpenStack-Mobile/SWRevealViewController" "master"
8-
github "mac-cain13/R.swift.Library"
8+
github "mac-cain13/R.swift.Library" "v4.0.0"
99
github "OpenStack-Mobile/HanekeSwift" "master"
1010
github "OpenStack-Mobile/KTCenterFlowLayout" "master"
1111
github "OpenStack-Mobile/AFHorizontalDayPicker" "master"
12-
github "marketplacer/Cosmos"
12+
github "evgenyneu/Cosmos" ~> 13.0
1313
github "zvonicek/ImageSlideshow"
14-
github "OpenStack-Mobile/XCDYouTubeKit"
14+
github "0xced/XCDYouTubeKit" ~> 2.5
1515
github "OpenStack-Mobile/MTDates" "master"
1616
github "OpenStack-Mobile/SlackTextViewController"

‎Cartfile.resolved‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
github "marketplacer/Cosmos" "9.0.0"
1+
github "evgenyneu/Cosmos" "13.0.0"
22
github "OpenStack-Mobile/HanekeSwift" "e97c06307fd8cd5b3a03875d0950d73db688f2bd"
3-
github "zvonicek/ImageSlideshow" "1.3.0"
3+
github "zvonicek/ImageSlideshow" "1.4.1"
44
github "JonasGessner/JGProgressHUD" "v1.4.1"
55
github "PureSwift/JSON" "e208ddd1df2749d4f2fc5bc2392d8bebd1edafb8"
66
github "OpenStack-Mobile/KTCenterFlowLayout" "603f33180563cfa4fcab99a0623bbde21e49665b"
77
github "OpenStack-Mobile/MTDates" "def729947a5f07d6440ce9b97f2761af299bc13c"
88
github "AliSoftware/OHHTTPStubs" "6.0.0"
99
github "PureSwift/Predicate" "36141936dfcacd847f6b5a3a0a08b38e22354576"
10-
github "mac-cain13/R.swift.Library" "v3.0.2"
10+
github "mac-cain13/R.swift.Library" "v4.0.0"
1111
github "OpenStack-Mobile/SWRevealViewController" "c3113e1508597ee2d9ea7081d97caa5117dddf00"
1212
github "OpenStack-Mobile/SlackTextViewController" "v1.9.5"
13-
github "OpenStack-Mobile/XCDYouTubeKit" "2.5.3"
14-
github "xmartlabs/XLPagerTabStrip" "7.0.0"
13+
github "0xced/XCDYouTubeKit" "2.5.6"
14+
github "xmartlabs/XLPagerTabStrip" "8.0.0"
1515
github "OpenStack-Mobile/AFHorizontalDayPicker" "74c3521f935039b2b6e945380ecd06752076ec8a"
1616
github "OpenStack-Mobile/aerogear-ios-http" "60ed79d74e53127efef9ba49fe5d777f40bf2719"
17-
github "OpenStack-Mobile/aerogear-ios-oauth2" "b8c84cf4110d8e2dd2e86d907819ba15005e8502"
17+
github "OpenStack-Mobile/aerogear-ios-oauth2" "5e7580a94af0b326510d2d12e3f35a42bfd82429"

‎OpenStack Summit/CoreSummit/EntityController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public struct ManagedObjectObserverEvent<Decodable: CoreDataDecodable> {
5757

5858
public var updated: (Decodable) -> () = { _ in }
5959

60-
public var deleted: () -> () = { _ in }
60+
public var deleted: () -> () = {}
6161
}
6262

6363
// MARK: - Private

‎OpenStack Summit/CoreSummit/Notification.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public extension Notification {
164164
guard matchString == rawValue
165165
else { return nil }
166166

167-
let captureGroup = (rawValue as NSString).substring(with: match.rangeAt(1))
167+
let captureGroup = (rawValue as NSString).substring(with: match.range(at: 1))
168168

169169
guard let identifier = Identifier(captureGroup)
170170
else { return nil }

‎OpenStack Summit/CoreSummit/PageController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public final class PageController<Item> {
163163

164164
// get items from pages
165165

166-
items = pages.reduce([Item](), { $0.0 + $0.1.items }).map({ .item($0) })
166+
items = pages.reduce([Item](), { $0 + $1.items }).map({ .item($0) })
167167

168168
if dataLoaded == false && items.isEmpty == false {
169169

@@ -197,9 +197,9 @@ public struct PageControllerChange {
197197

198198
public struct PageControllerCallback<Item> {
199199

200-
public var reloadData: () -> () = { _ in }
200+
public var reloadData: () -> () = {}
201201

202-
public var willLoadData: () -> () = { _ in }
202+
public var willLoadData: () -> () = {}
203203

204204
public var didLoadNextPage: (ErrorValue<[PageControllerChange]>) -> () = { _ in }
205205
}

‎OpenStack Summit/CoreSummit/Person.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public struct AddressBook {
4545

4646
let unknownLetter = sections[0] // "#"
4747

48-
guard let firstLetter = person.name.characters.first
48+
guard let firstLetter = person.name.first
4949
else { return unknownLetter }
5050

5151
let uppercaseLetter = String(firstLetter).uppercased()

‎OpenStack Summit/CoreSummit/PresentationMaterial.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public protocol PresentationMaterial: Named {
2121

2222
// MARK: - Extensions
2323

24-
public extension Collection where Iterator.Element: PresentationMaterial {
24+
public extension Collection where Element: PresentationMaterial {
2525

26-
func ordered() -> [Iterator.Element] {
26+
func ordered() -> [Element] {
2727

28-
return self.sorted { $0.0.order < $0.1.order }
28+
return self.sorted { $0.order < $1.order }
2929
}
3030
}

‎OpenStack Summit/CoreSummit/Store.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ public final class Store {
236236
private func createOAuthModule(_ config: AeroGearOAuth2.Config, hasPasscode: Bool) -> OAuth2Module {
237237
var session: OAuth2Session
238238

239-
let prefix = config.isServiceAccount ? "SERVICE_" : ""
240-
config.accountId = "\(prefix)ACCOUNT_FOR_CLIENTID_\(config.clientId)"
239+
config.accountId = "ACCOUNT_FOR_CLIENT_ID_\(config.clientId)"
241240

242241
if self.session.hadPasscode && !hasPasscode {
243242

‎OpenStack Summit/CoreSummit/SummitRequest.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import JSON
1313

1414
public extension Store {
1515
#if MOCKED
16-
func summit(identifier: Identifier? = nil, completion: ErrorValue<Summit> -> ()) {
16+
func summit(_ identifier: Identifier? = nil, completion: @escaping (ErrorValue<Summit>) -> ()) {
1717

18-
let resourcePath = NSBundle(forClass: Store.self).bundlePath + "/Summit7.json"
18+
let resourcePath = Bundle(for: Store.self).bundlePath + "/Summit7.json"
1919

2020
let JSONString = try! String(contentsOfFile: resourcePath)
2121

22-
let json = try? JSON.Value(string: JSONString)!
22+
let json = try! JSON.Value(string: JSONString)
2323

2424
let summit = Summit(json: json)!
2525

@@ -30,12 +30,12 @@ public extension Store {
3030

3131
let managedObject = try summit.save(context)
3232

33-
managedObject.initialDataLoad = NSDate()
33+
managedObject.initialDataLoad = NSDate() as Date
3434

3535
try context.validateAndSave()
3636
}
3737

38-
completion(.Value(summit))
38+
completion(.value(summit))
3939
}
4040
#else
4141
func summit(_ identifier: Identifier? = nil, completion: @escaping (ErrorValue<Summit>) -> ()) {

‎OpenStack Summit/CoreSummit/SummitsRequest.swift‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ public extension Store {
1515

1616
func summits(_ page: Int = 1, objectsPerPage: Int = 30, completion: @escaping (ErrorValue<Page<SummitsResponse.Summit>>) -> ()) {
1717

18-
let uri = "/api/v1/summits?page=\(page)&per_page=\(objectsPerPage)"
18+
// endpoint currently not supporting paging
19+
// let uri = "/api/v1/summits?page=\(page)&per_page=\(objectsPerPage)&relations=none&expand=none"
20+
let uri = "/api/v1/summits?relations=none&expand=none"
1921

2022
let http = self.createHTTP(.serviceAccount)
2123

@@ -70,6 +72,8 @@ public extension SummitsResponse {
7072

7173
public let end: Date
7274

75+
public let defaultStart: Date?
76+
7377
public let active: Bool
7478

7579
public init?(json JSONValue: JSON.Value) {
@@ -92,6 +96,15 @@ public extension SummitsResponse {
9296
self.active = active
9397

9498
self.datesLabel = JSONObject[JSONKey.dates_label.rawValue]?.rawValue as? String
99+
100+
if let scheduleStartDate = JSONObject[JSONKey.schedule_start_date.rawValue]?.integerValue {
101+
102+
self.defaultStart = Date(timeIntervalSince1970: TimeInterval(scheduleStartDate))
103+
104+
} else {
105+
106+
self.defaultStart = nil
107+
}
95108
}
96109
}
97110
}
@@ -104,5 +117,6 @@ public func == (lhs: SummitsResponse.Summit, rhs: SummitsResponse.Summit) -> Boo
104117
&& lhs.datesLabel == rhs.datesLabel
105118
&& lhs.start == rhs.start
106119
&& lhs.end == rhs.end
120+
&& lhs.defaultStart == rhs.defaultStart
107121
&& lhs.active == rhs.active
108122
}

0 commit comments

Comments
 (0)