Merge pull request PlayCover#71 from ohaiibuzzle/fix/app-links

Move the app links checkbox into the View menu
XuYicong · Jul 21, 2022 · 1e2040a · 1e2040a
2 parents 685f40b + 0d9e22f
commit 1e2040a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/PlayCover/View/AppsView.swift b/PlayCover/View/AppsView.swift
@@ -14,8 +14,6 @@ struct AppsView : View {
     @EnvironmentObject var vm : AppsVM
 
     @State private var gridLayout = [GridItem(.adaptive(minimum: 150, maximum: 150), spacing: 10)]
-
-    @State private var showAppLinks = UserDefaults.standard.bool(forKey: "ShowLinks")
 
 	@State private var alertTitle = ""
 
@@ -30,14 +28,6 @@ struct AppsView : View {
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             HStack {
-                Toggle(isOn: $showAppLinks) {
-                    Text("Show app links")
-                }.onChange(of: showAppLinks) { value in
-                    UserDefaults.standard.set(showAppLinks, forKey: "ShowLinks")
-                    vm.fetchApps()
-                }.padding(.leading, 30)
-                    .help("Untick this option to show installed apps only")
-                Spacer()
                 SearchView().padding(.leading, 20).padding(.trailing, 10).padding(.vertical, 8)
                 ExportView().environmentObject(InstallVM.shared)
                 Button(NSLocalizedString("Download more apps", comment: "")) {

diff --git a/PlayCover/View/MenuBarView.swift b/PlayCover/View/MenuBarView.swift
@@ -38,3 +38,28 @@ struct PlayCoverHelpMenuView: Commands {
         }
     }
 }
+
+struct PlayCoverViewMenuView: Commands {
+    var body: some Commands {
+        CommandGroup(before: .sidebar)
+        {
+            ShowAppLinksCommand()
+            Divider()
+        }
+    }
+}
+
+struct ShowAppLinksCommand: View{
+    @ObservedObject var apps = AppsVM.shared
+
+    var body: some View {
+        Toggle(isOn: $apps.showAppLinks)
+        {
+            Text("Show app links")
+        }.onChange(of: apps.showAppLinks){ value in
+            UserDefaults.standard.set(value, forKey: "ShowLinks")
+            apps.fetchApps()
+        }
+        .keyboardShortcut("A", modifiers: [.command, .option])
+    }
+}
diff --git a/PlayCover/View/PlayCoverApp.swift b/PlayCover/View/PlayCoverApp.swift
@@ -66,6 +66,7 @@ struct PlayCoverApp: App {
             .commands {
                 PlayCoverMenuView(showToast: $showToast)
                 PlayCoverHelpMenuView()
+                PlayCoverViewMenuView()
             }
     }
 

diff --git a/PlayCover/ViewModel/AppsVM.swift b/PlayCover/ViewModel/AppsVM.swift
@@ -18,6 +18,7 @@ class AppsVM : ObservableObject {
 
     @Published var apps : [BaseApp] = []
     @Published var updatingApps : Bool = false
+    @Published var showAppLinks = UserDefaults.standard.bool(forKey: "ShowLinks")
 
     func fetchApps(){
         DispatchQueue.global(qos: .background).async {