damus

commit fd57ca001280c9107b8a58f283474ebb9f927cc8
parent 8568d4abc7cd95b432b511f5a8786341b44a713a
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 19 Apr 2022 09:36:50 -0700

moving loading spinner to zstack topright

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
damus/ContentView.swift
 | 
59
++++++++++++++++++++++++++++++++++++-----------------------

1 file changed, 36 insertions(+), 23 deletions(-)
diff --git a/damus/ContentView.swift b/damus/ContentView.swift
@@ -94,8 +94,24 @@ struct ContentView: View {
         }
     }
 
+    var LoadingContainer: some View {
+        VStack {
+            HStack {
+                Spacer()
+        
+                if self.loading {
+                    ProgressView()
+                        .progressViewStyle(.circular)
+                }
+            }
+
+            Spacer()
+        }
+    }
+
     var PostButtonContainer: some View {
         VStack {
+            
             Spacer()
 
             HStack {
@@ -120,32 +136,29 @@ struct ContentView: View {
     var body: some View {
         VStack {
             if let pool = self.pool {
-                NavigationView {
-                    VStack {
-                        if self.loading {
-                            ProgressView()
-                                .progressViewStyle(.circular)
-                                .padding([.bottom], 4)
-                        }
-                        
-                        PostingTimelineView
-                            .onAppear() {
-                                switch_timeline(.home)
-                            }
-                        
-                        let tlv = TimelineView(events: $notifications, pool: pool)
-                            .environmentObject(profiles)
-                            .navigationTitle("Notifications")
-                            .navigationBarBackButtonHidden(true)
-                        
-                        NavigationLink(destination: tlv, isActive: $notifications_active) {
-                            EmptyView()
+                ZStack {
+                    NavigationView {
+                        VStack {
+                            PostingTimelineView
+                                .onAppear() {
+                                    switch_timeline(.home)
+                                }
+                            
+                                let tlv = TimelineView(events: $notifications, pool: pool)
+                                    .environmentObject(profiles)
+                                    .navigationTitle("Notifications")
+                                    .navigationBarBackButtonHidden(true)
+                            
+                                NavigationLink(destination: tlv, isActive: $notifications_active) {
+                                    EmptyView()
+                                }
                         }
+                        .navigationBarTitle("Damus", displayMode: .inline)
                     }
-                    .navigationBarTitle("Damus", displayMode: .inline)
-                    
+                    .padding([.bottom], -8.0)
+
+                    LoadingContainer
                 }
-                .padding([.bottom], -8.0)
             }
             
             TabBar