Browse Source

new Images

Marino Faggiana 6 years ago
parent
commit
d01b4013e1
26 changed files with 81 additions and 8 deletions
  1. 8 8
      iOSClient/AppDelegate.m
  2. BIN
      iOSClient/Images.xcassets/MenuGroupByDate.imageset/MenuGroupByDate.png
  3. BIN
      iOSClient/Images.xcassets/MenuGroupByDate.imageset/MenuGroupByDate@2x.png
  4. BIN
      iOSClient/Images.xcassets/MenuGroupByDate.imageset/MenuGroupByDate@3x.png
  5. BIN
      iOSClient/Images.xcassets/select.imageset/select.png
  6. BIN
      iOSClient/Images.xcassets/select.imageset/select@2x.png
  7. BIN
      iOSClient/Images.xcassets/select.imageset/select@3x.png
  8. BIN
      iOSClient/Images.xcassets/selectAll.imageset/selectAll.png
  9. BIN
      iOSClient/Images.xcassets/selectAll.imageset/selectAll@2x.png
  10. BIN
      iOSClient/Images.xcassets/selectAll.imageset/selectAll@3x.png
  11. 23 0
      iOSClient/Images.xcassets/tabBarFavorites.imageset/Contents.json
  12. BIN
      iOSClient/Images.xcassets/tabBarFavorites.imageset/tabBarFavorite.png
  13. BIN
      iOSClient/Images.xcassets/tabBarFavorites.imageset/tabBarFavorite@2x.png
  14. BIN
      iOSClient/Images.xcassets/tabBarFavorites.imageset/tabBarFavorite@3x.png
  15. 23 0
      iOSClient/Images.xcassets/tabBarFiles.imageset/Contents.json
  16. BIN
      iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles.png
  17. BIN
      iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@2x.png
  18. BIN
      iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@3x.png
  19. 23 0
      iOSClient/Images.xcassets/tabBarMedia.imageset/Contents.json
  20. BIN
      iOSClient/Images.xcassets/tabBarMedia.imageset/tabBarMedia.png
  21. BIN
      iOSClient/Images.xcassets/tabBarMedia.imageset/tabBarMedia@2x.png
  22. BIN
      iOSClient/Images.xcassets/tabBarMedia.imageset/tabBarMedia@3x.png
  23. BIN
      iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore.png
  24. BIN
      iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@2x.png
  25. BIN
      iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@3x.png
  26. 4 0
      iOSClient/Main/CCMain.m

+ 8 - 8
iOSClient/AppDelegate.m

@@ -826,14 +826,14 @@
     // File
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFile];
     [item setTitle:NSLocalizedString(@"_home_", nil)];
-    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];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFiles"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFiles"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
     // Favorites
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFavorite];
     [item setTitle:NSLocalizedString(@"_favorites_", nil)];
-    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];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFavorites"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFavorites"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
     // (PLUS)
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexPlusHide];
@@ -844,14 +844,14 @@
     // Media
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexMedia];
     [item setTitle:NSLocalizedString(@"_media_", nil)];
-    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];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMedia"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMedia"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
     // More
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexMore];
     [item setTitle:NSLocalizedString(@"_more_", nil)];
-    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];
+    item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMore"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
+    item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMore"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
     // Plus Button
     UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarPlus"] multiplier:3 color:[NCBrandColor sharedInstance].brandElement];

BIN
iOSClient/Images.xcassets/MenuGroupByDate.imageset/MenuGroupByDate.png


BIN
iOSClient/Images.xcassets/MenuGroupByDate.imageset/MenuGroupByDate@2x.png


BIN
iOSClient/Images.xcassets/MenuGroupByDate.imageset/MenuGroupByDate@3x.png


BIN
iOSClient/Images.xcassets/select.imageset/select.png


BIN
iOSClient/Images.xcassets/select.imageset/select@2x.png


BIN
iOSClient/Images.xcassets/select.imageset/select@3x.png


BIN
iOSClient/Images.xcassets/selectAll.imageset/selectAll.png


BIN
iOSClient/Images.xcassets/selectAll.imageset/selectAll@2x.png


BIN
iOSClient/Images.xcassets/selectAll.imageset/selectAll@3x.png


+ 23 - 0
iOSClient/Images.xcassets/tabBarFavorites.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/tabBarFavorites.imageset/tabBarFavorite.png


BIN
iOSClient/Images.xcassets/tabBarFavorites.imageset/tabBarFavorite@2x.png


BIN
iOSClient/Images.xcassets/tabBarFavorites.imageset/tabBarFavorite@3x.png


+ 23 - 0
iOSClient/Images.xcassets/tabBarFiles.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles.png


BIN
iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@2x.png


BIN
iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@3x.png


+ 23 - 0
iOSClient/Images.xcassets/tabBarMedia.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/tabBarMedia.imageset/tabBarMedia.png


BIN
iOSClient/Images.xcassets/tabBarMedia.imageset/tabBarMedia@2x.png


BIN
iOSClient/Images.xcassets/tabBarMedia.imageset/tabBarMedia@3x.png


BIN
iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore.png


BIN
iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@2x.png


BIN
iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@3x.png


+ 4 - 0
iOSClient/Main/CCMain.m

@@ -2714,6 +2714,8 @@
 
     appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.sortFileNameAZItem, appDelegate.sortFileNameZAItem, appDelegate.sortDateMoreRecentItem, appDelegate.sortDateLessRecentItem, appDelegate.sortSmallestItem, appDelegate.sortLargestItem,appDelegate.alphabeticItem, appDelegate.typefileItem, appDelegate.dateItem, appDelegate.directoryOnTopItem]];
     
+    appDelegate.reMainMenu.itemHeight = 40;
+    
     appDelegate.reMainMenu.imageOffset = CGSizeMake(5, -1);
     
     appDelegate.reMainMenu.separatorOffset = CGSizeMake(50.0, 0.0);
@@ -2829,6 +2831,8 @@
             appDelegate.reSelectMenu = [[REMenu alloc] initWithItems:@[appDelegate.selectAllItem, appDelegate.moveItem, appDelegate.downloadItem, appDelegate.saveItem, appDelegate.deleteItem]];
         }
     }
+    
+    appDelegate.reSelectMenu.itemHeight = 50;
 
     appDelegate.reSelectMenu.imageOffset = CGSizeMake(5, -1);