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

Use blue navigation style

Browse Source
pull/2/head
Michael Scoff 7 years ago
parent e35a0df995
commit ce42a8e1c2
8 changed files with 31 additions and 11 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
      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

4
Trust.xcodeproj/project.pbxproj
Unescape View File

@ -311,8 +311,8 @@
77872D27202505C00032D687 /* EnterPasswordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D26202505C00032D687 /* EnterPasswordViewModel.swift */; };
77872D292025116E0032D687 /* EnterPasswordCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D282025116E0032D687 /* EnterPasswordCoordinator.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 */; };
77872D322027AA4A0032D687 /* SliderTextFieldRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D312027AA4A0032D687 /* SliderTextFieldRow.swift */; };
778EAF7D1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */; };
77B3BF352017D0D000EEC15A /* MarketplaceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF342017D0D000EEC15A /* MarketplaceViewModel.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>"; };
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>"; };
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>"; };
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>"; };
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>"; };

3
Trust/Assets.xcassets/toolbar-back.imageset/Contents.json vendored
Unescape View File

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

3
Trust/Assets.xcassets/toolbar-forward.imageset/Contents.json vendored
Unescape View File

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

3
Trust/Assets.xcassets/toolbar-menu.imageset/Contents.json vendored
Unescape View File

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

2
Trust/Browser/ViewControllers/BrowserViewController.swift
Unescape View File

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

2
Trust/Info.plist
Unescape View File

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

12
Trust/Style/AppStyle.swift
Unescape View File

@ -9,16 +9,20 @@ func applyStyle() {
} else {
UINavigationBar.appearance().isTranslucent = false
}
UINavigationBar.appearance().tintColor = Colors.blue
UINavigationBar.appearance().tintColor = UIColor.white
UINavigationBar.appearance().setBackgroundImage(.filled(with: Colors.darkBlue), for: .default)
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 {
static let darkBlue = UIColor(hex: "1E76CE")
static let darkBlue = UIColor(hex: "3375BB")
static let blue = UIColor(hex: "2e91db")
static let red = UIColor(hex: "f7506c")
static let veryLightRed = UIColor(hex: "FFF4F4")

13
Trust/UI/BalanceTitleView.swift
Unescape View File

@ -9,6 +9,16 @@ enum BalanceMode {
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 subTitleLabel = UILabel()
var viewModel: BalanceBaseViewModel? {
@ -53,10 +63,7 @@ class BalanceTitleView: UIView {
private func configure(viewModel: BalanceBaseViewModel) {
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.textColor = Colors.darkGray
let amount: String
switch mode {

Write Preview
Loading…
Cancel
Save