Merge branch 'master' into fix-done-button-in-enter-sell-ticket-quantity-wrong-color

Trust/Market/ViewModels/ImportTicketViewControllerViewModel.swift

@@ -143,7 +143,7 @@ struct ImportTicketViewControllerViewModel {
     }
 
     var ethCostLabelLabelColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var ethCostLabelLabelFont: UIFont {
@@ -172,7 +172,7 @@ struct ImportTicketViewControllerViewModel {
     }
 
     var dollarCostLabelLabelColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var dollarCostLabelLabelFont: UIFont {

Trust/Redeem/ViewModels/RedeemTicketsQuantitySelectionViewModel.swift

@@ -38,7 +38,7 @@ struct RedeemTicketsQuantitySelectionViewModel {
     }
 
     var subtitleColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var subtitleFont: UIFont {

Trust/Sell/ViewControllers/SetSellTicketsExpiryDateViewController.swift

@@ -368,15 +368,3 @@ extension SetSellTicketsExpiryDateViewController: TimeEntryFieldDelegate {
         }
     }
 }
-
-extension SetSellTicketsExpiryDateViewController: AmountTextFieldDelegate {
-    func changeAmount(in textField: AmountTextField) {
-        viewModel.ethCost = textField.ethCost
-        configure(viewModel: viewModel)
-    }
-
-    func changeType(in textField: AmountTextField) {
-        viewModel.ethCost = textField.ethCost
-        configure(viewModel: viewModel)
-    }
-}

Trust/Sell/ViewModels/EnterSellTicketsPriceQuantityViewControllerViewModel.swift

@@ -34,7 +34,7 @@ struct EnterSellTicketsPriceQuantityViewControllerViewModel {
     }
 
     var choiceLabelColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var choiceLabelFont: UIFont {
@@ -111,7 +111,7 @@ struct EnterSellTicketsPriceQuantityViewControllerViewModel {
     }
 
     var dollarCostLabelLabelColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var dollarCostLabelLabelFont: UIFont {

Trust/Sell/ViewModels/SetSellTicketsExpiryDateViewControllerViewModel.swift

@@ -30,7 +30,7 @@ struct SetSellTicketsExpiryDateViewControllerViewModel {
     }
 
     var choiceLabelColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var choiceLabelFont: UIFont {

Trust/Sell/Views/AmountTextField.swift

@@ -68,7 +68,7 @@ class AmountTextField: UIControl {
 
         alternativeAmountLabel.translatesAutoresizingMaskIntoConstraints = false
         alternativeAmountLabel.numberOfLines = 0
-        alternativeAmountLabel.textColor = UIColor(red: 155, green: 155, blue: 155)
+        alternativeAmountLabel.textColor = Colors.appGrayLabelColor
         alternativeAmountLabel.font = Fonts.regular(size: 10)!
         alternativeAmountLabel.textAlignment = .center
 
@@ -85,7 +85,7 @@ class AmountTextField: UIControl {
     private func makeAmountRightView() -> UIView {
         fiatButton.translatesAutoresizingMaskIntoConstraints = false
         fiatButton.setTitle(currentPair.left, for: .normal)
-        fiatButton.setTitleColor(UIColor(red: 155, green: 155, blue: 155), for: .normal)
+        fiatButton.setTitleColor(Colors.appGrayLabelColor, for: .normal)
         fiatButton.addTarget(self, action: #selector(fiatAction), for: .touchUpInside)
 
         let amountRightView = UIStackView(arrangedSubviews: [

Trust/Style/AppStyle.swift

@@ -64,6 +64,7 @@ struct Colors {
     static let appHighlightGreen = UIColor(red: 117, green: 185, blue: 67)
     static let appLightButtonSeparator = UIColor(red: 255, green: 255, blue: 255, alpha: 0.2)
     static let appRed = UIColor(red: 204, green: 71, blue: 65)
+    static let appGrayLabelColor = UIColor(red: 155, green: 155, blue: 155)
 }
 
 struct StyleLayout {

Trust/Tokens/ViewModels/EthTokenViewCellViewModel.swift

@@ -72,7 +72,7 @@ struct EthTokenViewCellViewModel {
     }
 
     var textColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var valuePercentageChangeColor: UIColor {

Trust/Transfer/ViewControllers/SendViewController.swift

@@ -545,13 +545,13 @@ class SendViewController: UIViewController {
         pasteButton.translatesAutoresizingMaskIntoConstraints = false
         pasteButton.setTitle(R.string.localizable.sendPasteButtonTitle(), for: .normal)
         pasteButton.titleLabel?.font = Fonts.regular(size: 14)!
-        pasteButton.setTitleColor(UIColor(red: 155, green: 155, blue: 155), for: .normal)
+        pasteButton.setTitleColor(Colors.appGrayLabelColor, for: .normal)
         pasteButton.addTarget(self, action: #selector(pasteAction), for: .touchUpInside)
 
         let scanQRCodeButton = Button(size: .normal, style: .borderless)
         scanQRCodeButton.translatesAutoresizingMaskIntoConstraints = false
         scanQRCodeButton.setImage(R.image.qr_code_icon(), for: .normal)
-        scanQRCodeButton.setTitleColor(UIColor(red: 155, green: 155, blue: 155), for: .normal)
+        scanQRCodeButton.setTitleColor(Colors.appGrayLabelColor, for: .normal)
         scanQRCodeButton.addTarget(self, action: #selector(openReader), for: .touchUpInside)
 
         let targetAddressRightView = UIStackView(arrangedSubviews: [
@@ -570,7 +570,7 @@ class SendViewController: UIViewController {
         let fiatButton = Button(size: .normal, style: .borderless)
         fiatButton.translatesAutoresizingMaskIntoConstraints = false
         fiatButton.setTitle(currentPair.left, for: .normal)
-        fiatButton.setTitleColor(UIColor(red: 155, green: 155, blue: 155), for: .normal)
+        fiatButton.setTitleColor(Colors.appGrayLabelColor, for: .normal)
         fiatButton.addTarget(self, action: #selector(fiatAction), for: .touchUpInside)
         fiatButton.isHidden = !viewModel.showAlternativeAmount
 

Trust/Transfer/ViewControllers/TransferTicketsViaWalletAddressViewController.swift

@@ -195,13 +195,13 @@ class TransferTicketsViaWalletAddressViewController: UIViewController {
         pasteButton.translatesAutoresizingMaskIntoConstraints = false
         pasteButton.setTitle(R.string.localizable.sendPasteButtonTitle(), for: .normal)
         pasteButton.titleLabel?.font = Fonts.regular(size: 14)!
-        pasteButton.setTitleColor(UIColor(red: 155, green: 155, blue: 155), for: .normal)
+        pasteButton.setTitleColor(Colors.appGrayLabelColor, for: .normal)
         pasteButton.addTarget(self, action: #selector(pasteAction), for: .touchUpInside)
 
         let scanQRCodeButton = Button(size: .normal, style: .borderless)
         scanQRCodeButton.translatesAutoresizingMaskIntoConstraints = false
         scanQRCodeButton.setImage(R.image.qr_code_icon(), for: .normal)
-        scanQRCodeButton.setTitleColor(UIColor(red: 155, green: 155, blue: 155), for: .normal)
+        scanQRCodeButton.setTitleColor(Colors.appGrayLabelColor, for: .normal)
         scanQRCodeButton.addTarget(self, action: #selector(openReader), for: .touchUpInside)
 
         let targetAddressRightView = UIStackView(arrangedSubviews: [

Trust/Transfer/ViewModels/SendHeaderViewViewModel.swift

@@ -45,7 +45,7 @@ struct SendHeaderViewViewModel {
     }
 
     var textColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var valuePercentageChangeColor: UIColor {

Trust/Transfer/ViewModels/SendViewModel.swift

@@ -69,7 +69,7 @@ struct SendViewModel {
     }
 
     var alternativeAmountColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
     var alternativeAmountFont: UIFont {
         return Fonts.regular(size: 10)!
@@ -121,7 +121,7 @@ struct SendViewModel {
         return R.string.localizable.copy()
     }
     var textFieldsLabelTextColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
     var textFieldsLabelFont: UIFont {
         return Fonts.regular(size: 10)!

Trust/Transfer/ViewModels/SetTransferTicketsExpiryDateViewControllerViewModel.swift

@@ -93,7 +93,7 @@ struct SetTransferTicketsExpiryDateViewControllerViewModel {
     }
     
     var choiceLabelColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var choiceLabelFont: UIFont {

Trust/Transfer/ViewModels/TransferTicketsQuantitySelectionViewModel.swift

@@ -32,7 +32,7 @@ struct TransferTicketsQuantitySelectionViewModel {
     }
 
     var subtitleColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
 
     var subtitleFont: UIFont {

Trust/Transfer/ViewModels/TransferTicketsViaWalletAddressViewControllerViewModel.swift

@@ -71,7 +71,7 @@ struct TransferTicketsViaWalletAddressViewControllerViewModel {
         return 22
     }
     var textFieldsLabelTextColor: UIColor {
-        return UIColor(red: 155, green: 155, blue: 155)
+        return Colors.appGrayLabelColor
     }
     var textFieldsLabelFont: UIFont {
         return Fonts.regular(size: 10)!