From 67a9047df72de9aa3141380b55d60755ba0fdb11 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 12 Sep 2022 13:10:51 +1000 Subject: [PATCH] update grey background color --- Session/Closed Groups/NewClosedGroupVC.swift | 24 +++++++++++-------- Session/Settings/SettingsVC.swift | 2 +- .../SAEScreenLockViewController.swift | 2 +- SessionUIKit/Components/SearchBar.swift | 2 ++ .../Contents.json | 6 ++--- SessionUIKit/Style Guide/Gradients.swift | 2 +- .../OWSViewController+ImageEditor.swift | 2 +- .../Screen Lock/ScreenLockViewController.m | 2 +- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Session/Closed Groups/NewClosedGroupVC.swift b/Session/Closed Groups/NewClosedGroupVC.swift index 08d06a23d..a4637b5af 100644 --- a/Session/Closed Groups/NewClosedGroupVC.swift +++ b/Session/Closed Groups/NewClosedGroupVC.swift @@ -25,10 +25,15 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate // MARK: - Components - private lazy var nameTextField = TextField( - placeholder: "vc_create_closed_group_text_field_hint".localized(), - customHeight: 48 - ) + private lazy var nameTextField: TextField = { + let result = TextField( + placeholder: "vc_create_closed_group_text_field_hint".localized(), + customHeight: 48 + ) + result.layer.borderColor = Colors.border.withAlphaComponent(0.5).cgColor + result.layer.cornerRadius = 13 + return result + }() private lazy var searchBar: ContactsSearchBar = { let result = ContactsSearchBar() @@ -64,8 +69,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate override func viewDidLoad() { super.viewDidLoad() - - setUpGradientBackground() + view.backgroundColor = Colors.navigationBarBackground setUpNavBarStyle() let customTitleFontSize = Values.largeFontSize @@ -108,16 +112,16 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate let nameTextFieldContainer: UIView = UIView() nameTextFieldContainer.addSubview(nameTextField) - nameTextField.pin(.leading, to: .leading, of: nameTextFieldContainer, withInset: Values.largeSpacing) + nameTextField.pin(.leading, to: .leading, of: nameTextFieldContainer, withInset: Values.mediumSpacing) nameTextField.pin(.top, to: .top, of: nameTextFieldContainer, withInset: Values.mediumSpacing) - nameTextFieldContainer.pin(.trailing, to: .trailing, of: nameTextField, withInset: Values.largeSpacing) + nameTextFieldContainer.pin(.trailing, to: .trailing, of: nameTextField, withInset: Values.mediumSpacing) nameTextFieldContainer.pin(.bottom, to: .bottom, of: nameTextField) mainStackView.addArrangedSubview(nameTextFieldContainer) let searchBarContainer: UIView = UIView() searchBarContainer.addSubview(searchBar) - searchBar.pin(.leading, to: .leading, of: searchBarContainer, withInset: Values.largeSpacing) - searchBarContainer.pin(.trailing, to: .trailing, of: searchBar, withInset: Values.largeSpacing) + searchBar.pin(.leading, to: .leading, of: searchBarContainer, withInset: Values.smallSpacing) + searchBarContainer.pin(.trailing, to: .trailing, of: searchBar, withInset: Values.smallSpacing) searchBar.pin([ UIView.VerticalEdge.top, UIView.VerticalEdge.bottom ], to: searchBarContainer) mainStackView.addArrangedSubview(searchBarContainer) diff --git a/Session/Settings/SettingsVC.swift b/Session/Settings/SettingsVC.swift index 27d4ecec0..aa8e84e21 100644 --- a/Session/Settings/SettingsVC.swift +++ b/Session/Settings/SettingsVC.swift @@ -287,7 +287,7 @@ final class SettingsVC: BaseVC, AvatarViewHelperDelegate { return image! } - let backgroundColor = isLightMode ? UIColor(hex: 0xFCFCFC) : UIColor(hex: 0x1B1B1B) + let backgroundColor = isLightMode ? UIColor(hex: 0xF9F9F9) : UIColor(hex: 0x1B1B1B) button.setBackgroundImage(getImage(withColor: backgroundColor), for: UIControl.State.normal) let selectedColor = isLightMode ? UIColor(hex: 0xDFDFDF) : UIColor(hex: 0x0C0C0C) diff --git a/SessionShareExtension/SAEScreenLockViewController.swift b/SessionShareExtension/SAEScreenLockViewController.swift index dd8bd11d4..84607eaa5 100644 --- a/SessionShareExtension/SAEScreenLockViewController.swift +++ b/SessionShareExtension/SAEScreenLockViewController.swift @@ -36,7 +36,7 @@ final class SAEScreenLockViewController: ScreenLockViewController, ScreenLockVie let layer: CAGradientLayer = CAGradientLayer() let gradientStartColor: UIColor = (LKAppModeUtilities.isLightMode ? - UIColor(rgbHex: 0xFCFCFC) : + UIColor(rgbHex: 0xF9F9F9) : UIColor(rgbHex: 0x171717) ) let gradientEndColor: UIColor = (LKAppModeUtilities.isLightMode ? diff --git a/SessionUIKit/Components/SearchBar.swift b/SessionUIKit/Components/SearchBar.swift index 731c1f52b..a5ccafe03 100644 --- a/SessionUIKit/Components/SearchBar.swift +++ b/SessionUIKit/Components/SearchBar.swift @@ -54,6 +54,8 @@ public extension UISearchBar { let clearImage = #imageLiteral(resourceName: "searchbar_clear").withTint(Colors.text)! setImage(clearImage, for: .clear, state: .normal) let searchTextField: UITextField = self.searchTextField + searchTextField.borderStyle = .none + searchTextField.layer.cornerRadius = 18 searchTextField.backgroundColor = .white // The search bar background color searchTextField.textColor = Colors.text searchTextField.attributedPlaceholder = NSAttributedString(string: "Search Contacts", attributes: [ .foregroundColor : Colors.searchBarPlaceholder ]) diff --git a/SessionUIKit/Style Guide/Colors.xcassets/session_navigation_bar_background.colorset/Contents.json b/SessionUIKit/Style Guide/Colors.xcassets/session_navigation_bar_background.colorset/Contents.json index 9cece1931..53b351c23 100644 --- a/SessionUIKit/Style Guide/Colors.xcassets/session_navigation_bar_background.colorset/Contents.json +++ b/SessionUIKit/Style Guide/Colors.xcassets/session_navigation_bar_background.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "252", - "green" : "252", - "red" : "252" + "blue" : "0xF9", + "green" : "0xF9", + "red" : "0xF9" } }, "idiom" : "universal" diff --git a/SessionUIKit/Style Guide/Gradients.swift b/SessionUIKit/Style Guide/Gradients.swift index 42994a427..59cdbb8f3 100644 --- a/SessionUIKit/Style Guide/Gradients.swift +++ b/SessionUIKit/Style Guide/Gradients.swift @@ -33,7 +33,7 @@ final public class Gradients : NSObject { @objc public static var defaultBackground: Gradient { switch AppModeManager.shared.currentAppMode { - case .light: return Gradient(start: UIColor(hex: 0xFCFCFC), end: UIColor(hex: 0xFFFFFF)) + case .light: return Gradient(start: UIColor(hex: 0xF9F9F9), end: UIColor(hex: 0xFFFFFF)) case .dark: return Gradient(start: UIColor(hex: 0x171717), end: UIColor(hex: 0x121212)) } } diff --git a/SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift b/SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift index a11132f07..ba26b9b6c 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift @@ -52,7 +52,7 @@ public extension UIViewController { navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default) navigationBar.shadowImage = UIImage() navigationBar.isTranslucent = false - let color = isLightMode ? UIColor(hex: 0xFCFCFC) : UIColor(hex: 0x161616) + let color = isLightMode ? UIColor(hex: 0xF9F9F9) : UIColor(hex: 0x161616) navigationBar.barTintColor = color navigationBar.backgroundColor = color let backgroundImage = UIImage(color: color) diff --git a/SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m b/SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m index b8d01d661..1bb763f1e 100644 --- a/SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m +++ b/SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m @@ -42,7 +42,7 @@ NSString *NSStringForScreenLockUIState(ScreenLockUIState value) self.view.backgroundColor = UIColor.clearColor; CAGradientLayer *layer = [CAGradientLayer new]; layer.frame = UIScreen.mainScreen.bounds; - UIColor *gradientStartColor = LKAppModeUtilities.isLightMode ? [UIColor colorWithRGBHex:0xFCFCFC] : [UIColor colorWithRGBHex:0x171717]; + UIColor *gradientStartColor = LKAppModeUtilities.isLightMode ? [UIColor colorWithRGBHex:0xF9F9F9] : [UIColor colorWithRGBHex:0x171717]; UIColor *gradientEndColor = LKAppModeUtilities.isLightMode ? [UIColor colorWithRGBHex:0xFFFFFF] : [UIColor colorWithRGBHex:0x121212]; layer.colors = @[ (id)gradientStartColor.CGColor, (id)gradientEndColor.CGColor ]; [self.view.layer insertSublayer:layer atIndex:0];