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

Fixed overlay issue (now has faded background)

Browse Source
This commit is contained in:
Ben Weeks
2023-01-07 23:29:22 +00:00
parent 8161d55d05
commit 3bf39dc04b
2 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
damus/ContentView.swift
View File

@@ -205,50 +205,33 @@ struct ContentView: View {
} }
var body: some View { var body: some View {
ZStack { VStack(alignment: .leading, spacing: 0) {
if let damus = self.damus_state { if let damus = self.damus_state {
NavigationView {
VStack(alignment: .leading, spacing: 0) { ZStack {
NavigationView { MainContent(damus: damus)
.toolbar() {
SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
VStack(alignment: .leading, spacing: 0) {
MainContent(damus: damus)
.toolbar {
ToolbarItem(placement: .navigationBarLeading) { ToolbarItem(placement: .navigationBarLeading) {
let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model)
Button {
isSideBarOpened.toggle()
} 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)
let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model) let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model)
if let picture = damus_state?.profiles.lookup(id: pubkey)?.picture { Button {
ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, picture: picture) isSideBarOpened.toggle()
} else { } label: {
Image(systemName: "person.fill") let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model)
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)
} else {
Image(systemName: "person.fill")
}
} }
} }
NavigationLink(destination: prof_dest) {
/// Verify that the user has a profile picture, if not display a generic SF Symbol
/// (Resolves an in-app error where ``Robohash`` pictures are not generated so the button dissapears
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)
} else {
Image(systemName: "person.fill")
}
}
.buttonStyle(PlainButtonStyle())
}
ToolbarItem(placement: .navigationBarTrailing) { ToolbarItem(placement: .navigationBarTrailing) {
HStack(alignment: .center) { HStack(alignment: .center) {
if home.signal.signal != home.signal.max_signal { if home.signal.signal != home.signal.max_signal {
@@ -265,13 +248,19 @@ struct ContentView: View {
*/ */
} }
} }
} }
}
}.navigationViewStyle(.stack)
TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline) Color.clear
.padding([.bottom], 8) .overlay(
SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
)
}
.navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
} }
.navigationViewStyle(.stack)
TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
.padding([.bottom], 8)
} }
} }
.onAppear() { .onAppear() {
@@ -403,9 +392,6 @@ struct ContentView: View {
.onReceive(timer) { n in .onReceive(timer) { n in
self.damus_state?.pool.connect_to_disconnected() self.damus_state?.pool.connect_to_disconnected()
} }
} }
func switch_timeline(_ timeline: Timeline) { func switch_timeline(_ timeline: Timeline) {

2
damus/Views/SideMenuView.swift
View File

@@ -84,11 +84,13 @@ struct SideMenuView: View {
.foregroundColor(textColor()) .foregroundColor(textColor())
} }
/*
NavigationLink(destination: EmptyView()) { NavigationLink(destination: EmptyView()) {
Label("Relays", systemImage: "xserve") Label("Relays", systemImage: "xserve")
.font(.title2) .font(.title2)
.foregroundColor(textColor()) .foregroundColor(textColor())
} }
*/
NavigationLink(destination: ConfigView(state: damus_state).environmentObject(user_settings)) { NavigationLink(destination: ConfigView(state: damus_state).environmentObject(user_settings)) {
Label("App settings", systemImage: "gear") Label("App settings", systemImage: "gear")