Forráskód Böngészése

coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 éve
szülő
commit
9033a8e3e5

+ 1 - 1
iOSClient/GUI/HUDView.swift

@@ -36,7 +36,7 @@ struct HUDView: View {
             }
         }) {
             Label(textLabel, systemImage: image)
-                .foregroundColor(Color(NCBrandColor.shared.brandText))
+                .foregroundColor(.white)
                 .padding(.horizontal, 10)
                 .padding(14)
                 .background(

+ 6 - 4
iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -271,13 +271,15 @@ struct UploadAssetsView: View {
         }
     }
 
-    func presentedQuickLook(size: CGFloat, index: Int) {
+    func presentedQuickLook(geoSizeWidth: CGFloat, geoSizeHeight: CGFloat, index: Int) {
 
         let previewStore = uploadAssets.previewStore[index]
         var image = previewStore.image
 
-        if !previewStore.hasChanges {
-            if let fullResolutionImage = previewStore.asset.fullResolutionImage?.resizeImage(size: CGSize(width: size, height: size)) {
+        if !previewStore.hasChanges, let sizePhotoWidth = previewStore.asset.phAsset?.pixelWidth, let sizePhotoHeight = previewStore.asset.phAsset?.pixelHeight {
+            let width = min(geoSizeWidth * 2, CGFloat(sizePhotoWidth))
+            let height = min(geoSizeHeight * 2, CGFloat(sizePhotoHeight))
+            if let fullResolutionImage = previewStore.asset.fullResolutionImage?.resizeImage(size: CGSize(width: width, height: height)) {
                 image = fullResolutionImage
             }
         }
@@ -329,7 +331,7 @@ struct UploadAssetsView: View {
                                         }
                                         .onTapGesture {
                                             if item.asset.type == .photo || item.asset.type == .livePhoto {
-                                                presentedQuickLook(size: max(geo.size.height, geo.size.height), index: index)
+                                                presentedQuickLook(geoSizeWidth: geo.size.width, geoSizeHeight: geo.size.height, index: index)
                                             }
                                         }
                                         .fullScreenCover(isPresented: $isPresentedQuickLook) {