Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Ivan Sein 2020-10-16 15:42:28 +02:00
Родитель e919a15603
Коммит 7b43975b2b
17 изменённых файлов: 54 добавлений и 37 удалений

Просмотреть файл

@ -23,6 +23,7 @@
#import "AddParticipantsTableViewController.h" #import "AddParticipantsTableViewController.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCUserInterfaceController.h" #import "NCUserInterfaceController.h"
#import "NCUtils.h" #import "NCUtils.h"
#import "PlaceholderView.h" #import "PlaceholderView.h"
@ -76,7 +77,7 @@
[_searchController.searchBar sizeToFit]; [_searchController.searchBar sizeToFit];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;
@ -99,7 +100,7 @@
self.navigationItem.searchController = _searchController; self.navigationItem.searchController = _searchController;
_searchController.searchBar.tintColor = [UIColor whiteColor]; _searchController.searchBar.tintColor = [UIColor whiteColor];
UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"]; UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"];
searchTextField.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 searchTextField.tintColor = [NCAppBranding primaryColor];
UIView *backgroundview = [searchTextField.subviews firstObject]; UIView *backgroundview = [searchTextField.subviews firstObject];
backgroundview.backgroundColor = [UIColor whiteColor]; backgroundview.backgroundColor = [UIColor whiteColor];
backgroundview.layer.cornerRadius = 8; backgroundview.layer.cornerRadius = 8;
@ -137,7 +138,7 @@
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
// Fix uisearchcontroller animation // Fix uisearchcontroller animation
self.extendedLayoutIncludesOpaqueBars = YES; self.extendedLayoutIncludesOpaqueBars = YES;

Просмотреть файл

@ -24,6 +24,7 @@
#import "CCCertificate.h" #import "CCCertificate.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCDatabaseManager.h" #import "NCDatabaseManager.h"
#import "NCSettingsController.h" #import "NCSettingsController.h"
@ -84,7 +85,7 @@ NSString * const kNCAuthTokenFlowEndpoint = @"/index.php/login/flo
_activityIndicatorView = [[UIActivityIndicatorView alloc] init]; _activityIndicatorView = [[UIActivityIndicatorView alloc] init];
_activityIndicatorView.center = self.view.center; _activityIndicatorView.center = self.view.center;
_activityIndicatorView.color = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 _activityIndicatorView.color = [NCAppBranding primaryColor];
[_activityIndicatorView startAnimating]; [_activityIndicatorView startAnimating];
[self.view addSubview:_activityIndicatorView]; [self.view addSubview:_activityIndicatorView];
}]; }];

Просмотреть файл

@ -23,6 +23,8 @@
#import "CCBKPasscode.h" #import "CCBKPasscode.h"
#import "NCAppBranding.h"
@implementation CCBKPasscode @implementation CCBKPasscode
- (id)init - (id)init
@ -63,7 +65,7 @@
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
} }
- (void)customizePasscodeInputView:(BKPasscodeInputView *)aPasscodeInputView - (void)customizePasscodeInputView:(BKPasscodeInputView *)aPasscodeInputView

Просмотреть файл

@ -25,6 +25,7 @@
#import "DirectoryTableViewCell.h" #import "DirectoryTableViewCell.h"
#import "OCFileDto.h" #import "OCFileDto.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCSettingsController.h" #import "NCSettingsController.h"
#import "NCUtils.h" #import "NCUtils.h"
#import "PlaceholderView.h" #import "PlaceholderView.h"
@ -78,8 +79,8 @@
[self.navigationController.navigationBar setTitleTextAttributes: [self.navigationController.navigationBar setTitleTextAttributes:
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
self.tabBarController.tabBar.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.tabBarController.tabBar.tintColor = [NCAppBranding primaryColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.tableView.separatorInset = UIEdgeInsetsMake(0, 64, 0, 0); self.tableView.separatorInset = UIEdgeInsetsMake(0, 64, 0, 0);

Просмотреть файл

@ -46,7 +46,7 @@
[super viewDidLoad]; [super viewDidLoad];
self.appLogo.image = [UIImage imageNamed:@"loginLogo"]; self.appLogo.image = [UIImage imageNamed:@"loginLogo"];
self.view.backgroundColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.view.backgroundColor = [NCAppBranding primaryColor];
NSString *serverUrlPlaceholderText = NSLocalizedString(@"Server address https://…", nil); NSString *serverUrlPlaceholderText = NSLocalizedString(@"Server address https://…", nil);
self.serverUrl.textColor = [UIColor whiteColor]; self.serverUrl.textColor = [UIColor whiteColor];
@ -55,7 +55,7 @@
attributes:@{NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.5]}]; attributes:@{NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.5]}];
self.login.backgroundColor = [UIColor whiteColor]; self.login.backgroundColor = [UIColor whiteColor];
[self.login setTitleColor:[UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0] forState:UIControlStateNormal]; //#0082C9 [self.login setTitleColor:[NCAppBranding primaryColor] forState:UIControlStateNormal];
self.activityIndicatorView.color = [UIColor whiteColor]; self.activityIndicatorView.color = [UIColor whiteColor];
self.activityIndicatorView.hidden = YES; self.activityIndicatorView.hidden = YES;

Просмотреть файл

@ -22,6 +22,7 @@
#import "NCChatMessage.h" #import "NCChatMessage.h"
#import "NCAppBranding.h"
#import "NCSettingsController.h" #import "NCSettingsController.h"
NSInteger const kChatMessageGroupTimeDifference = 30; NSInteger const kChatMessageGroupTimeDifference = 30;
@ -198,7 +199,7 @@ NSInteger const kChatMessageGroupTimeDifference = 30;
//Set color for mentions //Set color for mentions
if ([param.type isEqualToString:@"user"] || [param.type isEqualToString:@"guest"] || [param.type isEqualToString:@"call"]) { if ([param.type isEqualToString:@"user"] || [param.type isEqualToString:@"guest"] || [param.type isEqualToString:@"call"]) {
UIColor *defaultColor = [UIColor darkGrayColor]; UIColor *defaultColor = [UIColor darkGrayColor];
UIColor *highlightedColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *highlightedColor = [NCAppBranding primaryColor];
[attributedMessage addAttribute:NSForegroundColorAttributeName value:(param.shouldBeHighlighted) ? highlightedColor : defaultColor range:param.range]; [attributedMessage addAttribute:NSForegroundColorAttributeName value:(param.shouldBeHighlighted) ? highlightedColor : defaultColor range:param.range];
[attributedMessage addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:16.0f] range:param.range]; [attributedMessage addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:16.0f] range:param.range];
} }

Просмотреть файл

@ -34,6 +34,7 @@
#import "DateHeaderView.h" #import "DateHeaderView.h"
#import "PlaceholderView.h" #import "PlaceholderView.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCChatController.h" #import "NCChatController.h"
#import "NCChatMessage.h" #import "NCChatMessage.h"
#import "NCDatabaseManager.h" #import "NCDatabaseManager.h"
@ -191,7 +192,7 @@ typedef enum NCChatMessageAction {
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;
@ -227,7 +228,7 @@ typedef enum NCChatMessageAction {
// Unread messages indicator // Unread messages indicator
_firstUnreadMessageIP = nil; _firstUnreadMessageIP = nil;
_unreadMessageButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 126, 24)]; _unreadMessageButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 126, 24)];
_unreadMessageButton.backgroundColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1]; //#0082C9 _unreadMessageButton.backgroundColor = [NCAppBranding primaryColor];
_unreadMessageButton.titleLabel.font = [UIFont systemFontOfSize:12]; _unreadMessageButton.titleLabel.font = [UIFont systemFontOfSize:12];
_unreadMessageButton.layer.cornerRadius = 12; _unreadMessageButton.layer.cornerRadius = 12;
_unreadMessageButton.clipsToBounds = YES; _unreadMessageButton.clipsToBounds = YES;

Просмотреть файл

@ -25,6 +25,7 @@
#import "RoomCreationTableViewController.h" #import "RoomCreationTableViewController.h"
#import "RoomCreation2TableViewController.h" #import "RoomCreation2TableViewController.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCSettingsController.h" #import "NCSettingsController.h"
#import "NCUserInterfaceController.h" #import "NCUserInterfaceController.h"
#import "NCUtils.h" #import "NCUtils.h"
@ -73,7 +74,7 @@ NSString * const NCSelectedContactForChatNotification = @"NCSelectedContactForCh
[_searchController.searchBar sizeToFit]; [_searchController.searchBar sizeToFit];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;
@ -96,7 +97,7 @@ NSString * const NCSelectedContactForChatNotification = @"NCSelectedContactForCh
self.navigationItem.searchController = _searchController; self.navigationItem.searchController = _searchController;
_searchController.searchBar.tintColor = [UIColor whiteColor]; _searchController.searchBar.tintColor = [UIColor whiteColor];
UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"]; UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"];
searchTextField.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 searchTextField.tintColor = [NCAppBranding primaryColor];
UIView *backgroundview = [searchTextField.subviews firstObject]; UIView *backgroundview = [searchTextField.subviews firstObject];
backgroundview.backgroundColor = [UIColor whiteColor]; backgroundview.backgroundColor = [UIColor whiteColor];
backgroundview.layer.cornerRadius = 8; backgroundview.layer.cornerRadius = 8;
@ -138,7 +139,7 @@ NSString * const NCSelectedContactForChatNotification = @"NCSelectedContactForCh
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
} }
- (void)viewDidAppear:(BOOL)animated - (void)viewDidAppear:(BOOL)animated

Просмотреть файл

@ -22,6 +22,8 @@
#import "QuotedMessageView.h" #import "QuotedMessageView.h"
#import "NCAppBranding.h"
@interface QuotedMessageView () @interface QuotedMessageView ()
@property (nonatomic, strong) UIView *quoteView; @property (nonatomic, strong) UIView *quoteView;
@end @end
@ -64,7 +66,7 @@
if (!_quoteView) { if (!_quoteView) {
_quoteView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 4, 50)]; _quoteView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 4, 50)];
_quoteView.translatesAutoresizingMaskIntoConstraints = NO; _quoteView.translatesAutoresizingMaskIntoConstraints = NO;
_quoteView.backgroundColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1]; //#0082C9 _quoteView.backgroundColor = [NCAppBranding primaryColor];
} }
return _quoteView; return _quoteView;
} }

Просмотреть файл

@ -26,6 +26,7 @@
#import "RoomNameTableViewCell.h" #import "RoomNameTableViewCell.h"
#import "NCUser.h" #import "NCUser.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "UIImageView+AFNetworking.h" #import "UIImageView+AFNetworking.h"
typedef enum CreationSection { typedef enum CreationSection {
@ -83,10 +84,10 @@ NSString * const NCRoomCreatedNotification = @"NCRoomCreatedNotification";
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;

Просмотреть файл

@ -23,6 +23,7 @@
#import "RoomCreationTableViewController.h" #import "RoomCreationTableViewController.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "PlaceholderView.h" #import "PlaceholderView.h"
#import "ResultMultiSelectionTableViewController.h" #import "ResultMultiSelectionTableViewController.h"
#import "RoomCreation2TableViewController.h" #import "RoomCreation2TableViewController.h"
@ -75,7 +76,7 @@
[_searchController.searchBar sizeToFit]; [_searchController.searchBar sizeToFit];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;
@ -98,7 +99,7 @@
self.navigationItem.searchController = _searchController; self.navigationItem.searchController = _searchController;
_searchController.searchBar.tintColor = [UIColor whiteColor]; _searchController.searchBar.tintColor = [UIColor whiteColor];
UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"]; UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"];
searchTextField.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 searchTextField.tintColor = [NCAppBranding primaryColor];
UIView *backgroundview = [searchTextField.subviews firstObject]; UIView *backgroundview = [searchTextField.subviews firstObject];
backgroundview.backgroundColor = [UIColor whiteColor]; backgroundview.backgroundColor = [UIColor whiteColor];
backgroundview.layer.cornerRadius = 8; backgroundview.layer.cornerRadius = 8;
@ -134,7 +135,7 @@
self.navigationItem.rightBarButtonItem.accessibilityHint = NSLocalizedString(@"Continue to next step of conversation creation", nil); self.navigationItem.rightBarButtonItem.accessibilityHint = NSLocalizedString(@"Continue to next step of conversation creation", nil);
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
[self updateCounter]; [self updateCounter];

Просмотреть файл

@ -28,6 +28,7 @@
#import "RoomNameTableViewCell.h" #import "RoomNameTableViewCell.h"
#import "HeaderWithButton.h" #import "HeaderWithButton.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCDatabaseManager.h" #import "NCDatabaseManager.h"
#import "NCRoomsManager.h" #import "NCRoomsManager.h"
#import "NCRoomParticipant.h" #import "NCRoomParticipant.h"
@ -126,10 +127,10 @@ typedef enum ModificationError {
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;

Просмотреть файл

@ -91,8 +91,8 @@ typedef void (^FetchRoomsCompletionBlock)(BOOL success);
[UIImageView setSharedImageDownloader:[[NCAPIController sharedInstance] imageDownloader]]; [UIImageView setSharedImageDownloader:[[NCAPIController sharedInstance] imageDownloader]];
[UIButton setSharedImageDownloader:[[NCAPIController sharedInstance] imageDownloader]]; [UIButton setSharedImageDownloader:[[NCAPIController sharedInstance] imageDownloader]];
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
self.tabBarController.tabBar.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.tabBarController.tabBar.tintColor = [NCAppBranding primaryColor];
self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero]; self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
@ -102,7 +102,7 @@ typedef void (^FetchRoomsCompletionBlock)(BOOL success);
[_searchController.searchBar sizeToFit]; [_searchController.searchBar sizeToFit];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;
@ -124,7 +124,7 @@ typedef void (^FetchRoomsCompletionBlock)(BOOL success);
self.navigationItem.searchController = _searchController; self.navigationItem.searchController = _searchController;
_searchController.searchBar.tintColor = [UIColor whiteColor]; _searchController.searchBar.tintColor = [UIColor whiteColor];
UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"]; UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"];
searchTextField.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 searchTextField.tintColor = [NCAppBranding primaryColor];
UIView *backgroundview = [searchTextField.subviews firstObject]; UIView *backgroundview = [searchTextField.subviews firstObject];
backgroundview.backgroundColor = [UIColor whiteColor]; backgroundview.backgroundColor = [UIColor whiteColor];
backgroundview.layer.cornerRadius = 8; backgroundview.layer.cornerRadius = 8;

Просмотреть файл

@ -22,6 +22,8 @@
#import "RoundedNumberView.h" #import "RoundedNumberView.h"
#import "NCAppBranding.h"
#define kRoundedNumberViewImportantBackgroundColor [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0] //#0082C9 #define kRoundedNumberViewImportantBackgroundColor [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0] //#0082C9
#define kRoundedNumberViewImportantTextColor [UIColor whiteColor] #define kRoundedNumberViewImportantTextColor [UIColor whiteColor]
#define kRoundedNumberViewDefaultBackgroundColor [UIColor colorWithRed:0.84 green:0.84 blue:0.84 alpha:1.0] //#d5d5d5 #define kRoundedNumberViewDefaultBackgroundColor [UIColor colorWithRed:0.84 green:0.84 blue:0.84 alpha:1.0] //#d5d5d5
@ -120,7 +122,7 @@
- (void)setImportant:(BOOL)important - (void)setImportant:(BOOL)important
{ {
_important = important; _important = important;
self.backgroundColor = _important ? kRoundedNumberViewImportantBackgroundColor : kRoundedNumberViewDefaultBackgroundColor; self.backgroundColor = _important ? [NCAppBranding primaryColor] : kRoundedNumberViewDefaultBackgroundColor;
_numberColor = _important ? kRoundedNumberViewImportantTextColor : kRoundedNumberViewDefaultTextColor; _numberColor = _important ? kRoundedNumberViewImportantTextColor : kRoundedNumberViewDefaultTextColor;
} }

Просмотреть файл

@ -83,11 +83,11 @@ typedef enum AboutSection {
[self.navigationController.navigationBar setTitleTextAttributes: [self.navigationController.navigationBar setTitleTextAttributes:
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
self.tabBarController.tabBar.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.tabBarController.tabBar.tintColor = [NCAppBranding primaryColor];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;

Просмотреть файл

@ -26,6 +26,7 @@
#import "CCCertificate.h" #import "CCCertificate.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCSettingsController.h" #import "NCSettingsController.h"
#import "NCUtils.h" #import "NCUtils.h"
#import "MBProgressHUD.h" #import "MBProgressHUD.h"
@ -60,11 +61,11 @@
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
self.tabBarController.tabBar.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.tabBarController.tabBar.tintColor = [NCAppBranding primaryColor];
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;

Просмотреть файл

@ -26,6 +26,7 @@
#import "CCCertificate.h" #import "CCCertificate.h"
#import "NCAPIController.h" #import "NCAPIController.h"
#import "NCAppBranding.h"
#import "NCDatabaseManager.h" #import "NCDatabaseManager.h"
#import "NCRoom.h" #import "NCRoom.h"
#import "NCRoomsManager.h" #import "NCRoomsManager.h"
@ -99,7 +100,7 @@
@{NSForegroundColorAttributeName:[UIColor whiteColor]}]; @{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 self.navigationController.navigationBar.barTintColor = [NCAppBranding primaryColor];
UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self action:@selector(cancelButtonPressed)]; target:self action:@selector(cancelButtonPressed)];
@ -107,7 +108,7 @@
self.navigationController.navigationBar.topItem.leftBarButtonItem = cancelButton; self.navigationController.navigationBar.topItem.leftBarButtonItem = cancelButton;
if (@available(iOS 13.0, *)) { if (@available(iOS 13.0, *)) {
UIColor *themeColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 UIColor *themeColor = [NCAppBranding primaryColor];
UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init]; UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
[appearance configureWithOpaqueBackground]; [appearance configureWithOpaqueBackground];
appearance.backgroundColor = themeColor; appearance.backgroundColor = themeColor;
@ -130,7 +131,7 @@
self.navigationItem.searchController = _searchController; self.navigationItem.searchController = _searchController;
_searchController.searchBar.tintColor = [UIColor whiteColor]; _searchController.searchBar.tintColor = [UIColor whiteColor];
UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"]; UITextField *searchTextField = [_searchController.searchBar valueForKey:@"searchField"];
searchTextField.tintColor = [UIColor colorWithRed:0.00 green:0.51 blue:0.79 alpha:1.0]; //#0082C9 searchTextField.tintColor = [NCAppBranding primaryColor];
UIView *backgroundview = [searchTextField.subviews firstObject]; UIView *backgroundview = [searchTextField.subviews firstObject];
backgroundview.backgroundColor = [UIColor whiteColor]; backgroundview.backgroundColor = [UIColor whiteColor];
backgroundview.layer.cornerRadius = 8; backgroundview.layer.cornerRadius = 8;