nextcloud
/
ios
зеркало из https://github.com/nextcloud/ios.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Theming 2.0

This commit is contained in:
Marino Faggiana 2017-11-30 17:29:20 +01:00 коммит произвёл Marino Faggiana
Родитель 0f2de8b296
Коммит c4475c0830
6 изменённых файлов: 27 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
iOSClient/Activity/CCActivity.m
Просмотреть файл

@ -124,7 +124,7 @@
- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
{
return [UIColor whiteColor];
return [NCBrandColor sharedInstance].backgroundView;
}
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView

8
iOSClient/Create/CCCreateCloud.swift
Просмотреть файл

@ -65,19 +65,19 @@ class CreateMenuAdd: NSObject {
actionSheet.cancelButtonTitle = NSLocalizedString("_cancel_", comment: "")
actionSheet.addButton(withTitle: NSLocalizedString("_upload_photos_videos_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "menuUploadPhoto"), color: colorGray), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
actionSheet.addButton(withTitle: NSLocalizedString("_upload_photos_videos_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "menuUploadPhoto"), color: colorGray), backgroundColor: NCBrandColor.sharedInstance.backgroundView, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
appDelegate.activeMain.returnCreate(Int(k_returnCreateFotoVideoPlain))
})
actionSheet.addButton(withTitle: NSLocalizedString("_upload_file_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "menuUploadFile"), color: colorGray), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
actionSheet.addButton(withTitle: NSLocalizedString("_upload_file_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "menuUploadFile"), color: colorGray), backgroundColor: NCBrandColor.sharedInstance.backgroundView, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
appDelegate.activeMain.returnCreate(Int(k_returnCreateFilePlain))
})
actionSheet.addButton(withTitle: NSLocalizedString("_upload_file_text_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "file_txt"), color: colorGray), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
actionSheet.addButton(withTitle: NSLocalizedString("_upload_file_text_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "file_txt"), color: colorGray), backgroundColor: NCBrandColor.sharedInstance.backgroundView, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
appDelegate.activeMain.returnCreate(Int(k_returnCreateFileText))
})
actionSheet.addButton(withTitle: NSLocalizedString("_create_folder_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "folder"), color: colorIcon), backgroundColor: UIColor.white, height: 50.0 ,type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
actionSheet.addButton(withTitle: NSLocalizedString("_create_folder_", comment: ""), image: CCGraphics.changeThemingColorImage(UIImage(named: "folder"), color: colorIcon), backgroundColor: NCBrandColor.sharedInstance.backgroundView, height: 50.0 ,type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
appDelegate.activeMain.returnCreate(Int(k_returnCreateFolderPlain))
})

6
iOSClient/Favorites/CCFavorites.m
Просмотреть файл

@ -131,7 +131,7 @@
- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
{
return [UIColor whiteColor];
return [NCBrandColor sharedInstance].backgroundView;
}
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
@ -405,7 +405,7 @@
];
// Share
[actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil) image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetShare"] color:[NCBrandColor sharedInstance].brandElement] backgroundColor:[UIColor whiteColor] height: 50.0 type:AHKActionSheetButtonTypeDefault handler:^(AHKActionSheet *as) {
[actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil) image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetShare"] color:[NCBrandColor sharedInstance].brandElement] backgroundColor:[NCBrandColor sharedInstance].backgroundView height: 50.0 type:AHKActionSheetButtonTypeDefault handler:^(AHKActionSheet *as) {
[appDelegate.activeMain openWindowShare:metadata];
}];
@ -413,7 +413,7 @@
// NO Directory
if (metadata.directory == NO) {
[actionSheet addButtonWithTitle:NSLocalizedString(@"_open_in_", nil) image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetOpenIn"] color:[NCBrandColor sharedInstance].brandElement] backgroundColor:[UIColor whiteColor] height: 50.0 type:AHKActionSheetButtonTypeDefault handler:^(AHKActionSheet *as) {
[actionSheet addButtonWithTitle:NSLocalizedString(@"_open_in_", nil) image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetOpenIn"] color:[NCBrandColor sharedInstance].brandElement] backgroundColor:[NCBrandColor sharedInstance].backgroundView height: 50.0 type:AHKActionSheetButtonTypeDefault handler:^(AHKActionSheet *as) {
[self.tableView setEditing:NO animated:YES];
[self openWith:metadata];
}];

2
iOSClient/Main/CCDetail.m
Просмотреть файл

@ -297,7 +297,7 @@
self.webView = [[WKWebView alloc] initWithFrame:(CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height - TOOLBAR_HEIGHT - safeAreaBottom)) configuration:wkConfig];
self.webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
[self.webView setBackgroundColor:[UIColor whiteColor]];
[self.webView setBackgroundColor:[NCBrandColor sharedInstance].backgroundView];
[self.webView setOpaque:NO];
if ( [_fileNameExtension isEqualToString:@"CSS"] || [_fileNameExtension isEqualToString:@"PY"] || [_fileNameExtension isEqualToString:@"XML"] || [_fileNameExtension isEqualToString:@"JS"] ) {

34
iOSClient/Main/CCMain.m
Просмотреть файл

@ -422,7 +422,7 @@
- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
{
return [UIColor whiteColor];
return [NCBrandColor sharedInstance].backgroundView;
}
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
@ -3974,7 +3974,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetShare"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -3987,7 +3987,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_rename_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetRename"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4025,7 +4025,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_move_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetMove"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4038,7 +4038,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_folder_automatic_upload_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderphotocamera"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4067,7 +4067,7 @@
[actionSheet addButtonWithTitle:titoloLock
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"settingsPasscodeYES"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4080,7 +4080,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_e2e_set_folder_encrypted_", nil)
image:[UIImage imageNamed:@"encrypted_empty"]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeEncrypted
handler:^(AHKActionSheet *as) {
@ -4101,7 +4101,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_e2e_remove_folder_encrypted_", nil)
image:[UIImage imageNamed:@"encrypted_empty"]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeEncrypted
handler:^(AHKActionSheet *as) {
@ -4122,7 +4122,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_e2e_remove_folder_lock_", nil)
image:[UIImage imageNamed:@"encrypted_empty"]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeEncrypted
handler:^(AHKActionSheet *as) {
@ -4167,7 +4167,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetShare"]color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height: 50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4178,7 +4178,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_open_in_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetOpenIn"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height: 50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4188,7 +4188,7 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_rename_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetRename"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height: 50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4223,8 +4223,8 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_move_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetMove"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
height: 50.0
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4236,8 +4236,8 @@
[actionSheet addButtonWithTitle:NSLocalizedString(@"_remove_local_file_", nil)
image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetRemoveLocal"] color:[NCBrandColor sharedInstance].brandElement]
backgroundColor:[UIColor whiteColor]
height: 50.0
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeDefault
handler:^(AHKActionSheet *as) {
@ -4662,7 +4662,7 @@
// for checkmark color in editing mode
cell.tintColor = [NCBrandColor sharedInstance].brandElement;
if ([typeCell isEqualToString:@"CellMain"]) cell.backgroundColor = [UIColor whiteColor];
if ([typeCell isEqualToString:@"CellMain"]) cell.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
if ([typeCell isEqualToString:@"CellMainTransfer"]) cell.backgroundColor = [NCBrandColor sharedInstance].transferBackground;
// ----------------------------------------------------------------------------------------------------------

2
iOSClient/Photos/CCPhotos.m
Просмотреть файл

@ -261,7 +261,7 @@
- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
{
return [UIColor whiteColor];
return [NCBrandColor sharedInstance].backgroundView;
}
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView