Merge pull request #1039 from planetary-social/feature/discover-tab-n…

…av-bar Update Discover tab navigation bar
planetary-social · Apr 16, 2024 · 47fda18 · 47fda18
2 parents ee96246 + 9e4816e
commit 47fda18
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 - Fixed an issue where reports for notes were treated as reports for profiles.
+- Updated the Discover tab navigation bar to match new design.
 
 ## [0.1.10] - 2024-04-12Z
 

diff --git a/Nos/Assets/Localization/Localizable.xcstrings b/Nos/Assets/Localization/Localizable.xcstrings
@@ -10384,67 +10384,67 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Nach Nutzern suchen"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Search for users"
+            "value" : "Search people on Nostr or the Fediverse"
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Buscar usuarios"
           }
         },
         "fa" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "جستجوی کاربران"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Rechercher des utilisateurs"
           }
         },
         "ja" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "ユーザーを検索する"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Zoek gebruikers"
           }
         },
         "pt-BR" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Procurar por usuários"
           }
         },
         "sv" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Sök efter användare"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "搜索用户"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "搜索用戶"
           }
         }

diff --git a/Nos/Views/DiscoverView.swift b/Nos/Views/DiscoverView.swift
@@ -11,10 +11,8 @@ struct DiscoverView: View {
     @Environment(CurrentUser.self) var currentUser
     @Dependency(\.analytics) private var analytics
 
-    @State var showRelayPicker = false
-
-    @State var relayFilter: Relay?
-
+    @State var showInfoPopover = false
+
     @State var columns: Int = 0
 
     @State private var performingInitialLoad = true
@@ -43,39 +41,23 @@ struct DiscoverView: View {
     func subscribeToNewEvents() async {
         await cancelSubscriptions()
 
-        if let relayAddress = relayFilter?.addressURL {
-            // TODO: Use a since filter
-            let singleRelayFilter = Filter(
-                kinds: [.text, .delete],
-                limit: 200
-            )
-
-            relaySubscriptions.append(
-                await relayService.subscribeToEvents(matching: singleRelayFilter, from: [relayAddress])
-            )
-        } else {
-            let featuredFilter = Filter(
-                authorKeys: featuredAuthors.compactMap {
-                    PublicKey(npub: $0)?.hex
-                },
-                kinds: [.text, .delete],
-                limit: 200
-            )
-
-            relaySubscriptions.append(await relayService.subscribeToEvents(matching: featuredFilter))
-        }
+        let featuredFilter = Filter(
+            authorKeys: featuredAuthors.compactMap {
+                PublicKey(npub: $0)?.hex
+            },
+            kinds: [.text, .delete],
+            limit: 200
+        )
+
+        relaySubscriptions.append(await relayService.subscribeToEvents(matching: featuredFilter))
     }
 
     func updatePredicate() {
-        if let relayFilter {
-            predicate = Event.seen(on: relayFilter, before: date, exceptFrom: currentUser.author)
-        } else {
-            predicate = Event.extendedNetworkPredicate(
-                currentUser: currentUser,
-                featuredAuthors: featuredAuthors,
-                before: date
-            )
-        }
+        predicate = Event.extendedNetworkPredicate(
+            currentUser: currentUser,
+            featuredAuthors: featuredAuthors,
+            before: date
+        )
     }
 
     // MARK: - View
@@ -90,15 +72,6 @@ struct DiscoverView: View {
                     )
                 } else {
                     DiscoverGrid(predicate: predicate, searchController: searchController, columns: $columns)
-
-                    if showRelayPicker, let author = currentUser.author {
-                        RelayPicker(
-                            selectedRelay: $relayFilter,
-                            defaultSelection: String(localized: .localizable.allMyRelays),
-                            author: author,
-                            isPresented: $showRelayPicker
-                        )
-                    }
                 }
             }
             .searchable(
@@ -112,28 +85,14 @@ struct DiscoverView: View {
             }
             .background(Color.appBg)
             .toolbar {
-                RelayPickerToolbarButton(
-                    selectedRelay: $relayFilter,
-                    isPresenting: $showRelayPicker,
-                    defaultSelection: .localizable.allMyRelays
-                ) {
-                    withAnimation {
-                        showRelayPicker.toggle()
-                    }
-                }
                 ToolbarItem {
-                    HStack {
-                        Button {
-                            columns = max(columns - 1, 1)
-                        } label: {
-                            Image(systemName: "minus")
-                        }
-                        Button {
-                            columns += 1
-                        } label: {
-                            Image(systemName: "plus")
-                        }
+                    Button {
+                        // TODO: actually show the popover. https://github.com/planetary-social/nos/issues/1025
+                        showInfoPopover = true
+                    } label: {
+                        Image(systemName: "info.circle")
                     }
+                    .foregroundColor(.secondaryTxt)
                 }
             }
             .animation(.easeInOut, value: columns)
@@ -143,14 +102,7 @@ struct DiscoverView: View {
             .refreshable {
                 date = .now
             }
-            .onChange(of: relayFilter) { 
-                withAnimation {
-                    showRelayPicker = false
-                }
-                updatePredicate()
-                Task { await subscribeToNewEvents() }
-            }
-            .onChange(of: date) { 
+            .onChange(of: date) {
                 updatePredicate()
             }
             .refreshable {