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

Changed opacity to Damus on-brand grey. Removed unnecessary code.

Browse Source
This commit is contained in:
Ben Weeks
2023-01-08 00:20:43 +00:00
parent 4378397c4c
commit 9b236f9583
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
damus/ContentView.swift
View File

@@ -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 {

14
damus/Views/SideMenuView.swift
View File

@@ -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