remove #import "EZConfiguration.h" from Easydict-Bridging-Header.h

tisfeng · Jan 23, 2024 · 05513e6 · 05513e6
1 parent 5dea3fd
commit 05513e6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/Easydict/App/Easydict-Bridging-Header.h b/Easydict/App/Easydict-Bridging-Header.h
@@ -20,7 +20,7 @@
 
 #import "entry.h"
 #import "AppDelegate.h"
-#import "EZConfiguration.h"
+
 #import "EZAppModel.h"
 #import "EZLocalStorage.h"
 

diff --git a/Easydict/Feature/Configuration/Configuration.swift b/Easydict/Feature/Configuration/Configuration.swift
@@ -10,6 +10,15 @@ import Combine
 import Defaults
 import Foundation
 
+@objc enum LanguageDetectOptimize: Int {
+    case none = 0
+    case baidu = 1
+    case google = 2
+}
+
+let kEnableBetaNewAppKey = "EZConfiguration_kEnableBetaNewAppKey"
+let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
+
 @objcMembers class Configuration: NSObject {
     private(set) static var shared = Configuration()
 
@@ -89,7 +98,7 @@ import Foundation
     var autoCopyFirstTranslatedText: Bool
 
     @DefaultsWrapper(.languageDetectOptimize)
-    var languageDetectOptimize: EZLanguageDetectOptimize
+    var languageDetectOptimize: LanguageDetectOptimize
 
     var defaultTTSServiceType: ServiceType {
         get {

diff --git a/Easydict/Feature/Service/Model/EZDetectManager.m b/Easydict/Feature/Service/Model/EZDetectManager.m
@@ -102,7 +102,7 @@ - (void)detectText:(NSString *)queryText completion:(void (^)(EZQueryModel *_Non
 
     [self.appleService detectText:queryText completion:^(EZLanguage appleDetectdedLanguage, NSError *_Nullable error) {
         NSMutableArray<EZLanguage> *preferredLanguages = [[EZLanguageManager.shared preferredLanguages] mutableCopy];
-        EZLanguageDetectOptimize languageDetectOptimize = Configuration.shared.languageDetectOptimize;
+        LanguageDetectOptimize languageDetectOptimize = Configuration.shared.languageDetectOptimize;
 
         // Add English and Chinese to the preferred language list, in general, sysytem detect English and Chinese is relatively accurate, so we don't need to use google or baidu to detect again.
         [preferredLanguages addObjectsFromArray:@[
@@ -112,7 +112,7 @@ - (void)detectText:(NSString *)queryText completion:(void (^)(EZQueryModel *_Non
         ]];
 
         BOOL isPreferredLanguage = [preferredLanguages containsObject:appleDetectdedLanguage];
-        if (isPreferredLanguage || languageDetectOptimize == EZLanguageDetectOptimizeNone) {
+        if (isPreferredLanguage || languageDetectOptimize == LanguageDetectOptimizeNone) {
             [self handleDetectedLanguage:appleDetectdedLanguage error:error completion:completion];
             return;
         }

diff --git a/Easydict/NewApp/Configuration/Configuration+Defaults.swift b/Easydict/NewApp/Configuration/Configuration+Defaults.swift
@@ -33,7 +33,7 @@ extension Defaults.Keys {
     static let autoCopyOCRText = Key<Bool>("EZConfiguration_kAutoCopyOCRTextKey", default: false)
     static let autoCopySelectedText = Key<Bool>("EZConfiguration_kAutoCopySelectedTextKey", default: false)
     static let autoCopyFirstTranslatedText = Key<Bool>("EZConfiguration_kAutoCopyFirstTranslatedTextKey", default: false)
-    static let languageDetectOptimize = Key<EZLanguageDetectOptimize>("EZConfiguration_kLanguageDetectOptimizeTypeKey", default: EZLanguageDetectOptimize.none)
+    static let languageDetectOptimize = Key<LanguageDetectOptimize>("EZConfiguration_kLanguageDetectOptimizeTypeKey", default: LanguageDetectOptimize.none)
     static let defaultTTSServiceType = Key<TTSServiceType>("EZConfiguration_kDefaultTTSServiceTypeKey", default: TTSServiceType.youdao)
     static let showGoogleQuickLink = Key<Bool>("EZConfiguration_kShowGoogleLinkKey", default: true)
     static let showEudicQuickLink = Key<Bool>("EZConfiguration_kShowEudicLinkKey", default: true)

diff --git a/Easydict/NewApp/Utility/Extensions/LanguageDetectOptimizeExtensions.swift b/Easydict/NewApp/Utility/Extensions/LanguageDetectOptimizeExtensions.swift
@@ -9,14 +9,14 @@
 import Defaults
 import Foundation
 
-extension EZLanguageDetectOptimize: Defaults.Serializable {}
+extension LanguageDetectOptimize: Defaults.Serializable {}
 
-extension EZLanguageDetectOptimize: CaseIterable {
-    public static let allCases: [EZLanguageDetectOptimize] = [.none, .baidu, .google]
+extension LanguageDetectOptimize: CaseIterable {
+    public static let allCases: [LanguageDetectOptimize] = [.none, .baidu, .google]
 }
 
 @available(macOS 13, *)
-extension EZLanguageDetectOptimize: CustomLocalizedStringResourceConvertible {
+extension LanguageDetectOptimize: CustomLocalizedStringResourceConvertible {
     public var localizedStringResource: LocalizedStringResource {
         switch self {
         case .none:

diff --git a/Easydict/NewApp/View/SettingView/Tabs/GeneralTab.swift b/Easydict/NewApp/View/SettingView/Tabs/GeneralTab.swift
@@ -26,7 +26,7 @@ struct GeneralTab: View {
             Section {
                 FirstAndSecondLanguageSettingView()
                 Picker("setting.general.language.language_detect_optimize", selection: $languageDetectOptimize) {
-                    ForEach(EZLanguageDetectOptimize.allCases, id: \.rawValue) { option in
+                    ForEach(LanguageDetectOptimize.allCases, id: \.rawValue) { option in
                         Text(option.localizedStringResource)
                             .tag(option)
                     }