[W][macos-10.15] - change Alamofire version. / add some icon | log. (#…

…329)

* [W][macos-10.15] - change Alamofire version. / add some icon | log.

* perf: remove IDEWorkspaceChecks.plist

* perf: remove SF image method in macos-10.15

* [W][macos-10.15] - add icon.

* perf: remove unused toolbar_privacy image

---------

Co-authored-by: tisfeng <[email protected]>

Easydict.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2021,7 +2021,7 @@
 				};
 			};
 			buildConfigurationList = C99EEB132385796700FEE666 /* Build configuration list for PBXProject "Easydict" */;
-			compatibilityVersion = "Xcode 13.0";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -2775,8 +2775,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Alamofire/Alamofire";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 5.8.1;
+				kind = exactVersion;
+				version = 5.2.2;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,14 +1,16 @@
 {
-  "pins" : [
-    {
-      "identity" : "alamofire",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Alamofire/Alamofire",
-      "state" : {
-        "revision" : "3dc6a42c7727c49bf26508e29b0a0b35f9c7e1ad",
-        "version" : "5.8.1"
+  "object": {
+    "pins": [
+      {
+        "package": "Alamofire",
+        "repositoryURL": "https://github.com/Alamofire/Alamofire",
+        "state": {
+          "branch": null,
+          "revision": "becd9a729a37bdbef5bc39dc3c702b99f9e3d046",
+          "version": "5.2.2"
+        }
       }
-    }
-  ],
-  "version" : 2
+    ]
+  },
+  "version": 1
 }

Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "arrow_clockwise_circle.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/arrow.forward.square.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "arrow.forward.square.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/camera.metering.spot.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "camera-metering-spot_20.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "camera-metering-spot (1).png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/camera.viewfinder.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "edit-camera.viewfinder.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "edit-camera.viewfinder-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/dock.rectangle.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "dock.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/highlighter.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "select_40.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "select.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/keyboard.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "keyboard_20.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "keyboard (2).png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/pause.circle.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Pause.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "Privacy.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Easydict/App/Assets.xcassets/stop.circle.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "stop circle.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "2.1勾.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Easydict/Feature/PerferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m

@@ -131,6 +131,7 @@ - (NSTableView *)tableView {
             tableView.style = NSTableViewStylePlain;
         } else {
             // Fallback on earlier versions
+            [tableView setHeaderView:nil];
         }
 
         NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:EZColumnId];

Easydict/Feature/PerferenceWindow/EZPrivacyViewController.m

@@ -147,11 +147,12 @@ - (NSImage *)toolbarItemImage {
     //    privacyImage = [privacyImage imageWithTintColor:[NSColor mm_colorWithHexString:@"#1296DB"]];
     //    privacyImage = [privacyImage resizeToSize:CGSizeMake(14, 14)];
 
-    NSImage *privacyImage = [NSImage imageNamed:@"toolbar_privacy"];
-    privacyImage = [NSImage ez_imageWithSymbolName:@"hand.raised.square" size:CGSizeMake(18, 16)];
-    privacyImage = [privacyImage imageWithTintColor:[NSColor ez_imageTintBlueColor]];
-
-    return privacyImage;
+//    NSImage *privacyImage = [NSImage imageNamed:@"toolbar_privacy"];
+//    privacyImage = [NSImage ez_imageWithSymbolName:@"hand.raised.square" size:CGSizeMake(18, 16)];
+//    privacyImage = [privacyImage imageWithTintColor:[NSColor ez_imageTintBlueColor]];
+//
+//    return privacyImage;
+    return [NSImage imageNamed:@"toolbar_privacy"];
 }
 
 - (BOOL)hasResizableWidth {

Easydict/Feature/PerferenceWindow/ServiceViewController/EZServiceViewController.m

@@ -159,6 +159,7 @@ - (NSTableView *)tableView {
             tableView.style = NSTableViewStylePlain;
         } else {
             // Fallback on earlier versions
+            [tableView setHeaderView:nil];
         }
 
         NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:EZColumnId];

Easydict/Feature/Service/Apple/EZAppleService.m

@@ -806,7 +806,7 @@ - (void)ocrImage:(NSImage *)image
         }
 
         if (@available(macOS 13.0, *)) {
-            request.automaticallyDetectsLanguage = automaticallyDetectsLanguage;
+//            request.automaticallyDetectsLanguage = automaticallyDetectsLanguage;
         }
 
         if (![preferredLanguage isEqualToString:EZLanguageAuto]) {

Easydict/Feature/Service/Caiyun/CaiyunService.swift

@@ -31,11 +31,11 @@ public final class CaiyunService: QueryService {
         }
         return orderedDict
     }
-
-    override public func ocr(_: EZQueryModel) async throws -> EZOCRResult {
-        NSLog("Caiyun Translate does not support OCR")
-        throw QueryServiceError.notSupported
-    }
+    
+//    override public func ocr(_: EZQueryModel) async throws -> EZOCRResult {
+//        NSLog("Caiyun Translate does not support OCR")
+//        throw QueryServiceError.notSupported
+//    }
 
     private var apiEndPoint = "https://api.interpreter.caiyunai.com/v1/translator"
 
@@ -45,7 +45,7 @@ public final class CaiyunService: QueryService {
     // easydict://writeKeyValue?EZCaiyunToken=
     private var token: String {
         let token = UserDefaults.standard.string(forKey: EZCaiyunToken)
-        if let token, !token.isEmpty {
+        if let token = token, !token.isEmpty {
             return token
         } else {
             return CaiyunService.defaultTestToken
@@ -89,8 +89,8 @@ public final class CaiyunService: QueryService {
                    headers: headers)
             .validate()
             .responseDecodable(of: CaiyunResponse.self) { [weak self] response in
-                guard let self else { return }
-                let result = self.result
+                guard let me = self else { return }
+                let result = me.result
                 switch response.result {
                 case let .success(value):
                     result.from = from

Easydict/Feature/Service/Model/EZServiceTypes.m

@@ -60,7 +60,7 @@ + (instancetype)allocWithZone:(struct _NSZone *)zone {
                                            EZServiceTypeBing, [EZBingService class],
                                            EZServiceTypeVolcano, [EZVolcanoTranslate class],
                                            EZServiceTypeNiuTrans, [EZNiuTransTranslate class],
-                                           EZServiceTypeCaiyun, [EZCaiyunService class],
+//                                           EZServiceTypeCaiyun, [EZCaiyunService class],
                                            nil];
     return allServiceDict;
 }

Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.h

@@ -12,10 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NSImage (EZSymbolmage)
 
-+ (NSImage *)ez_imageWithSymbolName:(NSString *)name;
-
-+ (NSImage *)ez_imageWithSymbolName:(NSString *)name size:(CGSize)size;
-
 @end
 
 NS_ASSUME_NONNULL_END

Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.m

@@ -30,6 +30,7 @@ + (NSImage *)ez_imageWithSymbolName:(NSString *)name size:(CGSize)size {
         }
     } else {
         // Fallback on earlier versions
+        NSLog(@"ez_imageWithSymbolName: %@", name);
         image = [NSImage imageNamed:name];
     }
     image = [image resizeToSize:size];