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

Remove load more popup

Browse Source
This commit is contained in:
William Casarin
2023-02-20 13:48:36 -08:00
parent 19a421604c
commit 8954c1c245
1 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
damus/Views/TimelineView.swift
View File

@@ -41,42 +41,34 @@ struct TimelineView: View {
var MainContent: some View { var MainContent: some View {
ScrollViewReader { scroller in ScrollViewReader { scroller in
ZStack { ScrollView {
VStack { InnerTimelineView(events: events, damus: damus, show_friend_icon: show_friend_icon, filter: loading ? { _ in true } : filter)
LoadMoreButton(events: events, scroller: scroller) .redacted(reason: loading ? .placeholder : [])
.padding([.top], 10) .shimmer(loading)
Spacer() .disabled(loading)
} .background(GeometryReader { proxy -> Color in
.zIndex(10.0) DispatchQueue.main.async {
handle_scroll(proxy)
ScrollView { }
InnerTimelineView(events: events, damus: damus, show_friend_icon: show_friend_icon, filter: loading ? { _ in true } : filter) return Color.clear
.redacted(reason: loading ? .placeholder : []) })
.shimmer(loading) }
.disabled(loading) .overlay(
.background(GeometryReader { proxy -> Color in Rectangle()
DispatchQueue.main.async { .fill(RECTANGLE_GRADIENT.opacity(realtime_bar_opacity))
handle_scroll(proxy) .offset(y: -1)
} .frame(height: events.should_queue ? 0 : 8)
return Color.clear ,
}) alignment: .top
} )
.overlay( .buttonStyle(BorderlessButtonStyle())
Rectangle() .coordinateSpace(name: "scroll")
.fill(RECTANGLE_GRADIENT.opacity(realtime_bar_opacity)) .onReceive(NotificationCenter.default.publisher(for: .scroll_to_top)) { _ in
.offset(y: -1) guard let event = events.events.filter(self.filter).first else {
.frame(height: events.should_queue ? 0 : 8) return
,
alignment: .top
)
.buttonStyle(BorderlessButtonStyle())
.coordinateSpace(name: "scroll")
.onReceive(NotificationCenter.default.publisher(for: .scroll_to_top)) { _ in
guard let event = events.events.filter(self.filter).first else {
return
}
scroll_to_event(scroller: scroller, id: event.id, delay: 0.0, animate: true, anchor: .top)
} }
events.flush()
scroll_to_event(scroller: scroller, id: event.id, delay: 0.0, animate: true, anchor: .top)
} }
} }
} }