marinofaggiana 4 年之前
父節點
當前提交
ad9b451d84
共有 3 個文件被更改,包括 10 次插入14 次删除
  1. 1 1
      Cartfile
  2. 8 12
      iOSClient/Main/NCSplitViewController.swift
  3. 1 1
      iOSClient/Media/NCMedia.swift

+ 1 - 1
Cartfile

@@ -4,7 +4,7 @@ github "kishikawakatsumi/UICKeyChainStore" "v2.1.2"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
 github "dzenbot/DZNEmptyDataSet" "v1.8.1"
 github "jdg/MBProgressHUD" "1.1.0"
-github "realm/realm-cocoa"
+github "realm/realm-cocoa" "v5.3.6"
 github "SVGKit/SVGKit" "3.x"
 github "WeTransfer/WeScan" "1.2.0"
 github "malcommac/SwiftRichString"

+ 8 - 12
iOSClient/Main/NCSplitViewController.swift

@@ -57,14 +57,6 @@ class NCSplitViewController: UISplitViewController {
     }
     
     override func viewDidLayoutSubviews() {
-        setPrimaryColumnWidth()
-    }
-    
-    @objc func timerHandlerChangeTheming(_ timer: Timer) {
-        NotificationCenter.default.postOnMainThread(name: k_notificationCenter_changeTheming)
-    }
-    
-    @objc func setPrimaryColumnWidth() {
         
         var fraction: CGFloat = 0.4
         let gap = 1.0 / self.traitCollection.displayScale
@@ -97,12 +89,16 @@ class NCSplitViewController: UISplitViewController {
         self.preferredPrimaryColumnWidthFraction = fraction
         
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            self.appDelegate.activeMedia?.collectionView?.reloadData()
-            self.appDelegate.activeFavorite?.collectionView?.reloadData()
-            self.appDelegate.activeOffline?.collectionView?.reloadData()
-            self.appDelegate.activeTrash?.collectionView?.reloadData()
+            self.appDelegate.activeMedia?.collectionView?.collectionViewLayout.invalidateLayout()
+            self.appDelegate.activeFavorite?.collectionView?.collectionViewLayout.invalidateLayout()
+            self.appDelegate.activeOffline?.collectionView?.collectionViewLayout.invalidateLayout()
+            self.appDelegate.activeTrash?.collectionView?.collectionViewLayout.invalidateLayout()
         }
     }
+    
+    @objc func timerHandlerChangeTheming(_ timer: Timer) {
+        NotificationCenter.default.postOnMainThread(name: k_notificationCenter_changeTheming)
+    }
 }
 
 extension NCSplitViewController: UISplitViewControllerDelegate {

+ 1 - 1
iOSClient/Media/NCMedia.swift

@@ -46,7 +46,7 @@ class NCMedia: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate,
     private var filterTypeFileImage = false
     private var filterTypeFileVideo = false
             
-    private let kMaxImageGrid: CGFloat = 7
+    private let kMaxImageGrid: CGFloat = 5
     private var cellHeigth: CGFloat = 0
 
     private var oldInProgress = false