Add load more content button to the top bar

Signed-off-by: Daniel D’Aquino <daniel@daquino.me>

damus/ContentView.swift

@@ -174,7 +174,7 @@ struct ContentView: View {
                 }
                 
             case .home:
-                PostingTimelineView(damus_state: damus_state!, home: home, isSideBarOpened: $isSideBarOpened, active_sheet: $active_sheet, headerOffset: $headerOffset)
+                PostingTimelineView(damus_state: damus_state!, home: home, homeEvents: home.events, isSideBarOpened: $isSideBarOpened, active_sheet: $active_sheet, headerOffset: $headerOffset)
                 
             case .notifications:
                 NotificationsView(state: damus, notifications: home.notifications, subtitle: $menu_subtitle)

damus/Features/Timeline/Views/InnerTimelineView.swift

@@ -29,26 +29,6 @@ struct InnerTimelineView: View {
     
     var body: some View {
         LazyVStack(spacing: 0) {
-            let incomingEvents = events.incoming.filter({ filter($0) })
-            if incomingEvents.count > 0 {
-                Button(
-                    action: {
-                        notify(.scroll_to_top)
-                    },
-                    label: {
-                        HStack(spacing: 6) {
-                            CondensedProfilePicturesView(state: state, pubkeys: incomingEvents.map({ $0.pubkey }), maxPictures: 3)
-                            Text("Load new content", comment: "Button to load new notes in the timeline")
-                                .bold()
-                        }
-                        .padding(.horizontal, 20)
-                        .padding(.vertical, 10)
-                    }
-                )
-                .buttonStyle(NeutralButtonStyle(cornerRadius: 50))
-                .padding(.vertical, 10)
-            }
-            
             let events = self.events.events
             if events.isEmpty {
                 EmptyTimelineView()

damus/Features/Timeline/Views/PostingTimelineView.swift

@@ -11,6 +11,8 @@ struct PostingTimelineView: View {
     
     let damus_state: DamusState
     @ObservedObject var home: HomeModel
+    /// Set this to `home.events`. This is separate from `home` because we need the events object to be directly observed so that we get instant view updates
+    @ObservedObject var homeEvents: EventHolder
     @State var search: String = ""
     @State var results: [NostrEvent] = []
     @State var initialOffset: CGFloat?
@@ -44,7 +46,8 @@ struct PostingTimelineView: View {
         TimelineView<AnyView>(events: home.events, loading: self.loading, headerHeight: $headerHeight, headerOffset: $headerOffset, damus: damus_state, show_friend_icon: false, filter: filter)
     }
     
-    func HeaderView()->some View {
+    func HeaderView() -> some View {
+        VStack {
             VStack {
                 VStack(spacing: 0) {
                     // This is needed for the Dynamic Island
@@ -92,6 +95,27 @@ struct PostingTimelineView: View {
                 DamusColors.adaptableWhite
                     .ignoresSafeArea()
             }
+            
+            if homeEvents.incoming.count > 0 {
+                Button(
+                    action: {
+                        notify(.scroll_to_top)
+                    },
+                    label: {
+                        HStack(spacing: 6) {
+                            CondensedProfilePicturesView(state: damus_state, pubkeys: homeEvents.incoming.map({ $0.pubkey }), maxPictures: 3)
+                                .scaleEffect(0.75)
+                            Text("Load new content", comment: "Button to load new notes in the timeline")
+                                .bold()
+                        }
+                        .padding(.horizontal, 10)
+                        .padding(.vertical, 5)
+                    }
+                )
+                .buttonStyle(NeutralButtonStyle(cornerRadius: 50))
+                .padding(.vertical, 10)
+            }
+        }
     }
 
     var body: some View {