marinofaggiana 4 жил өмнө
parent
commit
ec42cbcb63

+ 12 - 0
iOSClient/Main/Collection/NCCollectionViewCommon.swift

@@ -517,6 +517,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             return CCGraphics.changeThemingColorImage(UIImage.init(named: "search"), width: 300, height: 300, color: .gray)
         }
         
+        if isReloadDataSourceNetworkInProgress {
+            return CCGraphics.changeThemingColorImage(UIImage.init(named: "networkInProgress"), width: 300, height: 300, color: .gray)
+        }
+        
         return DZNimage
     }
     
@@ -524,6 +528,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         var text = "\n"+NSLocalizedString(DZNtitle, comment: "")
         
+        if isReloadDataSourceNetworkInProgress {
+            text = "\n"+NSLocalizedString("_request_in_progress_", comment: "")
+        }
+        
         if searchController?.isActive ?? false {
             if isReloadDataSourceNetworkInProgress {
                 text = "\n"+NSLocalizedString("_search_in_progress_", comment: "")
@@ -540,6 +548,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         var text = "\n"+NSLocalizedString(DZNdescription, comment: "")
         
+        if isReloadDataSourceNetworkInProgress {
+            text = ""
+        }
+        
         if searchController?.isActive ?? false {
             text = "\n"+NSLocalizedString("_search_instruction_", comment: "")
         }

+ 1 - 1
iOSClient/Select/NCSelect.swift

@@ -214,7 +214,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
     
     func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
         if networkInProgress {
-            return CCGraphics.changeThemingColorImage(UIImage.init(named: "networkInProgress"), width: 300, height: 300, color: UIColor.lightGray)
+            return CCGraphics.changeThemingColorImage(UIImage.init(named: "networkInProgress"), width: 300, height: 300, color: .gray)
         } else {
             return CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
         }