add new addImageToTile

iOSClient/Images.xcassets/titlePhotos.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "titlePhotos@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOSClient/Main/CCMain.m

@@ -569,29 +569,14 @@
         
             if (_metadataFolder.e2eEncrypted) {
                 
-                UIView *navView = [UIView new];
+                [CCGraphics addImageToTile:_titleMain colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[UIImage imageNamed:@"titleEncrypted"] navigationItem:self.navigationItem];
                 
+            } else if ([[[NCManageDatabase sharedInstance] getAccountAutoUploadPath:app.activeUrl] isEqualToString:self.serverUrl]) {
             
-                UILabel *label = [UILabel new];
-                label.text = _titleMain;
-                [label sizeToFit];
-                label.center = navView.center;
-                label.textColor = [NCBrandColor sharedInstance].brandText;
-                label.textAlignment = NSTextAlignmentCenter;
-            
-                CGFloat correct = 6;
-                UIImageView *image = [UIImageView new];
-                image.image = [UIImage imageNamed:@"titleEncrypted"];
-                CGFloat imageAspect = image.image.size.width/image.image.size.height;
-                image.frame = CGRectMake(label.frame.origin.x-label.frame.size.height*imageAspect, label.frame.origin.y+correct/2, label.frame.size.height*imageAspect-correct, label.frame.size.height-correct);
-                image.contentMode = UIViewContentModeScaleAspectFit;
-            
-                [navView addSubview:label];
-                [navView addSubview:image];
-            
-                self.navigationItem.titleView = navView;
-                [navView sizeToFit];
+                [CCGraphics addImageToTile:_titleMain colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[UIImage imageNamed:@"titlePhotos"] navigationItem:self.navigationItem];
+                
             } else {
+                
                 self.navigationItem.title = _titleMain;
             }
         }

iOSClient/Utility/CCGraphics.h

@@ -50,6 +50,8 @@
 
 + (UIImage *)generateSinglePixelImageWithColor:(UIColor *)color;
 
++ (void)addImageToTile:(NSString *)title colorTitle:(UIColor *)colorTitle imageTitle:(UIImage *)imageTitle navigationItem:(UINavigationItem *)navigationItem;
+
 @end
 
 @interface CCAvatar : UIImageView

iOSClient/Utility/CCGraphics.m

@@ -409,6 +409,31 @@ Color difference is determined by the following formula:
     return theImage;
 }
 
++ (void)addImageToTile:(NSString *)title colorTitle:(UIColor *)colorTitle imageTitle:(UIImage *)imageTitle navigationItem:(UINavigationItem *)navigationItem
+{
+    UIView *navView = [UIView new];
+    
+    UILabel *label = [UILabel new];
+    label.text = title;
+    [label sizeToFit];
+    label.center = navView.center;
+    label.textColor = colorTitle;
+    label.textAlignment = NSTextAlignmentCenter;
+    
+    CGFloat correct = 6;
+    UIImageView *image = [UIImageView new];
+    image.image = imageTitle;
+    CGFloat imageAspect = image.image.size.width/image.image.size.height;
+    image.frame = CGRectMake(label.frame.origin.x-label.frame.size.height*imageAspect, label.frame.origin.y+correct/2, label.frame.size.height*imageAspect-correct, label.frame.size.height-correct);
+    image.contentMode = UIViewContentModeScaleAspectFit;
+    
+    [navView addSubview:label];
+    [navView addSubview:image];
+    
+    navigationItem.titleView = navView;
+    [navView sizeToFit];
+}
+
 @end
 
 // ------------------------------------------------------------------------------------------------------