diff --git a/damus/ContentView.swift b/damus/ContentView.swift index 9aaaf0b8..2267656c 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -212,7 +212,6 @@ struct ContentView: View { MainContent(damus: damus) .toolbar() { 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) Button { diff --git a/damus/Views/SideMenuView.swift b/damus/Views/SideMenuView.swift index 5df84e9f..a3215bcc 100644 --- a/damus/Views/SideMenuView.swift +++ b/damus/Views/SideMenuView.swift @@ -31,7 +31,7 @@ struct SideMenuView: View { GeometryReader { _ in EmptyView() } - .background(.gray.opacity(0.6)) + .background(Color("DamusDarkGrey").opacity(0.6)) .opacity(isSidebarVisible ? 1 : 0) .animation(.easeInOut.delay(0.2), value: isSidebarVisible) .onTapGesture { @@ -82,6 +82,9 @@ struct SideMenuView: View { .font(.title2) .foregroundColor(textColor()) } + .simultaneousGesture(TapGesture().onEnded { + isSidebarVisible = false + }) /* NavigationLink(destination: EmptyView()) { @@ -89,6 +92,9 @@ struct SideMenuView: View { .font(.title2) .foregroundColor(textColor()) } + .simultaneousGesture(TapGesture().onEnded { + isSidebarVisible.toggle() + }) */ NavigationLink(destination: ConfigView(state: damus_state).environmentObject(user_settings)) { @@ -96,6 +102,9 @@ struct SideMenuView: View { .font(.title2) .foregroundColor(textColor()) } + .simultaneousGesture(TapGesture().onEnded { + isSidebarVisible = false + }) Spacer() @@ -115,6 +124,9 @@ struct SideMenuView: View { .frame(width: sideBarWidth) .offset(x: isSidebarVisible ? 0 : -sideBarWidth) .animation(.default, value: isSidebarVisible) + .onTapGesture { + isSidebarVisible.toggle() + } .alert("Logout", isPresented: $confirm_logout) { Button("Cancel") { confirm_logout = false