Skip to content

Commit 7cd2b77

Browse files
committed
style(format): apply SwiftFormat code formatting
This commit applies SwiftFormat 0.59.1 to automatically format Swift code according to project standards. Changes include: - Reorder property declarations for better organization - Add appropriate spacing and blank lines - Improve code structure and readability - Apply consistent formatting patterns across multiple SwiftUI views No functional changes were made, only code formatting improvements.
1 parent 48fe501 commit 7cd2b77

File tree

14 files changed

+48
-36
lines changed

14 files changed

+48
-36
lines changed

BuildTools/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ let package = Package(
88
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.59.1"),
99
],
1010
targets: [.target(name: "BuildTools", path: "")]
11-
)
11+
)

Easydict/App/EasydictApp.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ struct EasydictApp: App {
8989
@AppStorage(Defaults.Key<Bool>.hideMenuBarIcon.name)
9090
private var hideMenuBar = Defaults.Key<Bool>.hideMenuBarIcon.defaultValue
9191

92-
@Default(.selectedMenuBarIcon) private var menuBarIcon
9392
@StateObject private var languageState = LanguageState()
93+
94+
@Default(.selectedMenuBarIcon) private var menuBarIcon
9495
}
9596

9697
extension Bool {

Easydict/Swift/Service/Apple/AppleOCREngine/View/OCRBandView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ struct OCRBandView: View {
1616
// MARK: Internal
1717

1818
let bands: [OCRBand]
19+
1920
@Binding var selectedIndex: Int?
2021

2122
var body: some View {

Easydict/Swift/Service/Apple/AppleOCREngine/View/OCRImageView.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import Vision
1515
struct OCRImageView: View {
1616
let image: NSImage
1717
let bands: [OCRBand]
18+
1819
@Binding var selectedIndex: Int?
1920

2021
var body: some View {
@@ -53,6 +54,7 @@ struct OCRBoundingBoxOverlay: View {
5354

5455
let bands: [OCRBand]
5556
@Binding var selectedIndex: Int?
57+
5658
let imageSize: CGSize
5759

5860
var body: some View {

Easydict/Swift/Utility/EventMonitor/Workflow/SelectionWorkflow.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ final class SelectionWorkflow {
5858
text: text,
5959
selectTextType: .accessibility,
6060
isEditable: editable
61-
))
61+
)
62+
)
6263
return
6364
}
6465
}

Easydict/Swift/Utility/Extensions/String/String+HandleInputText.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ extension NSString {
201201
// Determine if language uses spaces between words
202202
let detectedLanguage = AppleService.shared.detectTextSync(content)
203203
let isEnglishTypeLanguage = EZLanguageManager.shared().isLanguageWordsNeedSpace(
204-
detectedLanguage)
204+
detectedLanguage
205+
)
205206
let alphabetCount: CGFloat = isEnglishTypeLanguage ? 15 : 1.5
206207

207208
var modifiedBlockText = ""

Easydict/Swift/Utility/Extensions/String/String+Removing.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ extension String {
175175
/// Remove alphabet characters (a-z, A-Z)
176176
func removingAlphabet() -> String {
177177
let alphabetSet = CharacterSet(
178-
charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
178+
charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
179+
)
179180
return components(separatedBy: alphabetSet).joined()
180181
}
181182

Easydict/Swift/View/MenuItemView.swift

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,25 @@ struct MenuItemView: View {
6161
}
6262
}
6363

64+
// MARK: - Menu Items
65+
66+
@ViewBuilder var inputItem: some View {
67+
menuItem(for: .inputTranslate)
68+
}
69+
6470
// MARK: Private
6571

6672
@ObservedObject private var store = MenuItemStore()
6773

68-
@Default(.showOCRMenuItems) private var showOCRMenuItems
69-
7074
@State private var currentVersion =
7175
Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
7276

7377
@State private var latestVersion: String?
7478

7579
@Environment(\.openURL) private var openURL
7680

81+
@Default(.showOCRMenuItems) private var showOCRMenuItems
82+
7783
private var versionString: String {
7884
let defaultLabel = "Easydict \(currentVersion)"
7985
if let latestVersion,
@@ -84,12 +90,6 @@ struct MenuItemView: View {
8490
}
8591
}
8692

87-
// MARK: - Menu Items
88-
89-
@ViewBuilder var inputItem: some View {
90-
menuItem(for: .inputTranslate)
91-
}
92-
9393
@ViewBuilder private var screenshotItem: some View {
9494
menuItem(for: .snipTranslate)
9595
}
@@ -205,8 +205,6 @@ struct MenuItemView: View {
205205
}
206206
}
207207

208-
// MARK: - Actions
209-
210208
private func exportLogAction() {
211209
logInfo("Export Log")
212210
let logPath = MMManagerForLog.rootLogDirectory() ?? ""

Easydict/Swift/View/SettingView/Tabs/ServiceConfigurationView/SecureTextField.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ struct SecureTextField: View {
1515

1616
let title: LocalizedStringKey
1717
let placeholder: LocalizedStringKey
18+
1819
@Binding var text: String
1920
@State var showText: Bool = false
2021

Easydict/Swift/View/SettingView/Tabs/TabView/AdvancedTab.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ import SwiftUI
1313
struct AdvancedTab: View {
1414
// MARK: Internal
1515

16+
// Query text processing
17+
@Default(.replaceNewlineWithSpace) var replaceNewlineWithSpace: Bool
18+
@Default(.automaticallyRemoveCodeCommentSymbols) var automaticallyRemoveCodeCommentSymbols: Bool
19+
@Default(.automaticWordSegmentation) var automaticWordSegmentation: Bool
20+
1621
var body: some View {
1722
Form {
1823
Section {
@@ -401,11 +406,6 @@ struct AdvancedTab: View {
401406
@Default(.clickQuery) private var clickQuery
402407
@Default(.adjustPopButtonOrigin) private var adjustPopButtonOrigin
403408

404-
// Query text processing
405-
@Default(.replaceNewlineWithSpace) var replaceNewlineWithSpace: Bool
406-
@Default(.automaticallyRemoveCodeCommentSymbols) var automaticallyRemoveCodeCommentSymbols: Bool
407-
@Default(.automaticWordSegmentation) var automaticWordSegmentation: Bool
408-
409409
// Windows management
410410
@Default(.fixedWindowPosition) private var fixedWindowPosition
411411
@Default(.miniWindowPosition) private var miniWindowPosition
@@ -417,12 +417,12 @@ struct AdvancedTab: View {
417417
@Default(.enableHTTPServer) private var enableHTTPServer
418418
@Default(.httpPort) private var httpPort
419419

420+
@Default(.maxWindowHeightPercentage) private var maxWindowHeightPercentageValue
421+
420422
/// Returns Color.green if `enableHTTPServer` is true, returns Color.red otherwise.
421423
private func getHttpIconColor() -> Color {
422424
enableHTTPServer ? .green : .red
423425
}
424-
425-
@Default(.maxWindowHeightPercentage) private var maxWindowHeightPercentageValue
426426
}
427427

428428
#Preview {

0 commit comments

Comments
 (0)