From 0a23065fb1678e03cf02cce2d27dc2b20196469b Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Thu, 13 Jan 2022 11:41:21 +1100 Subject: [PATCH] change home screen title to SESSION --- .../SessionHeading.imageset/Contents.json | 12 ++++++ .../SessionHeading.imageset/heading.pdf | Bin 0 -> 4968 bytes Session/Shared/BaseVC.swift | 11 +++++ SessionUIKit/Style Guide/Colors.swift | 1 + .../session_heading.colorset/Contents.json | 38 ++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 Session/Meta/Images.xcassets/Session/SessionHeading.imageset/Contents.json create mode 100644 Session/Meta/Images.xcassets/Session/SessionHeading.imageset/heading.pdf create mode 100644 SessionUIKit/Style Guide/Colors.xcassets/session_heading.colorset/Contents.json diff --git a/Session/Meta/Images.xcassets/Session/SessionHeading.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/SessionHeading.imageset/Contents.json new file mode 100644 index 000000000..d360cfe11 --- /dev/null +++ b/Session/Meta/Images.xcassets/Session/SessionHeading.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "heading.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Session/Meta/Images.xcassets/Session/SessionHeading.imageset/heading.pdf b/Session/Meta/Images.xcassets/Session/SessionHeading.imageset/heading.pdf new file mode 100644 index 0000000000000000000000000000000000000000..982e95d6f19af42f1ff9d9a43087f691f12515a4 GIT binary patch literal 4968 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 literal 0 HcmV?d00001 diff --git a/Session/Shared/BaseVC.swift b/Session/Shared/BaseVC.swift index 83f9c9262..d68be69f9 100644 --- a/Session/Shared/BaseVC.swift +++ b/Session/Shared/BaseVC.swift @@ -1,3 +1,4 @@ +import SessionUIKit class BaseVC : UIViewController { private var hasGradient = false @@ -75,6 +76,16 @@ class BaseVC : UIViewController { crossfadeLabel.pin(to: container) navigationItem.titleView = container } + + internal func setUpNavBarSessionHeading() { + let headingImageView = UIImageView() + headingImageView.tintColor = Colors.sessionHeading + headingImageView.image = UIImage(named: "SessionHeading")?.withRenderingMode(.alwaysTemplate) + headingImageView.contentMode = .scaleAspectFit + headingImageView.set(.width, to: 150) + headingImageView.set(.height, to: 20) + navigationItem.titleView = headingImageView + } internal func setUpNavBarSessionIcon() { let logoImageView = UIImageView() diff --git a/SessionUIKit/Style Guide/Colors.swift b/SessionUIKit/Style Guide/Colors.swift index 1a150ebc9..35f003175 100644 --- a/SessionUIKit/Style Guide/Colors.swift +++ b/SessionUIKit/Style Guide/Colors.swift @@ -42,4 +42,5 @@ public final class Colors : NSObject { @objc public static var pnOptionBorder: UIColor { UIColor(named: "session_pn_option_border")! } @objc public static var pathsBuilding: UIColor { UIColor(named: "session_paths_building")! } @objc public static var pinIcon: UIColor { UIColor(named: "session_pin_icon")! } + @objc public static var sessionHeading: UIColor { UIColor(named: "session_heading")! } } diff --git a/SessionUIKit/Style Guide/Colors.xcassets/session_heading.colorset/Contents.json b/SessionUIKit/Style Guide/Colors.xcassets/session_heading.colorset/Contents.json new file mode 100644 index 000000000..4da0447c6 --- /dev/null +++ b/SessionUIKit/Style Guide/Colors.xcassets/session_heading.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x82", + "green" : "0xF7", + "red" : "0x00" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +}