Commit d78735ad authored by Jose Blaya's avatar Jose Blaya
Browse files

# Fix minor issues for Get Started screen

- Replace logo image for light version
- Update version label text color and font
- Update background color
parent 16f8faad
......@@ -2,17 +2,7 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "nav-logo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "nav-logo@3x.png",
"scale" : "3x"
"filename" : "piaDark2Copy2.pdf"
}
],
"info" : {
......
......@@ -21,7 +21,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
lineHeight: 20
)
public static let textStyle2 = TextStyle(
......@@ -30,7 +30,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
lineHeight: 20
)
public static let textStyle3 = TextStyle(
......@@ -39,7 +39,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
lineHeight: 20
)
public static let textStyle4 = TextStyle(
......@@ -48,7 +48,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
lineHeight: 20
)
public static let textStyle5 = TextStyle(
......@@ -57,7 +57,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 16
lineHeight: 20
)
public static let textStyle6 = TextStyle(
......@@ -75,7 +75,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 16
lineHeight: 18
)
public static let textStyle8 = TextStyle(
......@@ -111,7 +111,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 22
lineHeight: 16
)
public static let textStyle12 = TextStyle(
......@@ -120,7 +120,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
lineHeight: 16
)
public static let textStyle13 = TextStyle(
......@@ -129,7 +129,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 22
lineHeight: 16
)
public static let textStyle14 = TextStyle(
......@@ -147,7 +147,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
lineHeight: 16
)
public static let textStyle16 = TextStyle(
......@@ -156,7 +156,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 16
lineHeight: 15
)
public static let textStyle17 = TextStyle(
......@@ -165,7 +165,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 16
lineHeight: 15
)
public static let textStyle18 = TextStyle(
......@@ -174,7 +174,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 16
lineHeight: 15
)
public static let textStyle19 = TextStyle(
......@@ -183,7 +183,7 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 20
lineHeight: 15
)
public static let textStyle20 = TextStyle(
......@@ -192,7 +192,16 @@ public extension TextStyle {
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 16
lineHeight: 15
)
public static let versionNumberStyle = TextStyle(
font: UIFont.regularFontWith(size: 14),
color: UIColor.piaGrey4,
foregroundColor: nil,
backgroundColor: nil,
tintColor: nil,
lineHeight: 18
)
public struct Buttons {
......
......@@ -346,6 +346,10 @@ public class Theme {
button.style(style: TextStyle.textStyle6)
}
}
public func applyVersionNumberStyle(_ label: UILabel) {
label.style(style: TextStyle.versionNumberStyle)
}
/// :nodoc:
public func applyTitle(_ label: UILabel, appearance: Appearance) {
......
......@@ -35,6 +35,7 @@ public class GetStartedViewController: AutolayoutViewController, ConfigurationAc
constraintHeaderHeight.constant = (Macros.isDeviceBig ? 250.0 : 150.0)
buttonEnvironment.isHidden = !accessedConfiguration.isDevelopment
labelVersion.text = Macros.localizedVersionFullString()
view.backgroundColor = UIColor.piaGrey1
self.styleButtons()
......@@ -99,8 +100,7 @@ public class GetStartedViewController: AutolayoutViewController, ConfigurationAc
Theme.current.applyLightBackground(viewHeaderBackground)
Theme.current.applyLightBackground(viewHeader)
Theme.current.applyCaption(labelVersion,
appearance: .dark)
Theme.current.applyVersionNumberStyle(labelVersion)
Theme.current.applyCenteredMap(centeredMap)
Theme.current.applyTransparentButton(buyButton,
withSize: 1.0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment