浏览代码

Change look

Marino Faggiana 8 年之前
父节点
当前提交
88d7016f9d

+ 1 - 3
iOSClient/Brand/CCNextcloudConstant.h

@@ -66,7 +66,7 @@
 
 #define COLOR_NAVIGATIONBAR_TEXT        [UIColor whiteColor]
 #define COLOR_NAVIGATIONBAR_PROGRESS    [UIColor whiteColor]
-#define COLOR_TABBAR                    [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1]
+#define COLOR_TABBAR                    [UIColor whiteColor]
 #define COLOR_TABBAR_TEXT               [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]                   // BLU NC : #0082c9
 
 #define COLOR_BACKGROUND_MENU           [UIColor whiteColor]
@@ -87,6 +87,4 @@
 #define COLOR_REFRESH_CONTROL           [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]                   // BLU NC : #0082c9
 #define COLOR_WINDOW_TINTCOLOR          [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]                   // BLU NC : #0082c9
 
-#define COLOR_PROGRESS_BAR_QUOTA        [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.4]                   // BLU NC : #0082c9
-
 

+ 1 - 1
iOSClient/CCGlobal.m

@@ -55,7 +55,7 @@ NSString *const dav = @"/remote.php/dav";
 + (void)aspectTabBar:(UITabBar *)tab hidden:(BOOL)hidden
 {    
     tab.translucent = NO;
-    tab.barTintColor = [UIColor whiteColor];// COLOR_TABBAR;
+    tab.barTintColor = COLOR_TABBAR;
     tab.tintColor = COLOR_TABBAR_TEXT;
     
     tab.hidden = hidden;

二进制
iOSClient/Images.xcassets/moreActivity.imageset/moreActivity@2x.png


+ 1 - 1
iOSClient/Images.xcassets/moreExternalSite.imageset/Contents.json

@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "moreExternalSite@2x.png",
+      "filename" : "moreExternalSite.png",
       "scale" : "2x"
     },
     {

二进制
iOSClient/Images.xcassets/moreExternalSite.imageset/moreExternalSite.png


二进制
iOSClient/Images.xcassets/moreExternalSite.imageset/moreExternalSite@2x.png


二进制
iOSClient/Images.xcassets/moreLocalStorage.imageset/moreLocalStorage@2x.png


+ 1 - 1
iOSClient/Images.xcassets/moreSettingsExternalSite.imageset/Contents.json

@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "moreSettingsExternalSite@2x.png",
+      "filename" : "moreSettingsExternalSite.png",
       "scale" : "2x"
     },
     {

二进制
iOSClient/Images.xcassets/moreSettingsExternalSite.imageset/moreSettingsExternalSite.png


二进制
iOSClient/Images.xcassets/moreSettingsExternalSite.imageset/moreSettingsExternalSite@2x.png


+ 4 - 0
iOSClient/Main/CCDetail.m

@@ -177,9 +177,11 @@
 - (void)createToolbar
 {
     _toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, self.view.bounds.size.height - TOOLBAR_HEIGHT, self.view.bounds.size.width, TOOLBAR_HEIGHT)];
+    
     UIBarButtonItem *flexible = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:self action:nil];
     UIBarButtonItem *fixedSpaceMini = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:self action:nil];
     fixedSpaceMini.width = 25;
+    
     _buttonAction = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_actionSheetOpenIn] style:UIBarButtonItemStylePlain target:self action:@selector(actionButtonPressed:)];
     _buttonShare  = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_actionSheetShare] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
     _buttonDelete = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(deleteButtonPressed:)];
@@ -187,6 +189,8 @@
     [_toolbar setItems:[NSArray arrayWithObjects: flexible, _buttonDelete, fixedSpaceMini, _buttonShare, fixedSpaceMini, _buttonAction,  nil]];
     [_toolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin];
     
+    _toolbar.barTintColor = COLOR_TABBAR;
+
     [self.view addSubview:_toolbar];
 }
 

+ 1 - 1
iOSClient/Main/Main.storyboard

@@ -78,7 +78,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="50" id="zQQ-52-W9I" customClass="CCCellMore" customModule="Nextcloud" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="55.5" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="56" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zQQ-52-W9I" id="Zho-os-HYj">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>