Browse Source

fix title view

Marino Faggiana 6 years ago
parent
commit
3b42038c0c

+ 1 - 3
iOSClient/Brand/Custom.xcassets/themingLogo.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navigationLogo.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "navigationLogo@2x.png",
+      "filename" : "navigationLogo.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "navigationLogo@3x.png",
       "scale" : "3x"
     }
   ],

BIN
iOSClient/Brand/Custom.xcassets/themingLogo.imageset/navigationLogo.png


BIN
iOSClient/Brand/Custom.xcassets/themingLogo.imageset/navigationLogo@2x.png


BIN
iOSClient/Brand/Custom.xcassets/themingLogo.imageset/navigationLogo@3x.png


+ 10 - 9
iOSClient/Main/CCMain.m

@@ -562,16 +562,17 @@
         if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl]]) {
             
             UIImage *imageThemingLogo = [UIImage imageNamed:@"themingLogo"];
-            _imageTitleHome = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 80, 40)];
-            
-            
-            NSInteger multiplier = 2;
+            _imageTitleHome = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 60, 30)]; // IMAGE = 120 x 60
+            _imageTitleHome.contentMode = UIViewContentModeScaleAspectFill;
+            _imageTitleHome.clipsToBounds = YES;
+            NSInteger multiplierImageTitleHome = 2;
+//            _imageTitleHome.backgroundColor = [UIColor redColor];
             
             NSString *fileNameThemingLogo = [NSString stringWithFormat:@"%@/%@-themingLogo.png", [CCUtility getDirectoryUserData], [CCUtility getStringUser:appDelegate.activeUser activeUrl:appDelegate.activeUrl]];
             UIImage *image = [UIImage imageWithContentsOfFile:fileNameThemingLogo];
             if (image != nil) {
                 imageThemingLogo = image;
-                multiplier = 1;
+                multiplierImageTitleHome = 1;
             }
             
             self.navigationItem.title = nil;
@@ -580,22 +581,22 @@
                 
                 if ([appDelegate.reachability isReachable] == NO) {
                     
-                    _imageTitleHome.image = [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplier color:[NCBrandColor sharedInstance].icon];
+                    _imageTitleHome.image = [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplierImageTitleHome color:[NCBrandColor sharedInstance].icon];
                     
                 } else {
                 
                     tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
                     
                     if ([capabilities.themingColor isEqualToString:@"#FFFFFF"])
-                        _imageTitleHome.image = [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplier color:[UIColor blackColor]];
+                        _imageTitleHome.image = [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplierImageTitleHome color:[UIColor blackColor]];
                     else
-                        _imageTitleHome.image = [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplier color:[UIColor whiteColor]];
+                        _imageTitleHome.image = [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplierImageTitleHome color:[UIColor whiteColor]];
                 }
                 
             } else {
                     
                 if ([appDelegate.reachability isReachable] == NO)
-                    _imageTitleHome.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:2 color:[NCBrandColor sharedInstance].icon];
+                    _imageTitleHome.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:multiplierImageTitleHome color:[NCBrandColor sharedInstance].icon];
                 else
                     _imageTitleHome.image = [UIImage imageNamed:@"themingLogo"];
             }

+ 1 - 1
iOSClient/Networking/NCService.swift

@@ -146,7 +146,7 @@ class NCService: NSObject, OCNetworkingDelegate {
                 
                 // Download Logo
                 let fileNameThemingLogo = CCUtility.getStringUser(self.appDelegate.activeUser, activeUrl: self.appDelegate.activeUrl) + "-themingLogo.png"
-                NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: capabilities!.themingLogo, fileName: fileNameThemingLogo, width: 35, rewrite: true)
+                NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: capabilities!.themingLogo, fileName: fileNameThemingLogo, width: 40, rewrite: true)
                 
                 // Download Theming Background
                 DispatchQueue.global().async {