Use blue navigation style

pull/2/head
Michael Scoff 7 years ago
parent e35a0df995
commit ce42a8e1c2
  1. 4
      Trust.xcodeproj/project.pbxproj
  2. 3
      Trust/Assets.xcassets/toolbar-back.imageset/Contents.json
  3. 3
      Trust/Assets.xcassets/toolbar-forward.imageset/Contents.json
  4. 3
      Trust/Assets.xcassets/toolbar-menu.imageset/Contents.json
  5. 2
      Trust/Browser/ViewControllers/BrowserViewController.swift
  6. 2
      Trust/Info.plist
  7. 12
      Trust/Style/AppStyle.swift
  8. 13
      Trust/UI/BalanceTitleView.swift

@ -311,8 +311,8 @@
77872D27202505C00032D687 /* EnterPasswordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D26202505C00032D687 /* EnterPasswordViewModel.swift */; }; 77872D27202505C00032D687 /* EnterPasswordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D26202505C00032D687 /* EnterPasswordViewModel.swift */; };
77872D292025116E0032D687 /* EnterPasswordCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D282025116E0032D687 /* EnterPasswordCoordinator.swift */; }; 77872D292025116E0032D687 /* EnterPasswordCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D282025116E0032D687 /* EnterPasswordCoordinator.swift */; };
77872D2D202514AD0032D687 /* EnterPasswordCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D2C202514AD0032D687 /* EnterPasswordCoordinatorTests.swift */; }; 77872D2D202514AD0032D687 /* EnterPasswordCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D2C202514AD0032D687 /* EnterPasswordCoordinatorTests.swift */; };
77872D322027AA4A0032D687 /* SliderTextFieldRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D312027AA4A0032D687 /* SliderTextFieldRow.swift */; };
77872D302026DC570032D687 /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D2F2026DC570032D687 /* SplashViewController.swift */; }; 77872D302026DC570032D687 /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D2F2026DC570032D687 /* SplashViewController.swift */; };
77872D322027AA4A0032D687 /* SliderTextFieldRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D312027AA4A0032D687 /* SliderTextFieldRow.swift */; };
778EAF7D1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */; }; 778EAF7D1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */; };
77B3BF352017D0D000EEC15A /* MarketplaceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF342017D0D000EEC15A /* MarketplaceViewModel.swift */; }; 77B3BF352017D0D000EEC15A /* MarketplaceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF342017D0D000EEC15A /* MarketplaceViewModel.swift */; };
77B3BF3C201908ED00EEC15A /* ConfirmCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */; }; 77B3BF3C201908ED00EEC15A /* ConfirmCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */; };
@ -664,8 +664,8 @@
77872D26202505C00032D687 /* EnterPasswordViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnterPasswordViewModel.swift; sourceTree = "<group>"; }; 77872D26202505C00032D687 /* EnterPasswordViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnterPasswordViewModel.swift; sourceTree = "<group>"; };
77872D282025116E0032D687 /* EnterPasswordCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterPasswordCoordinator.swift; sourceTree = "<group>"; }; 77872D282025116E0032D687 /* EnterPasswordCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterPasswordCoordinator.swift; sourceTree = "<group>"; };
77872D2C202514AD0032D687 /* EnterPasswordCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterPasswordCoordinatorTests.swift; sourceTree = "<group>"; }; 77872D2C202514AD0032D687 /* EnterPasswordCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterPasswordCoordinatorTests.swift; sourceTree = "<group>"; };
77872D312027AA4A0032D687 /* SliderTextFieldRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderTextFieldRow.swift; sourceTree = "<group>"; };
77872D2F2026DC570032D687 /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; }; 77872D2F2026DC570032D687 /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
77872D312027AA4A0032D687 /* SliderTextFieldRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderTextFieldRow.swift; sourceTree = "<group>"; };
778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCoordinatorTests.swift; sourceTree = "<group>"; }; 778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCoordinatorTests.swift; sourceTree = "<group>"; };
77B3BF342017D0D000EEC15A /* MarketplaceViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarketplaceViewModel.swift; sourceTree = "<group>"; }; 77B3BF342017D0D000EEC15A /* MarketplaceViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarketplaceViewModel.swift; sourceTree = "<group>"; };
77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmCoordinator.swift; sourceTree = "<group>"; }; 77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmCoordinator.swift; sourceTree = "<group>"; };

@ -17,5 +17,8 @@
"info" : { "info" : {
"version" : 1, "version" : 1,
"author" : "xcode" "author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
} }
} }

@ -17,5 +17,8 @@
"info" : { "info" : {
"version" : 1, "version" : 1,
"author" : "xcode" "author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
} }
} }

@ -17,5 +17,8 @@
"info" : { "info" : {
"version" : 1, "version" : 1,
"author" : "xcode" "author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
} }
} }

@ -56,7 +56,7 @@ class BrowserViewController: UIViewController {
view.addSubview(webView) view.addSubview(webView)
progressView.translatesAutoresizingMaskIntoConstraints = false progressView.translatesAutoresizingMaskIntoConstraints = false
progressView.tintColor = Colors.blue progressView.tintColor = Colors.darkBlue
webView.addSubview(progressView) webView.addSubview(progressView)
webView.bringSubview(toFront: progressView) webView.bringSubview(toFront: progressView)

@ -74,7 +74,7 @@
<string>armv7</string> <string>armv7</string>
</array> </array>
<key>UIStatusBarStyle</key> <key>UIStatusBarStyle</key>
<string>UIStatusBarStyleDefault</string> <string>UIStatusBarStyleLightContent</string>
<key>UIStatusBarTintParameters</key> <key>UIStatusBarTintParameters</key>
<dict> <dict>
<key>UINavigationBar</key> <key>UINavigationBar</key>

@ -9,16 +9,20 @@ func applyStyle() {
} else { } else {
UINavigationBar.appearance().isTranslucent = false UINavigationBar.appearance().isTranslucent = false
} }
UINavigationBar.appearance().tintColor = UIColor.white
UINavigationBar.appearance().tintColor = Colors.blue UINavigationBar.appearance().setBackgroundImage(.filled(with: Colors.darkBlue), for: .default)
UINavigationBar.appearance().titleTextAttributes = [ UINavigationBar.appearance().titleTextAttributes = [
.foregroundColor: Colors.black, .foregroundColor: UIColor.white,
] ]
UIButton.appearance().tintColor = UIColor.white
BalanceTitleView.appearance().titleTextColor = UIColor.white
BalanceTitleView.appearance().subTitleTextColor = UIColor(white: 0.9, alpha: 1)
} }
struct Colors { struct Colors {
static let darkBlue = UIColor(hex: "1E76CE") static let darkBlue = UIColor(hex: "3375BB")
static let blue = UIColor(hex: "2e91db") static let blue = UIColor(hex: "2e91db")
static let red = UIColor(hex: "f7506c") static let red = UIColor(hex: "f7506c")
static let veryLightRed = UIColor(hex: "FFF4F4") static let veryLightRed = UIColor(hex: "FFF4F4")

@ -9,6 +9,16 @@ enum BalanceMode {
class BalanceTitleView: UIView { class BalanceTitleView: UIView {
@objc dynamic var titleTextColor: UIColor? {
get { return self.titleLabel.textColor }
set { self.titleLabel.textColor = newValue }
}
@objc dynamic var subTitleTextColor: UIColor? {
get { return self.subTitleLabel.textColor }
set { self.subTitleLabel.textColor = newValue }
}
let titleLabel = UILabel() let titleLabel = UILabel()
let subTitleLabel = UILabel() let subTitleLabel = UILabel()
var viewModel: BalanceBaseViewModel? { var viewModel: BalanceBaseViewModel? {
@ -53,10 +63,7 @@ class BalanceTitleView: UIView {
private func configure(viewModel: BalanceBaseViewModel) { private func configure(viewModel: BalanceBaseViewModel) {
titleLabel.font = UIFont.systemFont(ofSize: 18, weight: UIFont.Weight.semibold) titleLabel.font = UIFont.systemFont(ofSize: 18, weight: UIFont.Weight.semibold)
titleLabel.textColor = Colors.lightBlack
subTitleLabel.font = UIFont.systemFont(ofSize: 14, weight: UIFont.Weight.regular) subTitleLabel.font = UIFont.systemFont(ofSize: 14, weight: UIFont.Weight.regular)
subTitleLabel.textColor = Colors.darkGray
let amount: String let amount: String
switch mode { switch mode {

Loading…
Cancel
Save