Skip to content

Commit

Permalink
update uniform colors
Browse files Browse the repository at this point in the history
  • Loading branch information
@macsleven
macsleven committed Jan 3, 2020
1 parent a4a1329 commit 416955c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 31 deletions.
50 changes: 32 additions & 18 deletions Decred Wallet/Extensions/UIColor.swift
View file
Expand Up @@ -10,29 +10,43 @@ import Foundation
import UIKit

extension UIColor {
// todo: significantly fewer colors should be left here once the implementation of the new
// interface design is completed as the new design uses fewer colors generally.
struct appColors {
// decred colors are from https://decred.org/brand/
static let decredBlue = UIColor.init(hex: "#2970FF")
static let decredGreen = UIColor.init(hex: "#41BF53")
static let decredOrange = UIColor.init(hex: "#ED6D47")
static let darkYellowWarning = UIColor.init(hex: "#E7C659")
static let green = UIColor.init(hex: "#2DD8A3")
static let lightGray = UIColor.init(hex: "#DEE1E3")
static let lighterGray = UIColor.init(hex: "#C4CBD2")
static let offWhite = UIColor(hex:"#F3F5F6")
static let lightOffWhite = UIColor(hex: "#F9FBFA")
static let yellowWarning = UIColor.init(hex: "#FFC84E")
// static let darkYellowWarning = UIColor.init(hex: "#E7C659")
static let thinGray = UIColor.init(hex: "#a4abb1")
static let darkGray = UIColor.init(hex: "#4e5f70")
static let darkerGray = UIColor.init(hex: "#4e5f70")
static let transparentThinGray = UIColor.init(hex: "#a4abb1", alpha: 0.3)
static let darkBlue = UIColor.init(hex: "#3d5873")
static let lightGreen = UIColor.init(hex: "#41be53")
static let darkText = UIColor.init(hex: "#091440")
static let shadowColor = UIColor(hex: "#3D0914")
static let faddedGray = UIColor(hex: "#e6eaed")

// following are colors from new mockup color guide
// ultimately other color constants should end up being obsolete once
// the implementation of the new mockup is completed
static let blue = UIColor.init(hex: "#1B41B3")
static let lightBlue = UIColor.init(hex: "#2970FF")
static let darkBlue = UIColor.init(hex: "#091440")
static let skyBlue = UIColor.init(hex: "#70CBFF")
static let lightSkyBlue = UIColor.init(hex: "#E9F8FE")

static let green = UIColor.init(hex: "#41BE53")
static let lightGreen = UIColor.init(hex: "#C4ECCA")
static let turquoise = UIColor.init(hex: "#2DD8A3")
static let darkTurquoise = UIColor.init(hex: "#14A078")

static let orange = UIColor.init(hex: "#ED6D47")
static let lightOrange = UIColor.init(hex: "#FEB8A5")

static let yellow = UIColor.init(hex: "#FFC84E")
static let lightYellow = UIColor.init(hex: "#FFE4A7")

static let bluishGray = UIColor.init(hex: "#596D81")
static let darkBluishGray = UIColor.init(hex: "#3D5873")
static let lightBluishGray = UIColor.init(hex: "#8997A5")

static let gray = UIColor.init(hex: "#E6EAED")
static let darkGray = UIColor.init(hex: "#C4CBD2")
static let lightGray = UIColor.init(hex: "#EDEFF1")

static let offWhite = UIColor(hex:"#F3F5F6")
static let lightOffWhite = UIColor(hex: "#F9FAFA")
}

convenience init(hex: String) {
Expand Down
10 changes: 5 additions & 5 deletions Decred Wallet/Features/Wallet Setup/RecoverExistingWalletViewController.swift
View file
Expand Up @@ -109,9 +109,9 @@ class RecoverExistingWalletViewController: WalletSetupBaseViewController, UITabl
let seedWordCell = tableView.dequeueReusableCell(withIdentifier: "seedWordCell", for: indexPath) as! RecoveryWalletSeedWordCell

seedWordCell.lbSeedWordNum.text = String(format: LocalizedStrings.wordNumber, indexPath.row + 1)
seedWordCell.lbSeedWordNum.layer.borderColor = UIColor.appColors.darkText.cgColor
seedWordCell.lbSeedWordNum.layer.borderColor = UIColor.appColors.darkBlue.cgColor
seedWordCell.seedWordAutoComplete.text = self.userEnteredSeedWords[indexPath.row]
seedWordCell.cellBorder.layer.borderColor = UIColor.appColors.faddedGray.cgColor
seedWordCell.cellBorder.layer.borderColor = UIColor.appColors.gray.cgColor
seedWordCell.seedWordAutoComplete.resignFirstResponder()

seedWordCell.setupAutoComplete(for: indexPath.row,
Expand Down Expand Up @@ -141,9 +141,9 @@ class RecoverExistingWalletViewController: WalletSetupBaseViewController, UITabl
}

if !self.userEnteredSeedWords.contains("") {
self.btnConfirm.backgroundColor = UIColor.appColors.decredGreen
self.btnConfirm.backgroundColor = UIColor.appColors.lightBlue
} else {
self.btnConfirm.backgroundColor = UIColor.appColors.lighterGray
self.btnConfirm.backgroundColor = UIColor.appColors.darkGray
}
}

Expand All @@ -165,7 +165,7 @@ class RecoverExistingWalletViewController: WalletSetupBaseViewController, UITabl
if validatedSeed.valid {
self.tableView.isUserInteractionEnabled = false
self.btnConfirm.setTitle(LocalizedStrings.success, for: .normal)
self.btnConfirm.setTitleColor(UIColor.appColors.lightGreen, for: .normal)
self.btnConfirm.setTitleColor(UIColor.appColors.green, for: .normal)
self.btnConfirm.setImage(.init(imageLiteralResourceName: "success_checked"), for: .normal)
self.btnConfirm.backgroundColor = .white
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
Expand Down
16 changes: 8 additions & 8 deletions Decred Wallet/table_view_cell/RecoveryWalletSeedWordCell.swift
View file
Expand Up @@ -38,9 +38,9 @@ class RecoveryWalletSeedWordCell: UITableViewCell {
func seedWordSelected(_ selectedWord: String) {
self.seedWordAutoComplete.text = selectedWord
self.onSeedEntered!(self.fieldIndex!, selectedWord, true)
self.lbSeedWordNum.layer.borderColor = UIColor.appColors.darkText.cgColor
self.cellBorder.layer.borderColor = UIColor.appColors.faddedGray.cgColor
self.seedWordAutoComplete.textColor = UIColor.appColors.darkText
self.lbSeedWordNum.layer.borderColor = UIColor.appColors.darkBlue.cgColor
self.cellBorder.layer.borderColor = UIColor.appColors.gray.cgColor
self.seedWordAutoComplete.textColor = UIColor.appColors.darkBlue
}

func textEditingEndedWithoutPickingSeedWord() {
Expand All @@ -49,18 +49,18 @@ class RecoveryWalletSeedWordCell: UITableViewCell {
}

func textEditingFocussed() {
self.cellBorder.layer.borderColor = UIColor.appColors.decredBlue.cgColor
self.lbSeedWordNum.layer.borderColor = UIColor.appColors.decredBlue.cgColor
self.cellBorder.layer.borderColor = UIColor.appColors.lightBlue.cgColor
self.lbSeedWordNum.layer.borderColor = UIColor.appColors.lightBlue.cgColor
}

func setTextAppearance() {
let currentText = self.seedWordAutoComplete.text ?? ""
// validate and define text appearance
let isValidWordOrEmptyString = self.validSeedWords.contains(currentText) || currentText.isEmpty
let lbSeedWordNumBorderColor = isValidWordOrEmptyString ? UIColor.appColors.darkText.cgColor: UIColor.appColors.decredOrange.cgColor
let lbSeedWordNumBorderColor = isValidWordOrEmptyString ? UIColor.appColors.darkBlue.cgColor: UIColor.appColors.orange.cgColor
let seedWordAutoCompleteClearButtonMode = isValidWordOrEmptyString ? UITextField.ViewMode.whileEditing : UITextField.ViewMode.always
let cellBorderBorderColor = isValidWordOrEmptyString ? UIColor.appColors.faddedGray.cgColor: UIColor.appColors.decredOrange.cgColor
let seedWordAutoCompleteTextColor = isValidWordOrEmptyString ? UIColor.appColors.darkText: UIColor.appColors.decredOrange
let cellBorderBorderColor = isValidWordOrEmptyString ? UIColor.appColors.gray.cgColor: UIColor.appColors.orange.cgColor
let seedWordAutoCompleteTextColor = isValidWordOrEmptyString ? UIColor.appColors.darkBlue: UIColor.appColors.orange

self.lbSeedWordNum.layer.borderColor = lbSeedWordNumBorderColor
self.seedWordAutoComplete.textColor = seedWordAutoCompleteTextColor
Expand Down

0 comments on commit 416955c

Please sign in to comment.