damus

nostr ios client
git clone git://jb55.com/damus
Log | Files | Refs | README | LICENSE

commit d55a47a6a8f667adc3df5cbd500d3fd7525f9a0d
parent e64ccb96b3ad2172aa07bdcf2d165983074ac174
Author: William Casarin <jb55@jb55.com>
Date:   Fri, 23 Dec 2022 17:02:02 -0800

Revert "ContentTimelineView inside a page tabView"

Noticed this was crashing

This reverts commit 85ba7bbed0fceabfdd20ee55b88dd7593cb7d5f7.

Diffstat:
Mdamus/ContentView.swift | 30++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/damus/ContentView.swift b/damus/ContentView.swift @@ -78,14 +78,17 @@ struct ContentView: View { @Environment(\.colorScheme) var colorScheme var PostingTimelineView: some View { - VStack { - TabView(selection: $filter_state) { - ContentTimelineView - .tag(FilterState.posts) - ContentTimelineView - .tag(FilterState.posts_and_replies) + VStack{ + ZStack { + if let damus = self.damus_state { + TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter_event) + } + if privkey != nil { + PostButtonContainer { + self.active_sheet = .post + } + } } - .tabViewStyle(.page(indexDisplayMode: .never)) } .safeAreaInset(edge: .top) { VStack(spacing: 0) { @@ -99,19 +102,6 @@ struct ContentView: View { } } - var ContentTimelineView: 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) - } - if privkey != nil { - PostButtonContainer { - self.active_sheet = .post - } - } - } - } - var FiltersView: some View { VStack{ Picker("Filter State", selection: $filter_state) {