neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-20 04:03:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revises Auth flow UI

Browse Source
This commit is contained in:
Riley Testut
2019-09-07 15:29:19 -07:00
parent f5ea5a140a
commit ab8d51c000
11 changed files with 650 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
AltStore/Authentication/AuthenticationViewController.swift
View File

@@ -2,48 +2,57 @@
// AuthenticationViewController.swift
// AltStore
//
// Created by Riley Testut on 6/5/19.
// Created by Riley Testut on 9/5/19.
// Copyright © 2019 Riley Testut. All rights reserved.
//
import UIKit
import AltSign
import Roxas
class AuthenticationViewController: UITableViewController
class AuthenticationViewController: UIViewController
{
var authenticationHandler: (((ALTAccount, String)?) -> Void)?
private var _didLayoutSubviews = false
private weak var toastView: ToastView?
@IBOutlet private var emailAddressTextField: UITextField!
@IBOutlet private var appleIDTextField: UITextField!
@IBOutlet private var passwordTextField: UITextField!
@IBOutlet private var signInButton: UIButton!
@IBOutlet private var appleIDBackgroundView: UIView!
@IBOutlet private var passwordBackgroundView: UIView!
@IBOutlet private var scrollView: UIScrollView!
@IBOutlet private var contentStackView: UIStackView!
override func viewDidLoad()
{
super.viewDidLoad()
self.update()
}
override func viewDidLayoutSubviews()
{
super.viewDidLayoutSubviews()
if !_didLayoutSubviews
for view in [self.appleIDBackgroundView!, self.passwordBackgroundView!, self.signInButton!]
{
self.emailAddressTextField.becomeFirstResponder()
view.clipsToBounds = true
view.layer.cornerRadius = 16
}
if UIScreen.main.isExtraCompactHeight
{
self.contentStackView.spacing = 20
}
_didLayoutSubviews = true
NotificationCenter.default.addObserver(self, selector: #selector(AuthenticationViewController.textFieldDidChangeText(_:)), name: UITextField.textDidChangeNotification, object: self.appleIDTextField)
NotificationCenter.default.addObserver(self, selector: #selector(AuthenticationViewController.textFieldDidChangeText(_:)), name: UITextField.textDidChangeNotification, object: self.passwordTextField)
self.update()
}
override func viewDidDisappear(_ animated: Bool)
{
super.viewDidDisappear(animated)
self.navigationItem.rightBarButtonItem?.isIndicatingActivity = false
self.signInButton.isIndicatingActivity = false
self.toastView?.dismiss()
}
}
@@ -53,39 +62,25 @@ private extension AuthenticationViewController
{
if let _ = self.validate()
{
self.navigationItem.rightBarButtonItem?.isEnabled = true
self.signInButton.isEnabled = true
self.signInButton.alpha = 1.0
}
else
{
self.navigationItem.rightBarButtonItem?.isEnabled = false
self.signInButton.isEnabled = false
self.signInButton.alpha = 0.6
}
}
func validate() -> (String, String)?
{
guard
let emailAddress = self.emailAddressTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines), !emailAddress.isEmpty,
let emailAddress = self.appleIDTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines), !emailAddress.isEmpty,
let password = self.passwordTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines), !password.isEmpty
else { return nil }
return (emailAddress, password)
}
func authenticate(emailAddress: String, password: String, completionHandler: @escaping (Result<(ALTAccount, [ALTTeam]), Error>) -> Void)
{
ALTAppleAPI.shared.authenticate(appleID: emailAddress, password: password) { (account, error) in
switch Result(account, error)
{
case .failure(let error): completionHandler(.failure(error))
case .success(let account):
ALTAppleAPI.shared.fetchTeams(for: account) { (teams, error) in
let result = Result(teams, error).map { (account, $0) }
completionHandler(result)
}
}
}
}
}
private extension AuthenticationViewController
@@ -94,10 +89,10 @@ private extension AuthenticationViewController
{
guard let (emailAddress, password) = self.validate() else { return }
self.emailAddressTextField.resignFirstResponder()
self.appleIDTextField.resignFirstResponder()
self.passwordTextField.resignFirstResponder()
self.navigationItem.rightBarButtonItem?.isIndicatingActivity = true
self.signInButton.isIndicatingActivity = true
ALTAppleAPI.shared.authenticate(appleID: emailAddress, password: password) { (account, error) in
do
@@ -108,17 +103,22 @@ private extension AuthenticationViewController
catch
{
DispatchQueue.main.async {
let toastView = RSTToastView(text: NSLocalizedString("Failed to Log In", comment: ""), detailText: error.localizedDescription)
toastView.tintColor = .altPurple
toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
let toastView = ToastView(text: NSLocalizedString("Failed to Log In", comment: ""), detailText: error.localizedDescription)
toastView.tintColor = .altGreen
toastView.show(in: self.navigationController?.view ?? self.view)
self.toastView = toastView
self.navigationItem.rightBarButtonItem?.isIndicatingActivity = false
self.signInButton.isIndicatingActivity = false
}
}
DispatchQueue.main.async {
self.scrollView.setContentOffset(CGPoint(x: 0, y: -self.view.safeAreaInsets.top), animated: true)
}
}
}
@IBAction func cancel()
@IBAction func cancel(_ sender: UIBarButtonItem)
{
self.authenticationHandler?(nil)
}
@@ -130,7 +130,7 @@ extension AuthenticationViewController: UITextFieldDelegate
{
switch textField
{
case self.emailAddressTextField: self.passwordTextField.becomeFirstResponder()
case self.appleIDTextField: self.passwordTextField.becomeFirstResponder()
case self.passwordTextField: self.authenticate()
default: break
}
@@ -140,12 +140,21 @@ extension AuthenticationViewController: UITextFieldDelegate
return false
}
func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool
func textFieldDidBeginEditing(_ textField: UITextField)
{
DispatchQueue.main.async {
self.update()
}
guard UIScreen.main.isExtraCompactHeight else { return }
return true
// Position all the controls within visible frame.
var contentOffset = self.scrollView.contentOffset
contentOffset.y = 44
self.scrollView.setContentOffset(contentOffset, animated: true)
}
}
extension AuthenticationViewController
{
@objc func textFieldDidChangeText(_ notification: Notification)
{
self.update()
}
}