mirror of
git://jb55.com/damus
synced 2024-09-19 11:43:44 +00:00
moving loading spinner to zstack topright
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
parent
8568d4abc7
commit
fd57ca0012
@ -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…
Reference in New Issue
Block a user