Fix icon, update display name, search in toolbar

README.md

@@ -4,3 +4,9 @@ A SwiftUI Reddit client for macOS
 This is bleeding edge, you need macOS Big Sur beta and Xcode 12 beta.
 
 ![Image](Images/image1.png?)
+
+If you want to login with your Reddit account building the project from the source you'll need to create a file `secrets.plist` in `Packages/Backend/Sources/Backend/Resources` with your Reddit app secret as `client_id` key/value.
+
+I'll periodically release pre built version of the app in the repository. 
+
+The app is still early and SwiftUI on macOS is not that fast (yet) but I'm planning to release it on the Mac App Store with the release of Big Sur. 

RedditOs.xcodeproj/xcshareddata/xcschemes/RedditOs.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "69EACEFE24B63D5800303A16"
-               BuildableName = "RedditOs.app"
+               BuildableName = "Curiosity.app"
                BlueprintName = "RedditOs"
                ReferencedContainer = "container:RedditOs.xcodeproj">
             </BuildableReference>
@@ -45,7 +45,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "69EACEFE24B63D5800303A16"
-            BuildableName = "RedditOs.app"
+            BuildableName = "Curiosity.app"
             BlueprintName = "RedditOs"
             ReferencedContainer = "container:RedditOs.xcodeproj">
          </BuildableReference>
@@ -62,7 +62,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "69EACEFE24B63D5800303A16"
-            BuildableName = "RedditOs.app"
+            BuildableName = "Curiosity.app"
             BlueprintName = "RedditOs"
             ReferencedContainer = "container:RedditOs.xcodeproj">
          </BuildableReference>

RedditOs/Extensions/NSTextField.swift

@@ -0,0 +1,16 @@
+//
+//  NSTextField.swift
+//  RedditOs
+//
+//  Created by Thomas Ricouard on 28/07/2020.
+//
+
+import Foundation
+import AppKit
+
+extension NSTextField {
+    open override var focusRingType: NSFocusRingType {
+        get { .none }
+        set { }
+    }
+}

RedditOs/Features/Search/SearchSubredditsPopover.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 import Backend
 
-struct SearchSubredditsPopover: View {
+struct PopoverSearchSubredditView: View {
     @EnvironmentObject private var userData: LocalDataStore
     @StateObject private var viewModel = SearchSubredditsViewModel()
 
@@ -21,7 +21,7 @@ struct SearchSubredditsPopover: View {
                 LoadingRow(text: nil)
             } else if let results = viewModel.results {
                 ForEach(results) { result in
-                    SubredditRow(subreddit: result).onTapGesture {
+                    PopoverSearchSubredditRow(subreddit: result).onTapGesture {
                         userData.add(favorite: result)
                     }
                 }
@@ -40,6 +40,6 @@ struct SearchSubredditsPopover: View {
 
 struct SearchSheet_Previews: PreviewProvider {
     static var previews: some View {
-        SearchSubredditsPopover()
+        PopoverSearchSubredditView()
     }
 }

RedditOs/Features/Search/SubredditRow.swift → RedditOs/Features/Search/Subreddit Popover/PopoverSearchSubredditRow.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import Backend
 import SDWebImageSwiftUI
 
-struct SubredditRow: View {
+struct PopoverSearchSubredditRow: View {
     let subreddit: SubredditSmall
 
     var body: some View {
@@ -43,10 +43,10 @@ struct SubredditRow: View {
 struct SubredditRow_Previews: PreviewProvider {
     static var previews: some View {
         List {
-            SubredditRow(subreddit: static_subreddit)
-            SubredditRow(subreddit: static_subreddit)
-            SubredditRow(subreddit: static_subreddit)
-            SubredditRow(subreddit: static_subreddit)
+            PopoverSearchSubredditRow(subreddit: static_subreddit)
+            PopoverSearchSubredditRow(subreddit: static_subreddit)
+            PopoverSearchSubredditRow(subreddit: static_subreddit)
+            PopoverSearchSubredditRow(subreddit: static_subreddit)
         }
     }
 }

RedditOs/Features/Search/Subreddit Popover/PopoverSearchSubredditView.swift

@@ -0,0 +1,45 @@
+//
+//  SearchSubredditsPopover.swift
+//  RedditOs
+//
+//  Created by Thomas Ricouard on 09/07/2020.
+//
+
+import SwiftUI
+import Backend
+
+struct PopoverSearchSubredditView: View {
+    @EnvironmentObject private var userData: LocalDataStore
+    @StateObject private var viewModel = PopoverSearchSubredditViewModel()
+
+    var body: some View {
+        List {
+            TextField("Search", text: $viewModel.searchText)
+                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .padding(.vertical, 8)
+            if viewModel.isLoading {
+                LoadingRow(text: nil)
+            } else if let results = viewModel.results {
+                ForEach(results) { result in
+                    PopoverSearchSubredditRow(subreddit: result).onTapGesture {
+                        userData.add(favorite: result)
+                    }
+                }
+            }
+        }
+        .navigationTitle("Search")
+        .toolbar {
+            ToolbarItem(placement: .navigation) {
+                Button(action: {}) {
+                    Image(systemName: "xmark.circle")
+                }
+            }
+        }
+    }
+}
+
+struct SearchSheet_Previews: PreviewProvider {
+    static var previews: some View {
+        PopoverSearchSubredditView()
+    }
+}

RedditOs/Features/Search/SearchSubredditsViewModel.swift → RedditOs/Features/Search/Subreddit Popover/PopoverSearchSubredditViewModel.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import Combine
 import Backend
 
-class SearchSubredditsViewModel: ObservableObject {
+class PopoverSearchSubredditViewModel: ObservableObject {
     @Published var searchText = ""
     @Published var results: [SubredditSmall]?
     @Published var isLoading = false

RedditOs/Features/Search/ToolbarSearchBar.swift

@@ -0,0 +1,34 @@
+//
+//  ToolbarSearchBar.swift
+//  RedditOs
+//
+//  Created by Thomas Ricouard on 28/07/2020.
+//
+
+import SwiftUI
+
+struct ToolbarSearchBar: View {
+    @State private var isFocused = false
+    @State private var searchText = ""
+
+    var body: some View {
+        TextField("Search anything", text: $searchText) { editing in
+            isFocused = editing
+        } onCommit: {
+
+        }
+        .keyboardShortcut("f", modifiers: .command)
+        .padding(8)
+        .background(RoundedRectangle(cornerRadius: 8)
+                        .stroke(isFocused ? Color.accentColor : Color.clear)
+                        .background(Color.black.opacity(0.2).cornerRadius(8)))
+        .textFieldStyle(PlainTextFieldStyle())
+        .frame(width: 500)
+    }
+}
+
+struct ToolbarSearchBar_Previews: PreviewProvider {
+    static var previews: some View {
+        ToolbarSearchBar()
+    }
+}

RedditOs/Features/Settings/SettingsView.swift

@@ -0,0 +1,78 @@
+//
+//  SettingsView.swift
+//  RedditOs
+//
+//  Created by Thomas Ricouard on 26/07/2020.
+//
+
+import SwiftUI
+
+struct SettingsView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+            .toolbar {
+                ToolbarItem {
+                    Button(action: {
+
+                    }, label: {
+                        VStack {
+                            Image(systemName: "gearshape").imageScale(.large)
+                            Text("General")
+                        }
+                    })
+                }
+
+                ToolbarItem {
+                    Button(action: {
+
+                    }, label: {
+                        VStack {
+                            Image(systemName: "textformat.alt").imageScale(.large)
+                            Text("Apperance")
+                        }
+                    })
+                }
+
+
+                ToolbarItem {
+                    Button(action: {
+
+                    }, label: {
+                        VStack {
+                            Image(systemName: "stop.circle").imageScale(.large)
+                            Text("Filters")
+                        }
+                    })
+                }
+
+                ToolbarItem {
+                    Button(action: {
+
+                    }, label: {
+                        VStack {
+                            Image(systemName: "magnifyingglass").imageScale(.large)
+                            Text("Search")
+                        }
+                    })
+                }
+
+
+                ToolbarItem {
+                    Button(action: {
+
+                    }, label: {
+                        VStack {
+                            Image(systemName: "person").imageScale(.large)
+                            Text("Accounts")
+                        }
+                    })
+                }
+        }.frame(width: 1000, height: 500)
+    }
+}
+
+struct SettingsView_Previews: PreviewProvider {
+    static var previews: some View {
+        SettingsView()
+    }
+}

RedditOs/Features/Sidebar/Sidebar.swift

@@ -121,7 +121,7 @@ struct Sidebar: View {
                 }
                 .buttonStyle(BorderlessButtonStyle())
                 .popover(isPresented: $isSearchPopoverPresented) {
-                    SearchSubredditsPopover().environmentObject(localData)
+                    PopoverSearchSubredditView().environmentObject(localData)
                 }
 
                 Button {

RedditOs/Features/Subreddit/SubredditPostsListView.swift

@@ -16,7 +16,6 @@ struct SubredditPostsListView: View {
     @EnvironmentObject private var localData: LocalDataStore
     @StateObject private var viewModel: SubredditViewModel
     @AppStorage("postDisplayMode") private var displayMode = SubredditPostRow.DisplayMode.large
-    @State private var isSearchSheetOpen = false
 
     init(name: String) {
         _viewModel = StateObject(wrappedValue: SubredditViewModel(name: name))
@@ -47,6 +46,10 @@ struct SubredditPostsListView: View {
         .navigationTitle(viewModel.name.capitalized)
         .navigationSubtitle(subtitle)
         .toolbar {
+            ToolbarItem(placement: .primaryAction) {
+                ToolbarSearchBar()
+            }
+
             ToolbarItem(placement: .primaryAction) {
                 Picker(selection: $displayMode,
                        label: Text("Display"),
@@ -75,17 +78,6 @@ struct SubredditPostsListView: View {
                 }
             }
 
-            ToolbarItem(placement: .primaryAction) {
-                Button(action: {
-                    isSearchSheetOpen = true
-                }) {
-                    Image(systemName: "magnifyingglass")
-                }.popover(isPresented: $isSearchSheetOpen) {
-                    SearchSubredditsPopover().environmentObject(localData)
-                }
-                .keyboardShortcut("f", modifiers: .command)
-            }
-
             ToolbarItem(placement: .primaryAction) {
                 Button(action: {
 

RedditOs/Info.plist

@@ -31,6 +31,8 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 </dict>

RedditOs/RedditOsApp.swift

@@ -34,8 +34,8 @@ struct RedditOsApp: App {
                 Button(action: {
 
                 }) {
-                    Text("Seach")
-                }.keyboardShortcut("f", modifiers: .command)
+                    Text("Search")
+                }
                 Button(action: {
 
                 }) {
@@ -67,7 +67,7 @@ struct RedditOsApp: App {
         }
 
         Settings {
-            Text("Hello world")
+            SettingsView()
         }
     }
 }