Merge pull request #7 from codeRIT/peter

Clean start, basic login (non-native)

Author: cbaudouinjr

BrickHack-Mobile.xcodeproj/project.pbxproj

@@ -0,0 +1,93 @@
+//
+//  AlertMessage.swift
+//  BrickHack-Mobile
+//
+//  Created by Peter Kos on 10/4/19.
+//  Copyright © 2019 codeRIT. All rights reserved.
+//
+
+import SwiftMessages
+
+
+class MessageHandler {
+
+    // A set of common message types
+    // @TODO: Flesh these out as needed (error=red, warning=yellow, info=blue styles)
+    // For now, only error is supported.
+    enum MessageType {
+        case error, warning, info
+    }
+
+    // Wrapper for SwiftMessages that configures standard properties for this project.
+    // Precondition: must be called on the main thread
+    static func showAlertMessage(withTitle title: String, body: String, type: MessageType ) {
+
+        let view = MessageView.viewFromNib(layout: .tabView)
+        view.configureTheme(.error)
+        view.button?.isHidden = true
+        view.configureContent(title: title,
+                              body: body,
+                              iconText: "⚠️")
+
+        // Tapping message will hide view
+        view.tapHandler       = { _ in SwiftMessages.hide() }
+
+        // Configure view properties
+        // @TODO: Add progress bar timer, à-la Discord?
+        var config = SwiftMessages.Config()
+        config.presentationStyle = .center
+        config.dimMode = .color(color: UIColor.black.withAlphaComponent(0.5), interactive: true)
+        config.preferredStatusBarStyle = .lightContent
+        config.duration = .automatic
+
+
+        SwiftMessages.show(config: config, view: view)
+
+    }
+
+    static func showConnectionError() {
+        print("ERROR: Connection Error")
+        showAlertMessage(withTitle: "Unable To Connect",
+                         body: "Make sure you're connected to the internet.",
+                         type: .error)
+    }
+
+    static func showAuthorizationDeniedError(withText error: Error) {
+        print("ERROR: Authorization Denied")
+        print(error.localizedDescription)
+        showAlertMessage(withTitle: "Authorization Denied",
+                         body: "Please try again.",
+                         type: .error)
+    }
+
+    static func showInvalidUserError() {
+        print("ERROR: Invalid user")
+        showAlertMessage(withTitle: "Invalid User",
+                         body: "Please log in again.",
+                         type: .error)
+    }
+
+    static func showAuthSigningError() {
+        print("ERROR: Auth signing error")
+        showAlertMessage(withTitle: "Authentication Error",
+                         body: "Please try logging in again.",
+                         type: .error)
+    }
+
+    static func showNetworkError(withText errorText: String) {
+        print("ERROR: Network Error")
+        print(errorText)
+        showAlertMessage(withTitle: "Networking Error",
+                         body: "Error grabbing user info from server.",
+                         type: .error)
+    }
+
+    static func showUserDataParsingError(withText errorText: String = "") {
+        print("ERROR: User Data Parsing Error")
+        print(errorText)
+        showAlertMessage(withTitle: "Parsing Error",
+                         body: "Error parsing user info from server.",
+                         type: .error)
+
+    }
+}

BrickHack-Mobile.xcworkspace/contents.xcworkspacedata

@@ -13,16 +13,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
 
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
-        if "brickhack-ios" == url.scheme{
+
+        if "brickhack-ios" == url.scheme {
             if let vc = window?.rootViewController as? LoginViewController {
-                vc.oauth2.handleRedirectURL(url)
+                vc.oauthGrant.handleRedirectURL(url)
                 return true
             }
         }

BrickHack-Mobile/AlertMessage.swift

@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.216",
+          "alpha" : "1.000",
+          "blue" : "0.345",
+          "green" : "0.278"
+        }
+      }
+    }
+  ]
+}

BrickHack-Mobile/AppDelegate.swift

@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x36",
+          "alpha" : "1.000",
+          "blue" : "0x58",
+          "green" : "0x47"
+        }
+      }
+    }
+  ]
+}