User sheet: UI Fixes

Dimillian · May 15, 2021 · 337dc54 · 337dc54
1 parent 568aaf6
commit 337dc54
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/RedditOs.xcodeproj/project.pbxproj b/RedditOs.xcodeproj/project.pbxproj
@@ -645,7 +645,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 11.0;
- MARKETING_VERSION = 0.4.1;
+ MARKETING_VERSION = 0.4.2;
  PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.curiosity;
  PRODUCT_NAME = Curiosity;
  SWIFT_VERSION = 5.0;
@@ -672,7 +672,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 11.0;
- MARKETING_VERSION = 0.4.1;
+ MARKETING_VERSION = 0.4.2;
  PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.curiosity;
  PRODUCT_NAME = Curiosity;
  SWIFT_VERSION = 5.0;

diff --git a/RedditOs/Environements/Route.swift b/RedditOs/Environements/Route.swift
@@ -22,16 +22,13 @@ enum Route: Identifiable, Hashable {
  case user(user: User)
  case subreddit(subreddit: String)
  case defaultChannel(chanel: UIState.DefaultChannels)
- case none
 
  var id: String {
  switch self {
- case .user:
- return "user"
+ case let .user(user):
+ return user.id
  case let .subreddit(subreddit):
  return subreddit
- case .none:
- return "none"
  case let .defaultChannel(chanel):
  return chanel.rawValue
  }
@@ -48,8 +45,6 @@ enum Route: Identifiable, Hashable {
  case let .defaultChannel(chanel):
  SubredditPostsListView(name: chanel.rawValue)
  .equatable()
- case .none:
- EmptyView()
  }
  }
 }
diff --git a/RedditOs/Features/Search/Global Search Popopver/GlobalSearchPopoverView.swift b/RedditOs/Features/Search/Global Search Popopver/GlobalSearchPopoverView.swift
@@ -44,8 +44,6 @@ struct GlobalSearchPopoverView: View {
  .onTapGesture {
  uiState.searchRoute = .subreddit(subreddit: searchState.searchText)
  }
- GlobalSearchSubRow(icon: nil,
- name: "Go to u/\(searchState.searchText)")
  }.padding(4)
  }
 

diff --git a/RedditOs/Features/Users/sheet/UserSheetView.swift b/RedditOs/Features/Users/sheet/UserSheetView.swift
@@ -50,7 +50,7 @@ struct UserSheetView: View {
  PostNoSelectionPlaceholder()
  }
  }
- .frame(width: 1500, height: 700)
+ .frame(width: 1200, height: 500)
  .toolbar {
  ToolbarItem(placement: .confirmationAction) {
  Button {