- Fixes retina images loading

Author: glushchenko

FSNotes iOS/AppDelegate.swift

@@ -80,6 +80,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let webkitPreview = URL(fileURLWithPath: temp).appendingPathComponent("wkPreview")
         try? FileManager.default.removeItem(at: webkitPreview)
 
+        let imagesPreview = URL(fileURLWithPath: temp).appendingPathComponent("ThumbnailsBig")
+        try? FileManager.default.removeItem(at: imagesPreview)
+
         Storage.shared().saveProjectsCache()
         UserDefaultsManagement.crashedLastTime = false
 

FSNotes iOS/Extensions/CustomTextStorage+Images.swift

@@ -13,8 +13,9 @@ extension NSTextStorage {
     public func loadImage(attachment: NSTextAttachment, url: URL, range: NSRange) {
         EditTextView.imagesLoaderQueue.addOperation {
             guard let size = attachment.image?.size else { return }
+            let scale = UIScreen.main.scale
 
-            let retinaSize = CGSize(width: size.width * 2, height: size.height * 2)
+            let retinaSize = CGSize(width: size.width * scale, height: size.height * scale)
             attachment.image = NoteAttachment.getImage(url: url, size: retinaSize)
 
             DispatchQueue.main.async {

FSNotes iOS/Extensions/ImageAttachment+.swift

@@ -11,18 +11,13 @@ import MobileCoreServices
 import AVKit
 
 extension NoteAttachment {
-    public func load(lazy: Bool = true) -> NSTextAttachment? {
+    public func load() -> NSTextAttachment? {
         let imageSize = getSize(url: self.url)
         guard let size = getImageSize(imageSize: imageSize) else { return nil }
 
         let attachment = NSTextAttachment()
         attachment.bounds = CGRect(x: 0, y: 0, width: size.width, height: size.height)
-
-        if lazy {
-            attachment.image = UIImage.emptyImage(with: size)
-        } else {
-            attachment.image = NoteAttachment.getImage(url: self.url, size: size)
-        }
+        attachment.image = UIImage.emptyImage(with: size)
 
         return attachment
     }
@@ -76,12 +71,12 @@ extension NoteAttachment {
         guard let image = finalImage else { return nil }
         var thumbImage: UIImage?
 
-        if let cacheURL = self.getCacheUrl(from: url, prefix: "ThumbnailsBig"), FileManager.default.fileExists(atPath: cacheURL.path) {
+        if let cacheURL = self.getCacheUrl(from: url, prefix: "ThumbnailsBigInline"), FileManager.default.fileExists(atPath: cacheURL.path) {
             thumbImage = UIImage(contentsOfFile: cacheURL.path)
         } else if
             let resizedImage = self.resize(image: image, size: size) {
             thumbImage = resizedImage
-            self.savePreviewImage(url: url, image: resizedImage, prefix: "ThumbnailsBig")
+            self.savePreviewImage(url: url, image: resizedImage, prefix: "ThumbnailsBigInline")
         }
 
         return thumbImage

FSNotes iOS/View/EditTextView.swift

@@ -255,7 +255,7 @@ class EditTextView: UITextView, UITextViewDelegate {
                 let range = NSRange(location: selectedRange.location, length: 1)
                 let attachment = NoteAttachment(title: "", path: path, url: imageUrl, cache: nil, invalidateRange: range, note: note)
 
-                if let attributedString = attachment.getAttributedString(lazy: false) {
+                if let attributedString = attachment.getAttributedString() {
 
                     undoManager?.beginUndoGrouping()
                     textStorage.replaceCharacters(in: selectedRange, with: attributedString)

FSNotes.xcodeproj/project.pbxproj

@@ -4419,12 +4419,12 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 214;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				INFOPLIST_FILE = "FSNotes iOS Share/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.5.1;
+				MARKETING_VERSION = 4.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS.FSNotes-iOS-Share";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -4443,13 +4443,13 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 211;
+				CURRENT_PROJECT_VERSION = 214;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				ENABLE_NS_ASSERTIONS = NO;
 				INFOPLIST_FILE = "FSNotes iOS Share/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS.FSNotes-iOS-Share";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -4471,12 +4471,12 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 214;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				INFOPLIST_FILE = "FSNotes iOS/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.1;
+				MARKETING_VERSION = 4.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -4501,13 +4501,13 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 214;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				ENABLE_NS_ASSERTIONS = NO;
 				INFOPLIST_FILE = "FSNotes iOS/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.1;
+				MARKETING_VERSION = 4.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

FSNotes/Extensions/ImageAttachment+.swift

@@ -10,7 +10,7 @@ import Cocoa
 import AVKit
 
 extension NoteAttachment {
-    public func load(lazy: Bool = true) -> NSTextAttachment? {
+    public func load() -> NSTextAttachment? {
         guard let container = ViewController.shared()?.editArea.textContainer else { return nil }
 
         let attachment = NSTextAttachment()

FSNotesCore/Shared/Business/NoteAttachment.swift

@@ -47,7 +47,7 @@ class NoteAttachment {
 
     weak var weakTimer: Timer?
 
-    public func getAttributedString(lazy: Bool = true) -> NSMutableAttributedString? {
+    public func getAttributedString() -> NSMutableAttributedString? {
         let imageKey = NSAttributedString.Key(rawValue: "co.fluder.fsnotes.image.url")
         let pathKey = NSAttributedString.Key(rawValue: "co.fluder.fsnotes.image.path")
         let titleKey = NSAttributedString.Key(rawValue: "co.fluder.fsnotes.image.title")
@@ -61,7 +61,7 @@ class NoteAttachment {
         }
 
         guard FileManager.default.fileExists(atPath: self.url.path) else { return nil }
-        guard let attachment = load(lazy: lazy) else { return nil }
+        guard let attachment = load() else { return nil }
 
         let attributedString = NSAttributedString(attachment: attachment)
         let mutableAttributedString = NSMutableAttributedString(attributedString: attributedString)