CipherLabs
/
alpha-wallet-ios
mirror of https://github.com/AlphaWallet/alpha-wallet-ios
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make green buttons at the bottom taller to respect safe area for phones with no home buttons, iPhone Xes

Browse Source
pull/925/head
Hwee-Boon Yar 6 years ago
parent 3f791ee617
commit 91a8cd68ae
16 changed files with 35 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      AlphaWallet/Market/ViewControllers/ImportMagicTokenViewController.swift
  2. 4
      AlphaWallet/Redeem/ViewControllers/RedeemTokenCardQuantitySelectionViewController.swift
  3. 4
      AlphaWallet/Redeem/ViewControllers/RedeemTokenViewController.swift
  4. 4
      AlphaWallet/Sell/ViewControllers/EnterSellTokensCardPriceQuantityViewController.swift
  5. 4
      AlphaWallet/Sell/ViewControllers/SellTokensCardViewController.swift
  6. 4
      AlphaWallet/Sell/ViewControllers/SetSellTokensCardExpiryDateViewController.swift
  7. 4
      AlphaWallet/Style/AppStyle.swift
  8. 4
      AlphaWallet/Tokens/ViewControllers/NewTokenViewController.swift
  9. 5
      AlphaWallet/Tokens/ViewControllers/TokensCardViewController.swift
  10. 4
      AlphaWallet/Transfer/ViewControllers/ChooseTokenCardTransferModeViewController.swift
  11. 4
      AlphaWallet/Transfer/ViewControllers/SendViewController.swift
  12. 4
      AlphaWallet/Transfer/ViewControllers/SetTransferTokensCardExpiryDateViewController.swift
  13. 4
      AlphaWallet/Transfer/ViewControllers/TransferTokensCardQuantitySelectionViewController.swift
  14. 4
      AlphaWallet/Transfer/ViewControllers/TransferTokensCardViaWalletAddressViewController.swift
  15. 4
      AlphaWallet/Transfer/ViewControllers/TransferTokensCardViewController.swift
  16. 4
      AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift

4
AlphaWallet/Market/ViewControllers/ImportMagicTokenViewController.swift
Unescape View File

@ -117,7 +117,7 @@ class ImportMagicTokenViewController: UIViewController, OptionalTokenVerifiableS
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
buttonSeparator.translatesAutoresizingMaskIntoConstraints = false
@ -152,7 +152,7 @@ class ImportMagicTokenViewController: UIViewController, OptionalTokenVerifiableS
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
statusLabel.widthAnchor.constraint(equalTo: tokenCardRowView.widthAnchor, constant: -20),

4
AlphaWallet/Redeem/ViewControllers/RedeemTokenCardQuantitySelectionViewController.swift
Unescape View File

@ -81,7 +81,7 @@ class RedeemTokenCardQuantitySelectionViewController: UIViewController, TokenVer
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -103,7 +103,7 @@ class RedeemTokenCardQuantitySelectionViewController: UIViewController, TokenVer
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Redeem/ViewControllers/RedeemTokenViewController.swift
Unescape View File

@ -63,7 +63,7 @@ class RedeemTokenViewController: UIViewController, TokenVerifiableStatusViewCont
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -79,7 +79,7 @@ class RedeemTokenViewController: UIViewController, TokenVerifiableStatusViewCont
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Sell/ViewControllers/EnterSellTokensCardPriceQuantityViewController.swift
Unescape View File

@ -165,7 +165,7 @@ class EnterSellTokensCardPriceQuantityViewController: UIViewController, TokenVer
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -201,7 +201,7 @@ class EnterSellTokensCardPriceQuantityViewController: UIViewController, TokenVer
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),

4
AlphaWallet/Sell/ViewControllers/SellTokensCardViewController.swift
Unescape View File

@ -57,7 +57,7 @@ class SellTokensCardViewController: UIViewController, TokenVerifiableStatusViewC
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -73,7 +73,7 @@ class SellTokensCardViewController: UIViewController, TokenVerifiableStatusViewC
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Sell/ViewControllers/SetSellTokensCardExpiryDateViewController.swift
Unescape View File

@ -164,7 +164,7 @@ class SetSellTokensCardExpiryDateViewController: UIViewController, TokenVerifiab
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -208,7 +208,7 @@ class SetSellTokensCardExpiryDateViewController: UIViewController, TokenVerifiab
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),

4
AlphaWallet/Style/AppStyle.swift
Unescape View File

@ -94,3 +94,7 @@ extension UISegmentedControl {
subviews.forEach { $0.tintColor = Colors.appBackground }
}
}
enum Metrics {
static let greenButtonHeight = CGFloat(48)
}

4
AlphaWallet/Tokens/ViewControllers/NewTokenViewController.swift
Unescape View File

@ -106,7 +106,7 @@ class NewTokenViewController: UIViewController, CanScanQRCode {
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
let xMargin = CGFloat(7)
@ -129,7 +129,7 @@ class NewTokenViewController: UIViewController, CanScanQRCode {
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),

5
AlphaWallet/Tokens/ViewControllers/TokensCardViewController.swift
Unescape View File

@ -99,7 +99,7 @@ class TokensCardViewController: UIViewController, TokenVerifiableStatusViewContr
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
let separator0 = UIView()
@ -136,10 +136,11 @@ class TokensCardViewController: UIViewController, TokenVerifiableStatusViewContr
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
registerForPreviewing(with: self, sourceView: tableView)
}

4
AlphaWallet/Transfer/ViewControllers/ChooseTokenCardTransferModeViewController.swift
Unescape View File

@ -75,7 +75,7 @@ class ChooseTokenCardTransferModeViewController: UIViewController, TokenVerifiab
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
let separator0 = UIView()
@ -106,7 +106,7 @@ class ChooseTokenCardTransferModeViewController: UIViewController, TokenVerifiab
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Transfer/ViewControllers/SendViewController.swift
Unescape View File

@ -173,7 +173,7 @@ class SendViewController: UIViewController, CanScanQRCode, TokenVerifiableStatus
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -209,7 +209,7 @@ class SendViewController: UIViewController, CanScanQRCode, TokenVerifiableStatus
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))

4
AlphaWallet/Transfer/ViewControllers/SetTransferTokensCardExpiryDateViewController.swift
Unescape View File

@ -149,7 +149,7 @@ class SetTransferTokensCardExpiryDateViewController: UIViewController, TokenVeri
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -190,7 +190,7 @@ class SetTransferTokensCardExpiryDateViewController: UIViewController, TokenVeri
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),

4
AlphaWallet/Transfer/ViewControllers/TransferTokensCardQuantitySelectionViewController.swift
Unescape View File

@ -82,7 +82,7 @@ class TransferTokensCardQuantitySelectionViewController: UIViewController, Token
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -104,7 +104,7 @@ class TransferTokensCardQuantitySelectionViewController: UIViewController, Token
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Transfer/ViewControllers/TransferTokensCardViaWalletAddressViewController.swift
Unescape View File

@ -84,7 +84,7 @@ class TransferTokensCardViaWalletAddressViewController: UIViewController, TokenV
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -107,7 +107,7 @@ class TransferTokensCardViaWalletAddressViewController: UIViewController, TokenV
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Transfer/ViewControllers/TransferTokensCardViewController.swift
Unescape View File

@ -59,7 +59,7 @@ class TransferTokensCardViewController: UIViewController, TokenVerifiableStatusV
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
NSLayoutConstraint.activate([
@ -75,7 +75,7 @@ class TransferTokensCardViewController: UIViewController, TokenVerifiableStatusV
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
] + roundedBackground.createConstraintsWithContainer(view: view))
}

4
AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift
Unescape View File

@ -116,7 +116,7 @@ class ImportWalletViewController: UIViewController, CanScanQRCode {
footerBar.backgroundColor = Colors.appHighlightGreen
roundedBackground.addSubview(footerBar)
let buttonsHeight = CGFloat(60)
let buttonsHeight = Metrics.greenButtonHeight
footerBar.addSubview(buttonsStackView)
let xMargin = CGFloat(7)
@ -147,7 +147,7 @@ class ImportWalletViewController: UIViewController, CanScanQRCode {
footerBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
footerBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
footerBar.heightAnchor.constraint(equalToConstant: buttonsHeight),
footerBar.topAnchor.constraint(equalTo: view.layoutGuide.bottomAnchor, constant: -buttonsHeight),
footerBar.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),

Write Preview
Loading…
Cancel
Save