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

Fix picker bug and refactored

Browse Source
This commit is contained in:
OlegAba
2023-01-07 13:03:05 -05:00
committed by William Casarin
parent 421245a2f8
commit 08dd2d5414
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
damus/ContentView.swift
View File

@@ -45,10 +45,10 @@ enum FilterState : Int {
case posts_and_replies = 1 case posts_and_replies = 1
case posts = 0 case posts = 0
func filter(privkey: String?, ev: NostrEvent) -> Bool { func filter(ev: NostrEvent) -> Bool {
switch self { switch self {
case .posts: case .posts:
return !ev.is_reply(privkey) return !ev.is_reply(nil)
case .posts_and_replies: case .posts_and_replies:
return true return true
} }
@@ -93,10 +93,12 @@ struct ContentView: View {
var PostingTimelineView: some View { var PostingTimelineView: some View {
VStack { VStack {
TabView(selection: $filter_state) { TabView(selection: $filter_state) {
contentTimelineView(filter: posts_filter_event) contentTimelineView(filter: FilterState.posts.filter)
.tag(FilterState.posts) .tag(FilterState.posts)
contentTimelineView(filter: posts_and_replies_filter_event) .id(FilterState.posts)
contentTimelineView(filter: FilterState.posts_and_replies.filter)
.tag(FilterState.posts_and_replies) .tag(FilterState.posts_and_replies)
.id(FilterState.posts_and_replies)
} }
.tabViewStyle(.page(indexDisplayMode: .never)) .tabViewStyle(.page(indexDisplayMode: .never))
} }
@@ -126,14 +128,6 @@ 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 { var FiltersView: some View {
VStack{ VStack{
Picker("Filter State", selection: $filter_state) { Picker("Filter State", selection: $filter_state) {