marinofaggiana 5 жил өмнө
parent
commit
4618ea4a85

+ 1 - 1
iOSClient/Brand/File_Provider_Extension.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
 	<string>2.24.3</string>
 	<string>2.24.3</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>0</string>
+	<string>1</string>
 	<key>NSAppTransportSecurity</key>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<key>NSAllowsArbitraryLoads</key>

+ 1 - 1
iOSClient/Brand/Share.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
 	<string>2.24.3</string>
 	<string>2.24.3</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>0</string>
+	<string>1</string>
 	<key>NSAppTransportSecurity</key>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<key>NSAllowsArbitraryLoads</key>

+ 1 - 1
iOSClient/Brand/iOSClient.plist

@@ -63,7 +63,7 @@
 		</dict>
 		</dict>
 	</array>
 	</array>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>0</string>
+	<string>1</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<true/>
 	<true/>
 	<key>Fabric</key>
 	<key>Fabric</key>

+ 6 - 2
iOSClient/Main/CCMain.m

@@ -577,6 +577,9 @@
 {
 {
     if ([NCBrandOptions sharedInstance].use_themingLogo) {
     if ([NCBrandOptions sharedInstance].use_themingLogo) {
         
         
+        return [UIImage imageNamed:@"themingLogo"];
+        
+        /*
         UIImage *imageThemingLogo = [UIImage imageNamed:@"themingLogo"];
         UIImage *imageThemingLogo = [UIImage imageNamed:@"themingLogo"];
         NSInteger multiplier = 2;
         NSInteger multiplier = 2;
         NSString *fileNameThemingLogo = [NSString stringWithFormat:@"%@/%@-themingLogo.png", [CCUtility getDirectoryUserData], [CCUtility getStringUser:appDelegate.activeUser activeUrl:appDelegate.activeUrl]];
         NSString *fileNameThemingLogo = [NSString stringWithFormat:@"%@/%@-themingLogo.png", [CCUtility getDirectoryUserData], [CCUtility getStringUser:appDelegate.activeUser activeUrl:appDelegate.activeUrl]];
@@ -595,16 +598,17 @@
             
             
             return [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplier color:NCBrandColor.sharedInstance.brandText];
             return [CCGraphics changeThemingColorImage:imageThemingLogo multiplier:multiplier color:NCBrandColor.sharedInstance.brandText];
         }
         }
+        */
         
         
     } else {
     } else {
         
         
         if ([appDelegate.reachability isReachable] == NO) {
         if ([appDelegate.reachability isReachable] == NO) {
             
             
-            return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:2 color:NCBrandColor.sharedInstance.icon];
+            return [UIImage imageNamed:@"themingLogo"];
             
             
         } else {
         } else {
             
             
-            return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:2 color:NCBrandColor.sharedInstance.brandText];
+            return [UIImage imageNamed:@"themingLogo"];
         }
         }
     }
     }
 }
 }

+ 2 - 10
iOSClient/Move/CCMove.m

@@ -74,18 +74,10 @@
     [self.create setTitle:NSLocalizedString(@"_create_folder_", nil)];
     [self.create setTitle:NSLocalizedString(@"_create_folder_", nil)];
     
     
     if (![_serverUrl length]) {
     if (![_serverUrl length]) {
-        
-        UIImageView *image;
-        
+                
         _serverUrl = [CCUtility getHomeServerUrlActiveUrl:activeUrl];
         _serverUrl = [CCUtility getHomeServerUrlActiveUrl:activeUrl];
         
         
-        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:activeAccount];
-        if ([capabilities.themingColor isEqualToString:@"#FFFFFF"])
-            image = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:2 color:[UIColor blackColor]]];
-        else
-            image = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"themingLogo"] multiplier:2 color:[UIColor whiteColor]]];
-
-        [self.navigationController.navigationBar.topItem setTitleView:image];
+        [self.navigationController.navigationBar.topItem setTitleView:[[UIImageView alloc] initWithImage: [UIImage imageNamed:@"themingLogo"]]];
         self.title = @"Home";
         self.title = @"Home";
         
         
     } else {
     } else {