Bump base SDK to macOS 12 + fixes for macOS 12

Dimillian · Dimillian · commit 4c2bf6203288 · 2021-07-30T10:50:27.000+02:00
diff --git a/RedditOs.xcodeproj/project.pbxproj b/RedditOs.xcodeproj/project.pbxproj
@@ -678,7 +678,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 19052021;
+				CURRENT_PROJECT_VERSION = 30072021;
 				DEVELOPMENT_ASSET_PATHS = "\"RedditOs/Preview Content\"";
 				DEVELOPMENT_TEAM = Z6P74P6T99;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -688,8 +688,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.5.4;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MARKETING_VERSION = 0.5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.curiosity;
 				PRODUCT_NAME = Curiosity;
 				SWIFT_VERSION = 5.0;
@@ -705,7 +705,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 19052021;
+				CURRENT_PROJECT_VERSION = 30072021;
 				DEVELOPMENT_ASSET_PATHS = "\"RedditOs/Preview Content\"";
 				DEVELOPMENT_TEAM = Z6P74P6T99;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -715,8 +715,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.5.4;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MARKETING_VERSION = 0.5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.curiosity;
 				PRODUCT_NAME = Curiosity;
 				SWIFT_VERSION = 5.0;
diff --git a/RedditOs/Features/Post/PostDetailToolbar.swift b/RedditOs/Features/Post/PostDetailToolbar.swift
@@ -20,27 +20,14 @@ struct PostDetailToolbar: ToolbarContent {
 }
 
 struct SearchView: View {
-    @State private var isExpanded = false
     @EnvironmentObject private var uiState: UIState
     
     var body: some View {
         if uiState.displayToolbarSearchBar {
-            if !isExpanded {
-                Button {
-                    isExpanded.toggle()
-                } label: {
-                    Image(systemName: "magnifyingglass")
-                }
-            } else {
-                QuickSearchBar(showSuggestionPopover: true,
-                               onCommit: {},
-                               onCancel: {
-                                self.isExpanded = false
-                               })
-                    .frame(width: 300)
-                    .transition(.slide)
-                    .animation(.easeInOut)
-            }
+          QuickSearchBar(showSuggestionPopover: true,
+                         onCommit: {},
+                         onCancel: {})
+              .frame(width: 250)
         }
     }
 }
diff --git a/RedditOs/Features/Search/Quick/QuickSearchBar.swift b/RedditOs/Features/Search/Quick/QuickSearchBar.swift
@@ -27,8 +27,6 @@ struct QuickSearchBar: View {
         } onCancel: {
             onCancel()
         }
-        .keyboardShortcut("f", modifiers: .command)
-        .animation(.easeInOut)
         .popover(isPresented: $isPopoverPresented) {
             ScrollView {
                 VStack(alignment: .leading) {
diff --git a/RedditOs/Features/Search/Quick/QuickSearchResultRow.swift b/RedditOs/Features/Search/Quick/QuickSearchResultRow.swift
@@ -22,7 +22,7 @@ struct QuickSearchResultRow: View {
                 .whenHovered({ hovered  in
                     isHovered = hovered
                 })
-                .animation(.interactiveSpring())
+                .animation(.interactiveSpring(), value: isHovered)
         }
     }
     
diff --git a/RedditOs/Features/Search/Shared/SearchBarView.swift b/RedditOs/Features/Search/Shared/SearchBarView.swift
@@ -24,6 +24,7 @@ struct SearchBarView: View {
             } onCommit: {
                 onCommit()
             }
+            .keyboardShortcut("f", modifiers: .command)
             .padding(8)
             .background(RoundedRectangle(cornerRadius: 8)
                             .stroke(isFocused ? Color.accentColor : Color.clear)
@@ -39,7 +40,6 @@ struct SearchBarView: View {
                         .font(.title2)
                 }
                 .buttonStyle(BorderlessButtonStyle())
-                .animation(.easeInOut)
                 .transition(.move(edge: .trailing))
             }
         }
diff --git a/RedditOs/Features/Sidebar/SidebarView.swift b/RedditOs/Features/Sidebar/SidebarView.swift
@@ -30,8 +30,7 @@ struct SidebarView: View {
             subscriptionSection
             multiSection
         }
-        .listStyle(SidebarListStyle())
-        .frame(minWidth: 200, idealWidth: 200, maxWidth: 200, maxHeight: .infinity)
+        .listStyle(.sidebar)
         .whenHovered({ hovered in
             isHovered = hovered
         })
@@ -100,7 +99,7 @@ struct SidebarView: View {
                                 .equatable()) {
                     Label(LocalizedStringKey(item.rawValue.capitalized), systemImage: item.icon())
                 }.tag(item.rawValue)
-            }.animation(nil)
+            }.animation(nil, value: isHovered)
         }
     }
     
@@ -143,10 +142,10 @@ struct SidebarView: View {
                         .buttonStyle(BorderlessButtonStyle())
                     }
                 }
-            }.animation(nil)
+            }.animation(nil, value: isHovered)
         }
         .listItemTint(.redditGold)
-        .animation(.easeInOut)
+        .animation(.easeInOut, value: isHovered)
     }
     
     private var recentlyVisitedSection: some View {
@@ -184,7 +183,7 @@ struct SidebarView: View {
                             .buttonStyle(BorderlessButtonStyle())
                         }
                     }
-                }.animation(nil)
+                }.animation(nil, value: isHovered)
             }.listItemTint(.redditBlue)
         }
     }
diff --git a/RedditOs/Features/Subreddit/SubredditAboutPopoverView.swift b/RedditOs/Features/Subreddit/SubredditAboutPopoverView.swift
@@ -50,7 +50,7 @@ struct SubredditAboutPopoverView: View {
                         }, label: {
                             Image(systemName: isFavorite ? "star.fill" : "star")
                                 .resizable()
-                                .imageScale(.large)
+                                .frame(width: 16, height: 16)
                                 .foregroundColor(isFavorite ? .redditGold : nil)
                         }).buttonStyle(BorderlessButtonStyle())
                     }
diff --git a/RedditOs/Features/Subreddit/SubredditPostRow.swift b/RedditOs/Features/Subreddit/SubredditPostRow.swift
@@ -78,7 +78,6 @@ struct SubredditPostRow: View, Equatable {
                                         Text(url.host ?? url.absoluteString)
                                             .lineLimit(1)
                                             .truncationMode(.tail)
-                                            .frame(maxWidth: 250)
                                     }
                                 }
                             }
@@ -89,7 +88,6 @@ struct SubredditPostRow: View, Equatable {
                 Spacer()
             }
         }
-        .frame(width: 470)
         .padding(.vertical, 8)
         .contextMenu {
             Button {
diff --git a/RedditOs/Features/Subreddit/SubredditPostThumbnailView.swift b/RedditOs/Features/Subreddit/SubredditPostThumbnailView.swift
@@ -48,7 +48,7 @@ struct SubredditPostThumbnailView: View {
                     .padding(.leading, 6)
                     .padding(.top, -2)
                     .transition(.move(edge: .top))
-                    .animation(.interactiveSpring())
+                    .animation(.interactiveSpring(), value: post.saved)
             }
         }.padding(4)
     }
diff --git a/RedditOs/Features/Subreddit/SubredditPostsListView.swift b/RedditOs/Features/Subreddit/SubredditPostsListView.swift
@@ -73,7 +73,6 @@ struct SubredditPostsListView: View, Equatable {
                 } onCancel: {
                     
                 }
-                .keyboardShortcut("f", modifiers: .command)
                 .padding(.bottom, 8)
             }
         },
@@ -85,7 +84,6 @@ struct SubredditPostsListView: View, Equatable {
                 viewModel.fetchListings(after: viewModel.listings?.last?.id)
             }
         }
-        .equatable()
         .toolbar {
             ToolbarItem(placement: .navigation) {
                 Group {
diff --git a/RedditOs/Features/Subreddit/SubredditViewModel.swift b/RedditOs/Features/Subreddit/SubredditViewModel.swift
@@ -41,10 +41,9 @@ class SubredditViewModel: ObservableObject {
         self.localData = localData
         
         $searchText
-            .subscribe(on: DispatchQueue.global())
-            .debounce(for: .milliseconds(500), scheduler: DispatchQueue.main)
+            .debounce(for: .milliseconds(500), scheduler: RunLoop.main)
             .removeDuplicates()
-            .receive(on: DispatchQueue.main)
+            .compactMap{ $0 }
             .sink(receiveValue: { [weak self] text in
                 if text.isEmpty {
                     self?.isSearchLoading = false
diff --git a/RedditOs/Shared/PostsListView.swift b/RedditOs/Shared/PostsListView.swift
@@ -37,8 +37,8 @@ struct PostsListView<Header: View>: View, Equatable {
                     }
             }
         }
-        .listStyle(InsetListStyle())
-        .frame(width: 500)
+        .listStyle(.inset)
+        .frame(minWidth: 400, idealWidth: 500, maxWidth: 700)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ struct QuickSearchBar: View {`
`27`	`27`	`} onCancel: {`
`28`	`28`	`onCancel()`
`29`	`29`	`}`
`30`		`- .keyboardShortcut("f", modifiers: .command)`
`31`		`- .animation(.easeInOut)`
`32`	`30`	`.popover(isPresented: $isPopoverPresented) {`
`33`	`31`	`ScrollView {`
`34`	`32`	`VStack(alignment: .leading) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ struct QuickSearchResultRow: View {`
`22`	`22`	`.whenHovered({ hovered in`
`23`	`23`	`isHovered = hovered`
`24`	`24`	`})`
`25`		`- .animation(.interactiveSpring())`
	`25`	`+ .animation(.interactiveSpring(), value: isHovered)`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ struct SearchBarView: View {`
`24`	`24`	`} onCommit: {`
`25`	`25`	`onCommit()`
`26`	`26`	`}`
	`27`	`+ .keyboardShortcut("f", modifiers: .command)`
`27`	`28`	`.padding(8)`
`28`	`29`	`.background(RoundedRectangle(cornerRadius: 8)`
`29`	`30`	`.stroke(isFocused ? Color.accentColor : Color.clear)`
`@@ -39,7 +40,6 @@ struct SearchBarView: View {`
`39`	`40`	`.font(.title2)`
`40`	`41`	`}`
`41`	`42`	`.buttonStyle(BorderlessButtonStyle())`
`42`		`- .animation(.easeInOut)`
`43`	`43`	`.transition(.move(edge: .trailing))`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ struct SidebarView: View {`
`30`	`30`	`subscriptionSection`
`31`	`31`	`multiSection`
`32`	`32`	`}`
`33`		`- .listStyle(SidebarListStyle())`
`34`		`- .frame(minWidth: 200, idealWidth: 200, maxWidth: 200, maxHeight: .infinity)`
	`33`	`+ .listStyle(.sidebar)`
`35`	`34`	`.whenHovered({ hovered in`
`36`	`35`	`isHovered = hovered`
`37`	`36`	`})`
`@@ -100,7 +99,7 @@ struct SidebarView: View {`
`100`	`99`	`.equatable()) {`
`101`	`100`	`Label(LocalizedStringKey(item.rawValue.capitalized), systemImage: item.icon())`
`102`	`101`	`}.tag(item.rawValue)`
`103`		`- }.animation(nil)`
	`102`	`+ }.animation(nil, value: isHovered)`
`104`	`103`	`}`
`105`	`104`	`}`
`106`	`105`
`@@ -143,10 +142,10 @@ struct SidebarView: View {`
`143`	`142`	`.buttonStyle(BorderlessButtonStyle())`
`144`	`143`	`}`
`145`	`144`	`}`
`146`		`- }.animation(nil)`
	`145`	`+ }.animation(nil, value: isHovered)`
`147`	`146`	`}`
`148`	`147`	`.listItemTint(.redditGold)`
`149`		`- .animation(.easeInOut)`
	`148`	`+ .animation(.easeInOut, value: isHovered)`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`private var recentlyVisitedSection: some View {`
`@@ -184,7 +183,7 @@ struct SidebarView: View {`
`184`	`183`	`.buttonStyle(BorderlessButtonStyle())`
`185`	`184`	`}`
`186`	`185`	`}`
`187`		`- }.animation(nil)`
	`186`	`+ }.animation(nil, value: isHovered)`
`188`	`187`	`}.listItemTint(.redditBlue)`
`189`	`188`	`}`
`190`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ struct SubredditAboutPopoverView: View {`
`50`	`50`	`}, label: {`
`51`	`51`	`Image(systemName: isFavorite ? "star.fill" : "star")`
`52`	`52`	`.resizable()`
`53`		`- .imageScale(.large)`
	`53`	`+ .frame(width: 16, height: 16)`
`54`	`54`	`.foregroundColor(isFavorite ? .redditGold : nil)`
`55`	`55`	`}).buttonStyle(BorderlessButtonStyle())`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ struct SubredditPostRow: View, Equatable {`
`78`	`78`	`Text(url.host ?? url.absoluteString)`
`79`	`79`	`.lineLimit(1)`
`80`	`80`	`.truncationMode(.tail)`
`81`		`- .frame(maxWidth: 250)`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`	`}`
`@@ -89,7 +88,6 @@ struct SubredditPostRow: View, Equatable {`
`89`	`88`	`Spacer()`
`90`	`89`	`}`
`91`	`90`	`}`
`92`		`- .frame(width: 470)`
`93`	`91`	`.padding(.vertical, 8)`
`94`	`92`	`.contextMenu {`
`95`	`93`	`Button {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ struct SubredditPostThumbnailView: View {`
`48`	`48`	`.padding(.leading, 6)`
`49`	`49`	`.padding(.top, -2)`
`50`	`50`	`.transition(.move(edge: .top))`
`51`		`- .animation(.interactiveSpring())`
	`51`	`+ .animation(.interactiveSpring(), value: post.saved)`
`52`	`52`	`}`
`53`	`53`	`}.padding(4)`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ struct SubredditPostsListView: View, Equatable {`
`73`	`73`	`} onCancel: {`
`74`	`74`
`75`	`75`	`}`
`76`		`- .keyboardShortcut("f", modifiers: .command)`
`77`	`76`	`.padding(.bottom, 8)`
`78`	`77`	`}`
`79`	`78`	`},`
`@@ -85,7 +84,6 @@ struct SubredditPostsListView: View, Equatable {`
`85`	`84`	`viewModel.fetchListings(after: viewModel.listings?.last?.id)`
`86`	`85`	`}`
`87`	`86`	`}`
`88`		`- .equatable()`
`89`	`87`	`.toolbar {`
`90`	`88`	`ToolbarItem(placement: .navigation) {`
`91`	`89`	`Group {`