Marino Faggiana 6 سال پیش
والد
کامیت
f462cdd232
4فایلهای تغییر یافته به همراه7 افزوده شده و 8 حذف شده
  1. 2 2
      iOSClient/Activity/NCActivity.swift
  2. 1 1
      iOSClient/Main/CCDetail.m
  3. 1 1
      iOSClient/Main/NCMainCommon.swift
  4. 3 4
      iOSClient/Utility/NCUtility.swift

+ 2 - 2
iOSClient/Activity/NCActivity.swift

@@ -308,7 +308,7 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
             return
         } else {
             loadingIdActivity = idActivity
-            NCUtility.sharedInstance.startActivityIndicator(view: self.view, bottom: true)
+            NCUtility.sharedInstance.startActivityIndicator(view: self.view, bottom: 50)
         }
         
         OCNetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, since: idActivity, limit: 100, link: "", completion: { (account, listOfActivity, message, errorCode) in
@@ -492,7 +492,7 @@ class activityTableViewCell: UITableViewCell, UICollectionViewDelegate, UICollec
             
             let fileNameLocalPath = CCUtility.getDirectoryProviderStorageFileID(activitySubjectRich.id, fileNameView: activitySubjectRich.name)
             
-            NCUtility.sharedInstance.startActivityIndicator(view: (appDelegate.window.rootViewController?.view)!, bottom: false)
+            NCUtility.sharedInstance.startActivityIndicator(view: (appDelegate.window.rootViewController?.view)!, bottom: 0)
             
             let _ = OCNetworking.sharedManager()?.download(withAccount: activityPreview.account, url: url, fileNameLocalPath: fileNameLocalPath, completion: { (account, message, errorCode) in
                 

+ 1 - 1
iOSClient/Main/CCDetail.m

@@ -214,7 +214,7 @@
         // RichDocument
         if ([[NCViewerRichdocument sharedInstance] isRichDocument:self.metadataDetail]) {
             
-            [[NCUtility sharedInstance] startActivityIndicatorWithView:self.view bottom:false];
+            [[NCUtility sharedInstance] startActivityIndicatorWithView:self.view bottom:0];
             
             if ([self.metadataDetail.url isEqualToString:@""]) {
                 [[OCNetworking sharedManager] createLinkRichdocumentsWithAccount:appDelegate.activeAccount fileID:self.metadataDetail.fileID completion:^(NSString *account, NSString *link, NSString *message, NSInteger errorCode) {

+ 1 - 1
iOSClient/Main/NCMainCommon.swift

@@ -176,7 +176,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
         // Delete k_metadataStatusWaitUpload OR k_metadataStatusUploadError
         NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "status == %d OR status == %d", appDelegate.activeAccount, k_metadataStatusWaitUpload, k_metadataStatusUploadError))
         
-        NCUtility.sharedInstance.startActivityIndicator(view: view, bottom: false)
+        NCUtility.sharedInstance.startActivityIndicator(view: view, bottom: 0)
         
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             if let metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "status != %d AND status != %d", k_metadataStatusNormal, k_metadataStatusHide), sorted: "fileName", ascending: true)  {

+ 3 - 4
iOSClient/Utility/NCUtility.swift

@@ -243,7 +243,7 @@ class NCUtility: NSObject {
         return imageNamePath
     }
     
-    @objc func startActivityIndicator(view: UIView, bottom: Bool) {
+    @objc func startActivityIndicator(view: UIView, bottom: CGFloat) {
     
         activityIndicator.color = NCBrandColor.sharedInstance.brand
         activityIndicator.hidesWhenStopped = true
@@ -255,10 +255,9 @@ class NCUtility: NSObject {
         let horizontalConstraint = NSLayoutConstraint(item: activityIndicator, attribute: NSLayoutConstraint.Attribute.centerX, relatedBy: NSLayoutConstraint.Relation.equal, toItem: view, attribute: NSLayoutConstraint.Attribute.centerX, multiplier: 1, constant: 0)
         view.addConstraint(horizontalConstraint)
         
-        
         var verticalConstant: CGFloat = 0
-        if bottom {
-            verticalConstant = (view.frame.size.height / 2) - 50
+        if bottom > 0 {
+            verticalConstant = (view.frame.size.height / 2) - bottom
         }
         
         let verticalConstraint = NSLayoutConstraint(item: activityIndicator, attribute: NSLayoutConstraint.Attribute.centerY, relatedBy: NSLayoutConstraint.Relation.equal, toItem: view, attribute: NSLayoutConstraint.Attribute.centerY, multiplier: 1, constant: verticalConstant)