Marino Faggiana 6 years ago
parent
commit
d50b9745e9
33 changed files with 8 additions and 144 deletions
  1. 3 1
      iOSClient/Images.xcassets/load.imageset/Contents.json
  2. 0 0
      iOSClient/Images.xcassets/load.imageset/load.png
  3. 0 0
      iOSClient/Images.xcassets/load.imageset/load@2x.png
  4. 0 0
      iOSClient/Images.xcassets/load.imageset/load@3x.png
  5. 1 1
      iOSClient/Images.xcassets/loadNoRecord.imageset/Contents.json
  6. BIN
      iOSClient/Images.xcassets/loadNoRecord.imageset/loadNoRecord@2x.png
  7. 0 23
      iOSClient/Images.xcassets/loadingTitle.imageset/Contents.json
  8. BIN
      iOSClient/Images.xcassets/moreTransfers.imageset/moreTransfers@2x.png
  9. 0 23
      iOSClient/Images.xcassets/moveSelectedFiles.imageset/Contents.json
  10. BIN
      iOSClient/Images.xcassets/moveSelectedFiles.imageset/moveSelectedFilesNextcloud.png
  11. BIN
      iOSClient/Images.xcassets/moveSelectedFiles.imageset/moveSelectedFilesNextcloud@2x.png
  12. BIN
      iOSClient/Images.xcassets/moveSelectedFiles.imageset/moveSelectedFilesNextcloud@3x.png
  13. 0 23
      iOSClient/Images.xcassets/navBarOffline.imageset/Contents.json
  14. BIN
      iOSClient/Images.xcassets/navBarOffline.imageset/navBarOffline@1x.png
  15. BIN
      iOSClient/Images.xcassets/navBarOffline.imageset/navBarOffline@2x.png
  16. BIN
      iOSClient/Images.xcassets/navBarOffline.imageset/navBarOffline@3x.png
  17. 0 23
      iOSClient/Images.xcassets/password.imageset/Contents.json
  18. BIN
      iOSClient/Images.xcassets/password.imageset/password.png
  19. BIN
      iOSClient/Images.xcassets/password.imageset/password@2x.png
  20. BIN
      iOSClient/Images.xcassets/password.imageset/password@3x.png
  21. 0 23
      iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/Contents.json
  22. BIN
      iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/settingsRemoveCryptoCloud.png
  23. BIN
      iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/settingsRemoveCryptoCloud@2x.png
  24. BIN
      iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/settingsRemoveCryptoCloud@3x.png
  25. 0 23
      iOSClient/Images.xcassets/transfers.imageset/Contents.json
  26. BIN
      iOSClient/Images.xcassets/transfers.imageset/transfer.png
  27. BIN
      iOSClient/Images.xcassets/transfers.imageset/transfer@2x.png
  28. BIN
      iOSClient/Images.xcassets/transfers.imageset/transfer@3x.png
  29. BIN
      iOSClient/Images.xcassets/transfersNoRecord.imageset/transfersNoRecord@2x.png
  30. 1 1
      iOSClient/Main/CCMain.m
  31. 1 1
      iOSClient/Main/CCMore.swift
  32. 1 1
      iOSClient/Photos/CCPhotos.m
  33. 1 1
      iOSClient/Transfers/CCTransfers.m

+ 3 - 1
iOSClient/Images.xcassets/transfersNoRecord.imageset/Contents.json → iOSClient/Images.xcassets/load.imageset/Contents.json

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

+ 0 - 0
iOSClient/Images.xcassets/loadingTitle.imageset/loadingTitle.png → iOSClient/Images.xcassets/load.imageset/load.png


+ 0 - 0
iOSClient/Images.xcassets/loadingTitle.imageset/loadingTitle@2x.png → iOSClient/Images.xcassets/load.imageset/load@2x.png


+ 0 - 0
iOSClient/Images.xcassets/loadingTitle.imageset/loadingTitle@3x.png → iOSClient/Images.xcassets/load.imageset/load@3x.png


+ 1 - 1
iOSClient/Images.xcassets/moreTransfers.imageset/Contents.json → iOSClient/Images.xcassets/loadNoRecord.imageset/Contents.json

@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "moreTransfers@2x.png",
+      "filename" : "loadNoRecord@2x.png",
       "scale" : "2x"
     },
     {

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


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

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

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


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

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

BIN
iOSClient/Images.xcassets/moveSelectedFiles.imageset/moveSelectedFilesNextcloud.png


BIN
iOSClient/Images.xcassets/moveSelectedFiles.imageset/moveSelectedFilesNextcloud@2x.png


BIN
iOSClient/Images.xcassets/moveSelectedFiles.imageset/moveSelectedFilesNextcloud@3x.png


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

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

BIN
iOSClient/Images.xcassets/navBarOffline.imageset/navBarOffline@1x.png


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


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


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

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

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


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


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


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

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

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


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


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


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

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

BIN
iOSClient/Images.xcassets/transfers.imageset/transfer.png


BIN
iOSClient/Images.xcassets/transfers.imageset/transfer@2x.png


BIN
iOSClient/Images.xcassets/transfers.imageset/transfer@3x.png


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


+ 1 - 1
iOSClient/Main/CCMain.m

@@ -3133,7 +3133,7 @@
     
     // ITEM MOVE ------------------------------------------------------------------------------------------------------
     
-    appDelegate.moveItem = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_move_selected_files_", nil) subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"moveSelectedFiles"] color:[NCBrandColor sharedInstance].brandElement] highlightedImage:nil action:^(REMenuItem *item) {
+    appDelegate.moveItem = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_move_selected_files_", nil) subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"move"] color:[NCBrandColor sharedInstance].brandElement] highlightedImage:nil action:^(REMenuItem *item) {
             [self moveOpenWindow:[self.tableView indexPathsForSelectedRows]];
     }];
     

+ 1 - 1
iOSClient/Main/CCMore.swift

@@ -88,7 +88,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         // ITEM : Transfer
         var item = OCExternalSites.init()
         item.name = "_transfers_"
-        item.icon = "moreTransfers"
+        item.icon = "load"
         item.url = "segueTransfers"
         functionMenu.append(item)
         

+ 1 - 1
iOSClient/Photos/CCPhotos.m

@@ -182,7 +182,7 @@
     }
     
     if (_isSearchMode) {
-        [CCGraphics addImageToTitle:self.navigationItem.title colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"loadingTitle"] color:[NCBrandColor sharedInstance].brandText] navigationItem:self.navigationItem];
+        [CCGraphics addImageToTitle:self.navigationItem.title colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"load"] color:[NCBrandColor sharedInstance].brandText] navigationItem:self.navigationItem];
         [self.collectionView reloadData];
         return;
     }

+ 1 - 1
iOSClient/Transfers/CCTransfers.m

@@ -117,7 +117,7 @@
 
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"transfersNoRecord"] color:[NCBrandColor sharedInstance].brandElement];
+    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"loadNoRecord"] color:[NCBrandColor sharedInstance].graySoft];
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView