From 9a26f45e731b1c105a1abac521ac442b2b1ad555 Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Sun, 6 Jan 2019 17:42:23 +0800 Subject: [PATCH 1/2] Move status.github.com to www.githubstatus.com for API Status --- Classes/Settings/SettingsViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Settings/SettingsViewController.swift b/Classes/Settings/SettingsViewController.swift index a122f8fca..2696a31d1 100644 --- a/Classes/Settings/SettingsViewController.swift +++ b/Classes/Settings/SettingsViewController.swift @@ -146,7 +146,7 @@ GitHubSessionListener { } private func onGitHubStatus() { - guard let url = URLBuilder(host: "status.github.com").add(path: "messages").url + guard let url = URLBuilder(host: "www.githubstatus.com").url else { return } presentSafari(url: url) } From e847ca04716d104880f80f7d6f53f82abb596dab Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Thu, 24 Jan 2019 16:36:27 +0800 Subject: [PATCH 2/2] Replace all deprecated things --- Classes/Settings/SettingsViewController.swift | 10 +++++----- Classes/Views/Styles.swift | 5 +++++ .../GitHubAPI/GitHubAPIStatusRequest.swift | 15 +++++++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Classes/Settings/SettingsViewController.swift b/Classes/Settings/SettingsViewController.swift index 2696a31d1..4e2de1017 100644 --- a/Classes/Settings/SettingsViewController.swift +++ b/Classes/Settings/SettingsViewController.swift @@ -86,15 +86,15 @@ GitHubSessionListener { case .success(let response): let text: String let color: UIColor - switch response.data.status { - case .good: - text = NSLocalizedString("Good", comment: "") + text = response.data.status.description + switch response.data.status.indicator { + case .normal: color = Styles.Colors.Green.medium.color case .minor: - text = NSLocalizedString("Minor", comment: "") color = Styles.Colors.Yellow.medium.color case .major: - text = NSLocalizedString("Major", comment: "") + color = Styles.Colors.Orange.medium.color + case .critical: color = Styles.Colors.Red.medium.color } strongSelf.apiStatusView.isHidden = false diff --git a/Classes/Views/Styles.swift b/Classes/Views/Styles.swift index d99f72ace..79cab1174 100644 --- a/Classes/Views/Styles.swift +++ b/Classes/Views/Styles.swift @@ -105,6 +105,11 @@ enum Styles { static let light = "f1f8ff" static let menu = "5d9cf4" } + + enum Orange { + static let medium = "fe642e" + static let light = "f6d8ce" + } enum Gray { static let dark = "24292e" diff --git a/Local Pods/GitHubAPI/GitHubAPI/GitHubAPIStatusRequest.swift b/Local Pods/GitHubAPI/GitHubAPI/GitHubAPIStatusRequest.swift index 728b2366e..0bba653f5 100644 --- a/Local Pods/GitHubAPI/GitHubAPI/GitHubAPIStatusRequest.swift +++ b/Local Pods/GitHubAPI/GitHubAPI/GitHubAPIStatusRequest.swift @@ -9,15 +9,22 @@ import Foundation public struct APIStatus: Codable { - public enum StatusType: String, Codable { - case good, minor, major + public let status: Status +} + +public struct Status: Codable { + public let indicator: StatusType + public let description: String + + public enum StatusType: String, Codable, CodingKey { + case normal = "none" + case minor, major, critical } - public let status: StatusType } public struct GitHubAPIStatusRequest: HTTPRequest { public typealias ResponseType = V3DataResponse - public var url: String { return "https://status.github.com/api/status.json" } + public var url: String { return "https://www.githubstatus.com/api/v2/status.json" } public var logoutOnAuthFailure: Bool { return false } public var method: HTTPMethod { return .get } public var parameters: [String : Any]? { return nil }