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

views: allow embeddable views at top of timeline

Browse Source 
This allows you to put stuff at the top of a timeline inside the scroll
view. We could also remove the scrollview from the timeline
eventually... but this works for now.
This commit is contained in:
William Casarin
2023-07-13 06:50:21 -07:00
parent 7123b225a1
commit c0f9b0a8c0
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/ContentView.swift
View File

@@ -142,7 +142,7 @@ struct ContentView: View {
func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View { func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
ZStack { ZStack {
if let damus = self.damus_state { if let damus = self.damus_state {
TimelineView(events: home.events, loading: .constant(false), damus: damus, show_friend_icon: false, filter: filter) TimelineView<AnyView>(events: home.events, loading: .constant(false), damus: damus, show_friend_icon: false, filter: filter)
} }
} }
} }

2
damus/Views/SearchHomeView.swift
View File

@@ -44,7 +44,7 @@ struct SearchHomeView: View {
} }
var GlobalContent: some View { var GlobalContent: some View {
return TimelineView( return TimelineView<AnyView>(
events: model.events, events: model.events,
loading: $model.loading, loading: $model.loading,
damus: damus_state, damus: damus_state,

2
damus/Views/SearchView.swift
View File

@@ -13,7 +13,7 @@ struct SearchView: View {
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
var body: some View { var body: some View {
TimelineView(events: search.events, loading: $search.loading, damus: appstate, show_friend_icon: true, filter: { _ in true }) TimelineView<AnyView>(events: search.events, loading: $search.loading, damus: appstate, show_friend_icon: true, filter: { _ in true })
.navigationBarTitle(describe_search(search.search)) .navigationBarTitle(describe_search(search.search))
.onReceive(handle_notify(.switched_timeline)) { obj in .onReceive(handle_notify(.switched_timeline)) { obj in
dismiss() dismiss()

22
damus/Views/TimelineView.swift
View File

@@ -7,14 +7,24 @@
import SwiftUI import SwiftUI
struct TimelineView: View { struct TimelineView<Content: View>: View {
@ObservedObject var events: EventHolder @ObservedObject var events: EventHolder
@Binding var loading: Bool @Binding var loading: Bool
let damus: DamusState let damus: DamusState
let show_friend_icon: Bool let show_friend_icon: Bool
let filter: (NostrEvent) -> Bool let filter: (NostrEvent) -> Bool
let content: Content?
init(events: EventHolder, loading: Binding<Bool>, damus: DamusState, show_friend_icon: Bool, filter: @escaping (NostrEvent) -> Bool, content: (() -> Content)? = nil) {
self.events = events
self._loading = loading
self.damus = damus
self.show_friend_icon = show_friend_icon
self.filter = filter
self.content = content?()
}
var body: some View { var body: some View {
MainContent MainContent
} }
@@ -22,10 +32,14 @@ struct TimelineView: View {
var MainContent: some View { var MainContent: some View {
ScrollViewReader { scroller in ScrollViewReader { scroller in
ScrollView { ScrollView {
if let content {
content
}
Color.white.opacity(0) Color.white.opacity(0)
.id("startblock") .id("startblock")
.frame(height: 1) .frame(height: 1)
InnerTimelineView(events: events, damus: damus, filter: loading ? { _ in true } : filter) InnerTimelineView(events: events, damus: damus, filter: loading ? { _ in true } : filter)
.redacted(reason: loading ? .placeholder : []) .redacted(reason: loading ? .placeholder : [])
.shimmer(loading) .shimmer(loading)
@@ -52,7 +66,7 @@ struct TimelineView: View {
struct TimelineView_Previews: PreviewProvider { struct TimelineView_Previews: PreviewProvider {
@StateObject static var events = test_event_holder @StateObject static var events = test_event_holder
static var previews: some View { static var previews: some View {
TimelineView(events: events, loading: .constant(true), damus: Constants.EXAMPLE_DEMOS, show_friend_icon: true, filter: { _ in true }) TimelineView<AnyView>(events: events, loading: .constant(true), damus: Constants.EXAMPLE_DEMOS, show_friend_icon: true, filter: { _ in true })
} }
} }