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

Moved the sidebar to above the tab buttons.

Browse Source
This commit is contained in:
Ben Weeks
2023-01-08 00:26:35 +00:00
parent 9b236f9583
commit 38211a74f5
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
damus/ContentView.swift
View File

@@ -209,9 +209,10 @@ struct ContentView: View {
if let damus = self.damus_state { if let damus = self.damus_state {
NavigationView { NavigationView {
ZStack { ZStack {
MainContent(damus: damus) VStack {
.toolbar() { MainContent(damus: damus)
ToolbarItem(placement: .navigationBarLeading) { .toolbar() {
ToolbarItem(placement: .navigationBarLeading) {
let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!) let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey) let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
Button { Button {
@@ -219,7 +220,7 @@ struct ContentView: View {
} label: { } label: {
let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!) let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey) let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
if let picture = damus_state?.profiles.lookup(id: pubkey)?.picture { if let picture = damus_state?.profiles.lookup(id: pubkey)?.picture {
ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, picture: picture) ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, picture: picture)
} else { } else {
@@ -227,7 +228,12 @@ struct ContentView: View {
} }
} }
} }
} }
TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
.padding([.bottom], 8)
}
Color.clear Color.clear
.overlay( .overlay(
@@ -238,8 +244,7 @@ struct ContentView: View {
} }
.navigationViewStyle(.stack) .navigationViewStyle(.stack)
TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
.padding([.bottom], 8)
} }
} }
.onAppear() { .onAppear() {