fix: 修复应用设置样式问题并调整app选择初始目录 (#52)

Co-authored-by: qwertyyb <qwertyyb@qq.com>
qwertyyb · Mar 21, 2022 · dbf01c8 · dbf01c8
1 parent be0e859
commit dbf01c8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Fire.xcodeproj/xcshareddata/xcschemes/Fire.xcscheme b/Fire.xcodeproj/xcshareddata/xcschemes/Fire.xcscheme
@@ -40,6 +40,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;pkill Fire&#10;">
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference

diff --git a/Fire/Preferences/ApplicationPane.swift b/Fire/Preferences/ApplicationPane.swift
@@ -87,7 +87,7 @@ struct ApplicationPane: View {
 
     private func addApp() {
         let openPanel = NSOpenPanel()
-        openPanel.directoryURL = Bundle.main.resourceURL
+        openPanel.directoryURL = FileManager.default.urls(for: .applicationDirectory, in: .systemDomainMask).first
         openPanel.prompt = "选择应用"
         openPanel.allowsMultipleSelection = false
         openPanel.canChooseDirectories = false
@@ -145,7 +145,7 @@ struct ApplicationPane: View {
                                 Text("添加应用可单独设置该应用下默认使用英文或五笔")
                                     .foregroundColor(Color.gray)
                             }
-                            .frame(minHeight: 400)
+                            .frame(minHeight: 300)
                         }
                     }
                     .frame(minWidth: 450, minHeight: 320)

diff --git a/Podfile.lock b/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Defaults (4.2.2)
   - Preferences (2.2.0)
   - Sparkle (1.26.0)
-  - SwiftLint (0.42.0)
+  - SwiftLint (0.46.5)
 
 DEPENDENCIES:
   - Defaults
@@ -21,7 +21,7 @@ SPEC CHECKSUMS:
   Defaults: d785e56c0fb8890dc40351603f05c8e1df1bdd45
   Preferences: 4894cc28df3557336b0b72440c893d95203d3e33
   Sparkle: d56d028f4b0c123577825f5d1004f6140d77f90e
-  SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d
+  SwiftLint: 2c16e8fa99dac2e440dc0c70ea74d2532048f6cf
 
 PODFILE CHECKSUM: f3222fdef34001bff78c89a55dda9f7e0a1e60e3