Changed opacity to Damus on-brand grey. Removed unnecessary code.
This commit is contained in:
@@ -212,7 +212,6 @@ struct ContentView: View {
|
|||||||
MainContent(damus: damus)
|
MainContent(damus: damus)
|
||||||
.toolbar() {
|
.toolbar() {
|
||||||
ToolbarItem(placement: .navigationBarLeading) {
|
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 {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ struct SideMenuView: View {
|
|||||||
GeometryReader { _ in
|
GeometryReader { _ in
|
||||||
EmptyView()
|
EmptyView()
|
||||||
}
|
}
|
||||||
.background(.gray.opacity(0.6))
|
.background(Color("DamusDarkGrey").opacity(0.6))
|
||||||
.opacity(isSidebarVisible ? 1 : 0)
|
.opacity(isSidebarVisible ? 1 : 0)
|
||||||
.animation(.easeInOut.delay(0.2), value: isSidebarVisible)
|
.animation(.easeInOut.delay(0.2), value: isSidebarVisible)
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
@@ -82,6 +82,9 @@ struct SideMenuView: View {
|
|||||||
.font(.title2)
|
.font(.title2)
|
||||||
.foregroundColor(textColor())
|
.foregroundColor(textColor())
|
||||||
}
|
}
|
||||||
|
.simultaneousGesture(TapGesture().onEnded {
|
||||||
|
isSidebarVisible = false
|
||||||
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
NavigationLink(destination: EmptyView()) {
|
NavigationLink(destination: EmptyView()) {
|
||||||
@@ -89,6 +92,9 @@ struct SideMenuView: View {
|
|||||||
.font(.title2)
|
.font(.title2)
|
||||||
.foregroundColor(textColor())
|
.foregroundColor(textColor())
|
||||||
}
|
}
|
||||||
|
.simultaneousGesture(TapGesture().onEnded {
|
||||||
|
isSidebarVisible.toggle()
|
||||||
|
})
|
||||||
*/
|
*/
|
||||||
|
|
||||||
NavigationLink(destination: ConfigView(state: damus_state).environmentObject(user_settings)) {
|
NavigationLink(destination: ConfigView(state: damus_state).environmentObject(user_settings)) {
|
||||||
@@ -96,6 +102,9 @@ struct SideMenuView: View {
|
|||||||
.font(.title2)
|
.font(.title2)
|
||||||
.foregroundColor(textColor())
|
.foregroundColor(textColor())
|
||||||
}
|
}
|
||||||
|
.simultaneousGesture(TapGesture().onEnded {
|
||||||
|
isSidebarVisible = false
|
||||||
|
})
|
||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
@@ -115,6 +124,9 @@ struct SideMenuView: View {
|
|||||||
.frame(width: sideBarWidth)
|
.frame(width: sideBarWidth)
|
||||||
.offset(x: isSidebarVisible ? 0 : -sideBarWidth)
|
.offset(x: isSidebarVisible ? 0 : -sideBarWidth)
|
||||||
.animation(.default, value: isSidebarVisible)
|
.animation(.default, value: isSidebarVisible)
|
||||||
|
.onTapGesture {
|
||||||
|
isSidebarVisible.toggle()
|
||||||
|
}
|
||||||
.alert("Logout", isPresented: $confirm_logout) {
|
.alert("Logout", isPresented: $confirm_logout) {
|
||||||
Button("Cancel") {
|
Button("Cancel") {
|
||||||
confirm_logout = false
|
confirm_logout = false
|
||||||
|
|||||||
Reference in New Issue
Block a user