improved resolution images-icons

iOSClient/AppDelegate.m

@@ -820,14 +820,14 @@
     // File
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFile];
     [item setTitle:NSLocalizedString(@"_home_", nil)];
-    item.image = [UIImage imageNamed:@"folder"];
-    item.selectedImage = [UIImage imageNamed:@"folder"];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
     
     // Favorites
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFavorite];
     [item setTitle:NSLocalizedString(@"_favorites_", nil)];
-    item.image = [UIImage imageNamed:@"favorite"];
-    item.selectedImage = [UIImage imageNamed:@"favorite"];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"favorite"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"favorite"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
     
     // (PLUS)
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexPlusHide];
@@ -838,14 +838,14 @@
     // Media
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexMedia];
     [item setTitle:NSLocalizedString(@"_media_", nil)];
-    item.image = [UIImage imageNamed:@"media"];
-    item.selectedImage = [UIImage imageNamed:@"media"];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"media"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"media"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
     
     // More
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexMore];
     [item setTitle:NSLocalizedString(@"_more_", nil)];
-    item.image = [UIImage imageNamed:@"tabBarMore"];
-    item.selectedImage = [UIImage imageNamed:@"tabBarMore"];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMore"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMore"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
     
     // Plus Button
     UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarPlus"] multiplier:3 color:[NCBrandColor sharedInstance].brandElement];

iOSClient/Brand/File_Provider_Extension.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.22.5</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

iOSClient/Brand/Notification_Service_Extension.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.22.5</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

iOSClient/Brand/Share.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.22.5</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/iOSClient.plist

@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<true/>
 	<key>Fabric</key>

iOSClient/Favorites/CCFavorites.m

@@ -136,7 +136,7 @@
 
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"favoriteNoFiles"] multiplier:2 color:[NCBrandColor sharedInstance].yellowFavorite];
+    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"favoriteNoFiles"] multiplier:1 color:[NCBrandColor sharedInstance].yellowFavorite];
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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