Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 13:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search history for tab navigation

Browse Source
This commit is contained in:
Arkadiusz Fal 2021-09-19 14:42:47 +02:00
parent ee1cb924c9
commit bede29dd51
8 changed files with 117 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Model/Recents.swift
View File

@ -79,6 +79,12 @@ struct RecentItem: Defaults.Serializable, Identifiable {
id = channel.id
title = channel.name
}
init(from query: String) {
type = .query
id = query
title = query
}
}
struct RecentItemBridge: Defaults.Bridge {

2
Model/SearchState.swift
View File

@ -6,6 +6,8 @@ final class SearchState: ObservableObject {
@Published var store = Store<[Video]>()
@Published var query = SearchQuery()
@Published var queryText = ""
@Published var querySuggestions = Store<[String]>()
private var previousResource: Resource?

13
Shared/EnvironmentValues.swift
View File

@ -9,6 +9,14 @@ private struct HorizontalCellsKey: EnvironmentKey {
static let defaultValue = false
}
enum NavigationStyle {
case tab, sidebar
}
private struct NavigationStyleKey: EnvironmentKey {
static let defaultValue = NavigationStyle.tab
}
extension EnvironmentValues {
var inNavigationView: Bool {
get { self[InNavigationViewKey.self] }
@ -19,4 +27,9 @@ extension EnvironmentValues {
get { self[HorizontalCellsKey.self] }
set { self[HorizontalCellsKey.self] = newValue }
}
var navigationStyle: NavigationStyle {
get { self[NavigationStyleKey.self] }
set { self[NavigationStyleKey.self] = newValue }
}
}

11
Shared/Navigation/AppSidebarNavigation.swift
View File

@ -20,8 +20,6 @@ struct AppSidebarNavigation: View {
@State private var didApplyPrimaryViewWorkAround = false
@State private var searchQuery = ""
var selection: Binding<TabSelection?> {
navigationState.tabSelectionOptionalBinding
}
@ -53,21 +51,22 @@ struct AppSidebarNavigation: View {
Text("Select section")
}
.searchable(text: $searchQuery, placement: .sidebar) {
.environment(\.navigationStyle, .sidebar)
.searchable(text: $searchState.queryText, placement: .sidebar) {
ForEach(searchState.querySuggestions.collection, id: \.self) { suggestion in
Text(suggestion)
.searchCompletion(suggestion)
}
}
.onChange(of: searchQuery) { query in
.onChange(of: searchState.queryText) { query in
searchState.loadQuerySuggestions(query)
}
.onSubmit(of: .search) {
searchState.changeQuery { query in
query.query = self.searchQuery
query.query = searchState.queryText
}
recents.open(RecentItem(type: .query, identifier: self.searchQuery, title: self.searchQuery))
recents.open(RecentItem(from: searchState.queryText))
navigationState.tabSelection = .search
}

2
Shared/Navigation/AppSidebarRecents.swift
View File

@ -13,7 +13,7 @@ struct AppSidebarRecents: View {
Group {
if !recentItems.isEmpty {
Section(header: Text("Recents")) {
ForEach(recentItems) { recent in
ForEach(recentItems.reversed()) { recent in
Group {
switch recent.type {
case .channel:

12
Shared/Navigation/AppTabNavigation.swift
View File

@ -4,11 +4,8 @@ import SwiftUI
struct AppTabNavigation: View {
@EnvironmentObject<NavigationState> private var navigationState
@EnvironmentObject<SearchState> private var searchState
@EnvironmentObject<Recents> private var recents
@State private var searchQuery = ""
var body: some View {
TabView(selection: $navigationState.tabSelection) {
NavigationView {
@ -60,20 +57,22 @@ struct AppTabNavigation: View {
NavigationView {
SearchView()
.searchable(text: $searchQuery, placement: .navigationBarDrawer(displayMode: .always)) {
.searchable(text: $searchState.queryText, placement: .navigationBarDrawer(displayMode: .always)) {
ForEach(searchState.querySuggestions.collection, id: \.self) { suggestion in
Text(suggestion)
.searchCompletion(suggestion)
}
}
.onChange(of: searchQuery) { query in
.onChange(of: searchState.queryText) { query in
searchState.loadQuerySuggestions(query)
}
.onSubmit(of: .search) {
searchState.changeQuery { query in
query.query = self.searchQuery
query.query = searchState.queryText
}
recents.open(RecentItem(from: searchState.queryText))
navigationState.tabSelection = .search
}
}
@ -83,6 +82,7 @@ struct AppTabNavigation: View {
}
.tag(TabSelection.search)
}
.environment(\.navigationStyle, .tab)
.sheet(isPresented: $navigationState.isChannelOpen, onDismiss: {
if let channel = recents.presentedChannel {
let recent = RecentItem(from: channel)

91
Shared/Views/SearchView.swift
View File

@ -7,8 +7,14 @@ struct SearchView: View {
@Default(.searchDate) private var searchDate
@Default(.searchDuration) private var searchDuration
@EnvironmentObject<Recents> private var recents
@EnvironmentObject<SearchState> private var state
@Environment(\.navigationStyle) private var navigationStyle
@State private var presentingClearConfirmation = false
@State private var recentsChanged = false
private var query: SearchQuery?
init(_ query: SearchQuery? = nil) {
@ -16,23 +22,34 @@ struct SearchView: View {
}
var body: some View {
VStack {
VideosView(videos: state.store.collection)
if state.store.collection.isEmpty && !state.isLoading && !state.query.isEmpty {
Text("No results")
if searchFiltersActive {
Button("Reset search filters") {
Defaults.reset(.searchDate, .searchDuration)
Group {
if navigationStyle == .tab && state.queryText.isEmpty {
VStack {
if !recentItems.isEmpty {
recentQueries
}
}
} else {
VideosView(videos: state.store.collection)
Spacer()
if state.store.collection.isEmpty && !state.isLoading && !state.query.isEmpty {
Text("No results")
if searchFiltersActive {
Button("Reset search filters") {
Defaults.reset(.searchDate, .searchDuration)
}
}
Spacer()
}
}
}
.onAppear {
if query != nil {
if navigationStyle == .tab {
state.queryText = query!.query
}
state.resetQuery(query!)
}
}
@ -53,11 +70,63 @@ struct SearchView: View {
#endif
}
var recentQueries: some View {
List {
Section(header: Text("Recents")) {
ForEach(recentItems) { item in
Button(item.title) {
state.queryText = item.title
state.changeQuery { query in query.query = item.title }
}
#if os(iOS)
.swipeActions(edge: .trailing) {
clearButton(item)
}
#endif
}
}
.opacity(recentsChanged ? 1 : 1)
clearAllButton
}
#if os(iOS)
.listStyle(.insetGrouped)
#endif
}
func clearButton(_ item: RecentItem) -> some View {
Button(role: .destructive) {
recents.close(item)
recentsChanged.toggle()
} label: {
Label("Delete", systemImage: "trash")
}
}
var clearAllButton: some View {
Button("Clear All", role: .destructive) {
presentingClearConfirmation = true
}
.confirmationDialog("Clear All", isPresented: $presentingClearConfirmation) {
Button("Clear All", role: .destructive) {
recents.clearQueries()
}
}
}
var navigationTitle: String {
state.query.query.isEmpty ? "Search" : "Search: \"\(state.query.query)\""
if state.query.query.isEmpty || (navigationStyle == .tab && state.queryText.isEmpty) {
return "Search"
}
return "Search: \"\(state.query.query)\""
}
var searchFiltersActive: Bool {
searchDate != nil || searchDuration != nil
}
var recentItems: [RecentItem] {
Defaults[.recentlyOpened].filter { $0.type == .query }.reversed()
}
}

7
tvOS/TVNavigationView.swift
View File

@ -34,14 +34,15 @@ struct TVNavigationView: View {
.tag(TabSelection.playlists)
SearchView()
.searchable(text: $searchState.query.query) {
.searchable(text: $searchState.queryText) {
ForEach(searchState.querySuggestions.collection, id: \.self) { suggestion in
Text(suggestion)
.searchCompletion(suggestion)
}
}
.onChange(of: searchState.query.query) { query in
searchState.loadQuerySuggestions(query)
.onChange(of: searchState.queryText) { newQuery in
searchState.loadQuerySuggestions(newQuery)
searchState.changeQuery { query in query.query = newQuery }
}
.tabItem { Image(systemName: "magnifyingglass") }
.tag(TabSelection.search)