Merge pull request #312 from mohssenfathi/uber-button

Remove UberButton_DEPRECATED

Author: mohssenfathi

Sources/UberAuth/Authorize/AuthenticationSession.swift

@@ -38,7 +38,7 @@ final class AuthenticationSession: AuthenticationSessioning {
                     completion(.failure(UberAuthError.invalidAuthCode))
                 case (.some(let url), _):
                     guard let code = Self.parse(url: url) else {
-                        completion(.failure(UberAuthError.invalidAuthCode))
+                        completion(.failure(Self.parseError(url: url)))
                         return
                     }
                     completion(.success(.init(authorizationCode: code)))
@@ -68,6 +68,19 @@ final class AuthenticationSession: AuthenticationSessioning {
         }
         return codeParameter.value
     }
+    
+    private static func parseError(url: URL) -> UberAuthError {
+        guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+              let errorParameter = components.queryItems?.first(where: { $0.name == "error" })?.value else {
+            return .invalidAuthCode
+        }
+        switch OAuthError(rawValue: errorParameter) {
+        case .some(let error):
+            return UberAuthError.oAuth(error)
+        case .none:
+            return .invalidAuthCode
+        }
+    }
 }
 
 final class AuthPresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding {

Sources/UberAuth/Button/LoginButton.swift

@@ -87,8 +87,8 @@ public final class LoginButton: UberButton {
 
     // MARK: UberButton
 
-    override public var title: String {
-        buttonState.title
+    public override var title: NSAttributedString? {
+        NSAttributedString(string: buttonState.title)
     }
 
     override public var image: UIImage? {

Sources/UberCore/Colors.swift

@@ -5,17 +5,23 @@
 
 import UIKit
 
-extension UIColor {
+public extension UIColor {
 
     static let uberButtonBackground: UIColor = UIColor(
         named: "UberButtonBackground",
         in: .resource(for: UberButton.self),
         compatibleWith: nil
     ) ?? UIColor.darkText
 
-    static let uberButtonHighlightedBackground: UIColor = UIColor(
-        named: "UberButtonHighlightedBackground",
-        in: .resource(for: UberButton.self),
+    static let uberButtonHighlightedDarkBackground: UIColor = UIColor(
+        named: "UberButtonHighlightedDarkBackground",
+        in: .module,
+        compatibleWith: nil
+    ) ?? UIColor.darkText
+    
+    static let uberButtonHighlightedLightBackground: UIColor = UIColor(
+        named: "UberButtonHighlightedLightBackground",
+        in: .module,
         compatibleWith: nil
     ) ?? UIColor.darkText
 

Sources/UberCore/Resources/Media.xcassets/UberButtonHighlightedBackground.colorset/Contents.json Sources/UberCore/Resources/Media.xcassets/UberButtonHighlightedDarkBackground.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xE4",
+          "green" : "0xE5",
+          "red" : "0xE5"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x27",
+          "green" : "0x27",
+          "red" : "0x28"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}