From 81bd2f3cd74e16dc38019ba118419fd8932bbd3a Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 17 Jan 2020 16:47:52 +1100 Subject: [PATCH] WIP --- .../PrivacySettingsTableViewController.m | 2 +- SignalMessaging/utils/UIUtil.m | 29 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index b65f48067..f6d104f41 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -156,7 +156,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s OWSTableSection *screenLockSection = [OWSTableSection new]; screenLockSection.headerTitle = NSLocalizedString( @"SETTINGS_SCREEN_LOCK_SECTION_TITLE", @"Title for the 'screen lock' section of the privacy settings."); - screenLockSection.footerTitle = NSLocalizedString(@"Unlock Loki Messenger's screen using Touch ID, Face ID, or your iOS device passcode. You can still receive message notifications while Screen Lock is enabled. Loki Messenger's notification settings allow you to customize the information that is displayed.", @""); + screenLockSection.footerTitle = NSLocalizedString(@"Unlock Session's screen using Touch ID, Face ID, or your iOS device passcode. You can still answer incoming calls and receive message notifications while Screen Lock is enabled. Session's notification settings allow you to customize the information that is displayed.", @""); [screenLockSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_LOCK_SWITCH_LABEL", diff --git a/SignalMessaging/utils/UIUtil.m b/SignalMessaging/utils/UIUtil.m index 01d58f188..01e2513cb 100644 --- a/SignalMessaging/utils/UIUtil.m +++ b/SignalMessaging/utils/UIUtil.m @@ -27,26 +27,19 @@ + (void)setupSignalAppearence { - UINavigationBar.appearance.barTintColor = [UIColor colorWithRGBHex:0x161616]; // Colors.navigationBarBackground - UINavigationBar.appearance.tintColor = [UIColor colorWithRGBHex:0xFFFFFF]; // Colors.text - UIToolbar.appearance.barTintColor = Theme.navbarBackgroundColor; - UIToolbar.appearance.tintColor = Theme.navbarIconColor; - - UIBarButtonItem.appearance.tintColor = [UIColor colorWithRGBHex:0xFFFFFF]; // Colors.text - - // Using the keyboardAppearance causes crashes due to a bug in UIKit. - // UITextField.appearance.keyboardAppearance = (Theme.isDarkThemeEnabled - // ? UIKeyboardAppearanceDark - // : UIKeyboardAppearanceDefault); - // UITextView.appearance.keyboardAppearance = (Theme.isDarkThemeEnabled - // ? UIKeyboardAppearanceDark - // : UIKeyboardAppearanceDefault); - - [[UISwitch appearance] setOnTintColor:[UIColor colorWithRGBHex:0x00F782]]; // Colors.accent - [[UIToolbar appearance] setTintColor:[UIColor ows_materialBlueColor]]; + UINavigationBar.appearance.barTintColor = UIColor.whiteColor; + UINavigationBar.appearance.translucent = NO; + UINavigationBar.appearance.tintColor = UIColor.blackColor; + UIToolbar.appearance.barTintColor = UIColor.blackColor; + UIToolbar.appearance.translucent = NO; + UIToolbar.appearance.tintColor = UIColor.whiteColor; + + UIBarButtonItem.appearance.tintColor = UIColor.blackColor; + [UISwitch.appearance setOnTintColor:[UIColor colorWithRGBHex:0x00F782]]; // Colors.accent + [UIToolbar.appearance setTintColor:[UIColor colorWithRGBHex:0x00F782]]; // Colors.accent // If we set NSShadowAttributeName, the NSForegroundColorAttributeName value is ignored. - UINavigationBar.appearance.titleTextAttributes = @{ NSForegroundColorAttributeName : [UIColor colorWithRGBHex:0xFFFFFF] }; // Colors.text + UINavigationBar.appearance.titleTextAttributes = @{ NSForegroundColorAttributeName : UIColor.blackColor }; } @end