clear code

Nextcloud.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		F700222C1EC479840080073F /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F700222B1EC479840080073F /* Custom.xcassets */; };
+		F700222D1EC479840080073F /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F700222B1EC479840080073F /* Custom.xcassets */; };
+		F700222E1EC479840080073F /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F700222B1EC479840080073F /* Custom.xcassets */; };
 		F708CF6D1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */; };
 		F708CF6E1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */; };
 		F708CF6F1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */; };
@@ -739,6 +742,7 @@
 		08EA97461E6554FC004C83FA /* FirebaseInstanceID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseInstanceID.framework; sourceTree = "<group>"; };
 		08EA97471E6554FC004C83FA /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleToolboxForMac.framework; sourceTree = "<group>"; };
 		F70022201EC46E660080073F /* NCBridgeSwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCBridgeSwift.h; sourceTree = "<group>"; };
+		F700222B1EC479840080073F /* Custom.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Custom.xcassets; sourceTree = "<group>"; };
 		F70211F41BAC56E9003FC03E /* CCCellMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCellMain.h; sourceTree = "<group>"; };
 		F70211F51BAC56E9003FC03E /* CCCellMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCCellMain.m; sourceTree = "<group>"; };
 		F70211F61BAC56E9003FC03E /* CCCellMain.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCCellMain.xib; sourceTree = "<group>"; };
@@ -3015,6 +3019,7 @@
 			children = (
 				F7C742D31E7BD36600D9C973 /* Supporting Files */,
 				F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */,
+				F700222B1EC479840080073F /* Custom.xcassets */,
 			);
 			path = Brand;
 			sourceTree = "<group>";
@@ -3633,6 +3638,7 @@
 				F7145A1D1D12E3B700CAFEEC /* BKPasscodeView.strings in Resources */,
 				F7145A211D12E3B700CAFEEC /* Error.strings in Resources */,
 				F7145A231D12E3B700CAFEEC /* Localizable.strings in Resources */,
+				F700222D1EC479840080073F /* Custom.xcassets in Resources */,
 				F7145A241D12E3B700CAFEEC /* CCCellShareExt.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3645,6 +3651,7 @@
 				F7FC88FD1E141A3F006D0506 /* Error.strings in Resources */,
 				F7FC88FB1E141A34006D0506 /* BKPasscodeView.strings in Resources */,
 				F7FC88FC1E141A39006D0506 /* Localizable.strings in Resources */,
+				F700222E1EC479840080073F /* Custom.xcassets in Resources */,
 				F7D2677C1E157053005ACB7E /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3678,6 +3685,7 @@
 				F77B0EFA1D118A16002130FE /* ZSShorizontalrule.png in Resources */,
 				F762CB5C1EACB7D400B38484 /* Reader-Email@2x.png in Resources */,
 				F77B0EFB1D118A16002130FE /* ZSSh3@2x.png in Resources */,
+				F700222C1EC479840080073F /* Custom.xcassets in Resources */,
 				F77B0EFE1D118A16002130FE /* CCUploadFromOtherUpp.storyboard in Resources */,
 				F77B0EFF1D118A16002130FE /* ZSSinsertkeyword.png in Resources */,
 				F78BFED41D3111B800E513CF /* LaunchScreenNextcloud.xib in Resources */,

iOSClient/Brand/Custom.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOSClient/Images.xcassets/navigationLogo.imageset/Contents.json → iOSClient/Brand/Custom.xcassets/backgroundDetail.imageset/Contents.json

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

iOSClient/Images.xcassets/backgroundDetail.imageset/Contents.json → iOSClient/Brand/Custom.xcassets/loginLogo.imageset/Contents.json

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

iOSClient/Images.xcassets/loginLogo.imageset/Contents.json → iOSClient/Brand/Custom.xcassets/navigationLogo.imageset/Contents.json

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

iOSClient/Brand/Custom.xcassets/navigationLogoOffline.imageset/Contents.json

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

iOSClient/Brand/NCBrand.swift

@@ -52,20 +52,6 @@ class NCBrandColor: NSObject {
     }
 }
 
-class NCBrandImages: NSObject {
-
-    static let sharedInstance: NCBrandImages = {
-        let instance = NCBrandImages()
-        return instance
-    }()
-    
-    public var login:                   String = "loginLogo"
-    public var navigationLogo:          String = "navigationLogo"
-    public var navigationLogoOffline:   String = "navigationLogoOffline"
-    public var BackgroundDetail:        String = "backgroundDetail"
-    public var themingBackground:       String = "themingBackground"
-}
-
 class NCBrandOptions: NSObject {
     
     static let sharedInstance: NCBrandOptions = {

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

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

iOSClient/Login/CCLogin.m

@@ -40,7 +40,7 @@
 {
     [super viewDidLoad];
     
-    self.imageBrand.image = [UIImage imageNamed:[NCBrandImages sharedInstance].login];
+    self.imageBrand.image = [UIImage imageNamed:@"loginLogo"];
     self.login.backgroundColor = [NCBrandColor sharedInstance].customer;
     
     // Bottom label

iOSClient/Main/CCDetail.m

@@ -81,7 +81,7 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(insertGeocoderLocation:) name:@"insertGeocoderLocation" object:nil];
 
-    self.imageBackground.image = [UIImage imageNamed:[NCBrandImages sharedInstance].BackgroundDetail];
+    self.imageBackground.image = [UIImage imageNamed:@"backgroundDetail"];
     
     if ([self.metadataDetail.fileName length] > 0 || [self.metadataDetail.directoryID length] > 0 || [self.metadataDetail.fileID length] > 0) {
     

iOSClient/Main/CCMain.m

@@ -165,7 +165,7 @@
 
     // Back Button
     if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl]])
-        self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:[NCBrandImages sharedInstance].navigationLogo] style:UIBarButtonItemStylePlain target:nil action:nil];
+        self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"navigationLogo"] style:UIBarButtonItemStylePlain target:nil action:nil];
     
     // reMenu Background
     _reMenuBackgroundView = [[UIView alloc] init];
@@ -566,8 +566,10 @@
             
             self.navigationItem.title = nil;
             
-            if ([app.reachability isReachable] == NO) _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:[NCBrandImages sharedInstance].navigationLogoOffline]];
-            else _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:[NCBrandImages sharedInstance].navigationLogo]];
+            if ([app.reachability isReachable] == NO)
+                _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"navigationLogoOffline"]];
+            else
+                _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"navigationLogo"]];
             
             [_ImageTitleHomeCryptoCloud setUserInteractionEnabled:YES];
             UITapGestureRecognizer *singleTap =  [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuLogo)];

iOSClient/Main/CCMore.swift

@@ -52,7 +52,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         
         tableView.separatorColor = NCBrandColor.sharedInstance.seperator
         
-        themingBackground.image = UIImage.init(named: NCBrandImages.sharedInstance.themingBackground)
+        themingBackground.image = UIImage.init(named: "themingBackground")
         
         // create tap gesture recognizer
         let tapQuota = UITapGestureRecognizer(target: self, action: #selector(tapLabelQuotaExternalSite))
@@ -166,7 +166,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         if (theminBackgroundFile != nil) {
             themingBackground.image = theminBackgroundFile
         } else {
-            themingBackground.image = UIImage.init(named: NCBrandImages.sharedInstance.themingBackground)
+            themingBackground.image = UIImage.init(named: "themingBackground")
         }
 
         if (self.isViewLoaded && (self.view.window != nil)) {

iOSClient/Move/CCMove.m

@@ -88,7 +88,7 @@
     if (![_serverUrl length]) {
         
         _serverUrl = [CCUtility getHomeServerUrlActiveUrl:activeUrl];
-        UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed: NCBrandImages.sharedInstance.navigationLogo]];
+        UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed: @"navigationLogo"]];
         [self.navigationController.navigationBar.topItem setTitleView:image];
         self.title = @"Home";
         

iOSClient/Settings/CCManageCryptoCloudSecurity.m

@@ -174,7 +174,7 @@
     
     XLFormRowDescriptor *row = [self.form formRowWithTag:@"mail"];
     
-    [CCUtility sendMailEncryptPass:row.value validateEmail:YES form:self nameImage:[NCBrandImages sharedInstance].BackgroundDetail];
+    [CCUtility sendMailEncryptPass:row.value validateEmail:YES form:self nameImage:@"backgroundDetail"];
 }
 
 @end

iOSClient/Settings/CCSettings.m

@@ -503,7 +503,7 @@
 
 - (void)sendMailEncryptPass
 {
-    [CCUtility sendMailEncryptPass:[CCUtility getEmail] validateEmail:NO form:self nameImage:[NCBrandImages sharedInstance].BackgroundDetail];
+    [CCUtility sendMailEncryptPass:[CCUtility getEmail] validateEmail:NO form:self nameImage:@"backgroundDetail"];
 }
 
 #pragma --------------------------------------------------------------------------------------------