瀏覽代碼

Theming 2.0

Marino Faggiana 7 年之前
父節點
當前提交
b2be851bae
共有 3 個文件被更改,包括 6 次插入3 次删除
  1. 2 2
      iOSClient/AppDelegate.m
  2. 3 0
      iOSClient/Main/CCMain.m
  3. 1 1
      iOSClient/Share/CCShareInfoCMOC.m

+ 2 - 2
iOSClient/AppDelegate.m

@@ -754,7 +754,7 @@
             backgroundColor = [UIColor colorWithRed:0.588 green:0.797 blue:0.000 alpha:0.90];
             break;
         case TWMessageBarMessageTypeInfo:
-            backgroundColor = [NCBrandColor sharedInstance].brandElement;
+            backgroundColor = [NCBrandColor sharedInstance].brand;
             break;
         default:
             break;
@@ -1100,7 +1100,7 @@
     [button setBackgroundImage:buttonImage forState:UIControlStateHighlighted];
     
     // Tint Color GLOBAL WINDOW
-    [self.window setTintColor:[NCBrandColor sharedInstance].brand];
+    [self.window setTintColor:[NCBrandColor sharedInstance].textView];
 }
 
 #pragma --------------------------------------------------------------------------------------------

+ 3 - 0
iOSClient/Main/CCMain.m

@@ -4659,6 +4659,9 @@
     selectionColor.backgroundColor = [[NCBrandColor sharedInstance] getColorSelectBackgrond];
     cell.selectedBackgroundView = selectionColor;
     
+    // for checkmark color in editing mode
+    cell.tintColor = [NCBrandColor sharedInstance].brandElement;
+    
     if ([typeCell isEqualToString:@"CellMain"]) cell.backgroundColor = [UIColor whiteColor];
     if ([typeCell isEqualToString:@"CellMainTransfer"]) cell.backgroundColor = [NCBrandColor sharedInstance].transferBackground;
     

+ 1 - 1
iOSClient/Share/CCShareInfoCMOC.m

@@ -120,7 +120,7 @@ const PERMISSION_ALL = 31;
     self.view.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
     
     [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
-    self.endButton.tintColor = [NCBrandColor sharedInstance].brand;
+    self.endButton.tintColor = [NCBrandColor sharedInstance].brandText;
     
     self.tableView.backgroundColor = [NCBrandColor sharedInstance].backgroundView;