Browse Source

moving loading spinner to zstack topright

Signed-off-by: William Casarin <jb55@jb55.com>
profiles-everywhere
William Casarin 3 years ago
parent
commit
fd57ca0012
  1. 57
      damus/ContentView.swift

57
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

Loading…
Cancel
Save