tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'damus-io:master' into sidebar

Browse Source
This commit is contained in:
Ben Weeks
2023-01-06 23:06:44 +00:00
committed by GitHub
parent fba29d4454 ec4790a8fe
commit d9b60c0052
11 changed files with 175 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
damus/ContentView.swift
View File

@@ -94,9 +94,9 @@ struct ContentView: View {
var PostingTimelineView: some View {
VStack {
TabView(selection: $filter_state) {
ContentTimelineView
contentTimelineView(filter: posts_filter_event)
.tag(FilterState.posts)
ContentTimelineView
contentTimelineView(filter: posts_and_replies_filter_event)
.tag(FilterState.posts_and_replies)
}
.tabViewStyle(.page(indexDisplayMode: .never))
@@ -114,10 +114,10 @@ struct ContentView: View {
.ignoresSafeArea(.keyboard)
}
var ContentTimelineView: some View {
func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
ZStack {
if let damus = self.damus_state {
TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter_event)
TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
}
if privkey != nil {
PostButtonContainer {
@@ -127,6 +127,14 @@ struct ContentView: View {
}
}
func posts_and_replies_filter_event(_ ev: NostrEvent) -> Bool {
return true
}
func posts_filter_event(_ ev: NostrEvent) -> Bool {
return !ev.is_reply(nil)
}
var FiltersView: some View {
VStack{
Picker("Filter State", selection: $filter_state) {
@@ -137,14 +145,6 @@ struct ContentView: View {
}
}
func filter_event(_ ev: NostrEvent) -> Bool {
if self.filter_state == .posts {
return !ev.is_reply(nil)
}
return true
}
func MainContent(damus: DamusState) -> some View {
VStack {
NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {