Merge branch 'master' into fix-title-shifts-when-price-refreshes

pull/334/head
James Sangalli 7 years ago committed by GitHub
commit 5cfbaf6c9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      Trust/Localization/en.lproj/Localizable.strings
  2. 1
      Trust/Localization/es.lproj/Localizable.strings
  3. 1
      Trust/Localization/zh-Hans.lproj/Localizable.strings
  4. 22
      Trust/MarketPlace/ViewControllers/MarketplaceViewController.swift

@ -272,3 +272,4 @@
"face.id" = "Face ID";
"undefined.error" = "Undefined error";
"unknown.error" = "An unknown error occurred.";
"coming.soon" = "Coming soon";

@ -272,3 +272,4 @@
"face.id" = "Face ID";
"undefined.error" = "Undefined error";
"unknown.error" = "An unknown error occurred.";
"coming.soon" = "Coming soon";

@ -272,3 +272,4 @@
"face.id" = "面容ID";
"undefined.error" = "未知错误";
"unknown.error" = "出现未知错误.";
"coming.soon" = "Coming soon";

@ -3,14 +3,34 @@
import UIKit
class MarketplaceViewController: UIViewController {
let comingSoonLabel = UILabel()
init() {
super.init(nibName: nil, bundle: nil)
title = R.string.localizable.aMarketplaceTabbarItemTitle()
view.backgroundColor = Colors.appBackground
comingSoonLabel.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(comingSoonLabel)
NSLayoutConstraint.activate([
comingSoonLabel.leadingAnchor.constraint(equalTo: view.leadingAnchor),
comingSoonLabel.trailingAnchor.constraint(equalTo: view.trailingAnchor),
comingSoonLabel.centerYAnchor.constraint(equalTo: view.centerYAnchor, constant: -40),
])
configure()
}
required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
fatalError("init(coder:) has not been implemented")
}
func configure() {
comingSoonLabel.textAlignment = .center
comingSoonLabel.textColor = Colors.appWhite
comingSoonLabel.font = Fonts.regular(size: 20)
comingSoonLabel.text = R.string.localizable.comingSoon()
}
}

Loading…
Cancel
Save