Merge branch 'release/v0.21.0'

Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
   - Alamofire (5.0.5)
-  - CryptoSwift (1.3.1)
-  - Kingfisher (5.14.1):
-    - Kingfisher/Core (= 5.14.1)
-  - Kingfisher/Core (5.14.1)
+  - CryptoSwift (1.3.3)
+  - Kingfisher (5.15.4):
+    - Kingfisher/Core (= 5.15.4)
+  - Kingfisher/Core (5.15.4)
   - libminipng (0.5.6)
   - LoginServiceKit (2.2.0)
   - MASShortcut (2.4.0)
@@ -55,27 +55,27 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   CryptoSwift:
-    :commit: e793a595747c8f9b97b8de4ebde7b2a440f2d594
+    :commit: e2bc81be54d71d566a52ca17c3983d141c30aa70
     :git: https://github.com/krzyzanowskim/CryptoSwift
   LoginServiceKit:
-    :commit: 17a916dc09f1aab0f13e6edd1f77cdecee4d0ae8
+    :commit: cf58b91b0ac247bd8bf5dccb5434ca60a930c1e1
     :git: https://github.com/Clipy/LoginServiceKit.git
   SwiftyXMLParser:
-    :commit: 9d82653e535a13a518b411934c0a5c0c84406c22
+    :commit: ec7f183642adf429babd867d1a38c5c6912408ba
     :git: https://github.com/yahoojapan/SwiftyXMLParser.git
 
 SPEC CHECKSUMS:
   Alamofire: df2f8f826963b08b9a870791ad48e07a10090b2e
-  CryptoSwift: 27c1f79acf3410c697981c2443076ad0880a62b4
-  Kingfisher: 8050bc6f7f68cbf3908bd04df7ccbac188f6d6d6
+  CryptoSwift: fedfc9f8362163ca381a78897ad810982e18d464
+  Kingfisher: 657dc1077e5bbbfff864194c79f29e35b722d062
   libminipng: a44c35d06b9d54d6640acdf97f4500c034748abb
   LoginServiceKit: 3c86ce2f2bcd1e373326839d6d863d8a6a5915b4
   MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0
   SQLiteRepairKit: 35aaae5a8838adb85f5b1eb4d796055be6060a4b
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
-  SwiftyXMLParser: 8271497e0a37b5c04b0b167c77b4896e36175a21
+  SwiftyXMLParser: 23b5a9321a8adf72aae29046ea58c3d097b4ac17
   WCDB.swift: 05d509d7a0e60fb6e11c34eb7e4027c0fab5849f
   WCDBOptimizedSQLCipher: baf44493b0c7a3d49e97bc5b64a3856f6428ddd1
 

uPic.xcodeproj/project.pbxproj

@@ -1249,7 +1249,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1258,7 +1258,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1279,7 +1279,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1288,7 +1288,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1305,7 +1305,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1315,7 +1315,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1332,7 +1332,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1342,7 +1342,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

uPic/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
   "images" : [
     {
-      "size" : "16x16",
-      "idiom" : "mac",
       "filename" : "mac-16x16.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
     },
     {
-      "size" : "16x16",
-      "idiom" : "mac",
       "filename" : "[email protected]",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
     },
     {
-      "size" : "32x32",
-      "idiom" : "mac",
       "filename" : "mac-32x32.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
     },
     {
-      "size" : "32x32",
-      "idiom" : "mac",
       "filename" : "[email protected]",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
     },
     {
-      "size" : "128x128",
-      "idiom" : "mac",
       "filename" : "mac-128x128.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
     },
     {
-      "size" : "128x128",
-      "idiom" : "mac",
       "filename" : "[email protected]",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
     },
     {
-      "size" : "256x256",
-      "idiom" : "mac",
       "filename" : "mac-256x256.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
     },
     {
-      "size" : "256x256",
-      "idiom" : "mac",
       "filename" : "[email protected]",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
     },
     {
-      "size" : "512x512",
-      "idiom" : "mac",
       "filename" : "mac-512x512.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
     },
     {
-      "size" : "512x512",
-      "idiom" : "mac",
       "filename" : "[email protected]",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

uPic/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

uPic/Assets.xcassets/Finder Extension/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

uPic/Assets.xcassets/Finder Extension/single_new.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "single.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

uPic/PreferencesWindow/AboutPreferencesViewController.swift

@@ -33,6 +33,13 @@ class AboutPreferencesViewController: PreferencesViewController {
         NSWorkspace.shared.open(url)
     }
 
+    @IBAction func tgButtonClicked(_ sender: NSButton) {
+        guard let url = URL(string: "https://t.me/upic_host") else {
+            return
+        }
+        NSWorkspace.shared.open(url)
+    }
+
     @IBAction func homePageButtonClicked(_ sender: NSButton) {
         guard let url = URL(string: "https://svend.cc") else {
             return

uPic/PreferencesWindow/AdvancedPreferencesViewController.swift

@@ -10,7 +10,7 @@ import Cocoa
 import MASShortcut
 
 class AdvancedPreferencesViewController: PreferencesViewController {
-
+    
     @IBOutlet weak var selectFileShortcut: MASShortcutView!
     @IBOutlet weak var pasteboardShortcut: MASShortcutView!
     @IBOutlet weak var screenshotShortcut: MASShortcutView!
@@ -22,9 +22,9 @@ class AdvancedPreferencesViewController: PreferencesViewController {
     @IBOutlet weak var historyRecordFileNameScrollWaitTime: NSTextField!
     @IBOutlet weak var finderExtensionIcon: NSPopUpButton!
     @IBOutlet weak var resetPreferencesButton: NSButton!
-
+    
     // MARK: Lifecycle
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -51,8 +51,12 @@ class AdvancedPreferencesViewController: PreferencesViewController {
 
     func setFinderExtensionIconDefaultValue() {
         finderExtensionIcon.selectItem(at: FinderUtil.getIcon())
+
+        if #available(macOS 11, *) {
+            finderExtensionIcon.item(at: 1)!.image = NSImage(named: "single_new")
+        }
     }
-
+    
     @IBAction func didClickHistoryRecordConfigurationResetButton(_ sender: NSButton) {
 
         Defaults.removeObject(forKey: Keys.historyRecordWidth)
@@ -79,7 +83,7 @@ class AdvancedPreferencesViewController: PreferencesViewController {
 
         ConfigNotifier.postNotification(.changeHistoryList)
     }
-
+    
     @IBAction func didChangeFinderExtensionIcon(_ sender: NSPopUpButton) {
         FinderUtil.setIcon(sender.indexOfSelectedItem)
     }
@@ -92,19 +96,19 @@ class AdvancedPreferencesViewController: PreferencesViewController {
 
     @IBAction func resetPreferencesButtonClicked(_ sender: NSButton) {
         let alert = NSAlert()
-
+        
         alert.messageText = "Reset User Preferences?".localized
         alert.informativeText = "⚠️ Note that this will reset all user preferences".localized
-
+        
         // Add button and avoid the focus ring
         let cancelString = "Cancel".localized
         alert.addButton(withTitle: cancelString).refusesFirstResponder = true
-
+        
         let yesString = "Yes".localized
         alert.addButton(withTitle: yesString).refusesFirstResponder = true
-
+        
         let modalResult = alert.runModal()
-
+        
         switch modalResult {
         case .alertFirstButtonReturn:
             print("Cancel Resetting User Preferences")
@@ -123,5 +127,4 @@ class AdvancedPreferencesViewController: PreferencesViewController {
             print("Cancel Resetting User Preferences")
         }
     }
-
 }