commit 9ab03034a2ffc6abfd454f165598d768a3e99db6
parent c602c754f8386287ba7d4c86ff55e249c73d4fa4
Author: OlegAba <mail@olegaba.com>
Date: Sun, 5 Feb 2023 14:23:31 -0500
Refactor side menu
Changelog-Fixed: Fix sidebar navigation bugs
Closes: #460
Diffstat:
2 files changed, 111 insertions(+), 115 deletions(-)
diff --git a/damus/ContentView.swift b/damus/ContentView.swift
@@ -7,7 +7,6 @@
import SwiftUI
import Starscream
-import Kingfisher
var BOOTSTRAP_RELAYS = [
"wss://relay.damus.io",
@@ -143,6 +142,29 @@ struct ContentView: View {
thread_open = false
search_open = false
}
+
+ var timelineNavItem: some View {
+ VStack {
+ switch selected_timeline {
+ case .home:
+ Image("damus-home")
+ .resizable()
+ .frame(width:30,height:30)
+ .shadow(color: Color("DamusPurple"), radius: 2)
+ case .dms:
+ Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
+ .bold()
+ case .notifications:
+ Text("Notifications", comment: "Toolbar label for Notifications view.")
+ .bold()
+ case .search:
+ Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
+ .bold()
+ case .none:
+ Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
+ }
+ }
+ }
func MainContent(damus: DamusState) -> some View {
VStack {
@@ -163,9 +185,10 @@ struct ContentView: View {
PostingTimelineView
case .notifications:
- TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
- .navigationTitle(NSLocalizedString("Notifications", comment: "Navigation title for notifications."))
-
+ VStack(spacing: 0) {
+ Divider()
+ TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
+ }
case .dms:
DirectMessagesView(damus_state: damus_state!)
.environmentObject(home.dms)
@@ -177,24 +200,9 @@ struct ContentView: View {
.navigationBarTitle(selected_timeline == .home ? NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Global", comment: "Navigation bar title for Global view where posts from all connected relay servers appear."), displayMode: .inline)
.toolbar {
ToolbarItem(placement: .principal) {
- switch selected_timeline {
- case .home:
- Image("damus-home")
- .resizable()
- .frame(width:30,height:30)
- .shadow(color: Color("DamusPurple"), radius: 2)
- case .dms:
- Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
- .bold()
- case .notifications:
- Text("Notifications", comment: "Toolbar label for Notifications view.")
- .bold()
- case .search:
- Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
- .bold()
- case .none:
- Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
- }
+ timelineNavItem
+ .opacity(isSideBarOpened ? 0 : 1)
+ .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
}
}
.ignoresSafeArea(.keyboard)
@@ -251,7 +259,7 @@ struct ContentView: View {
if let damus = self.damus_state {
NavigationView {
ZStack {
- VStack {
+ TabView { // Prevents navbar appearance change on scroll
MainContent(damus: damus)
.toolbar() {
ToolbarItem(placement: .navigationBarLeading) {
@@ -259,7 +267,10 @@ struct ContentView: View {
isSideBarOpened.toggle()
} label: {
ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
+ .opacity(isSideBarOpened ? 0 : 1)
+ .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
}
+ .disabled(isSideBarOpened)
}
ToolbarItem(placement: .navigationBarTrailing) {
@@ -275,15 +286,12 @@ struct ContentView: View {
}
}
}
-
}
-
- Color.clear
- .overlay(
- SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
- )
+ .tabViewStyle(.page(indexDisplayMode: .never))
}
- .navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
+ .overlay(
+ SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
+ )
}
.navigationViewStyle(.stack)
@@ -293,7 +301,6 @@ struct ContentView: View {
}
.onAppear() {
self.connect()
- //KingfisherManager.shared.cache.clearDiskCache()
setup_notifications()
}
.sheet(item: $active_sheet) { item in
diff --git a/damus/Views/SideMenuView.swift b/damus/Views/SideMenuView.swift
@@ -17,6 +17,7 @@ struct SideMenuView: View {
@Environment(\.colorScheme) var colorScheme
var sideBarWidth = min(UIScreen.main.bounds.size.width * 0.65, 400.0)
+ let verticalSpacing: CGFloat = 20
func fillColor() -> Color {
colorScheme == .light ? Color("DamusWhite") : Color("DamusBlack")
@@ -33,104 +34,86 @@ struct SideMenuView: View {
}
.background(Color("DamusDarkGrey").opacity(0.6))
.opacity(isSidebarVisible ? 1 : 0)
- .animation(.easeInOut.delay(0.2), value: isSidebarVisible)
+ .animation(.default, value: isSidebarVisible)
.onTapGesture {
isSidebarVisible.toggle()
}
content
}
- .edgesIgnoringSafeArea(.all)
-
}
var content: some View {
HStack(alignment: .top) {
ZStack(alignment: .top) {
fillColor()
-
- VStack(alignment: .leading, spacing: 20) {
- let profile = damus_state.profiles.lookup(id: damus_state.pubkey)
- let followers = FollowersModel(damus_state: damus_state, target: damus_state.pubkey)
- let profile_model = ProfileModel(pubkey: damus_state.pubkey, damus: damus_state)
+ .ignoresSafeArea()
+
+ VStack(alignment: .leading, spacing: 0) {
- NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
- if let picture = damus_state.profiles.lookup(id: damus_state.pubkey)?.picture {
- ProfilePicView(pubkey: damus_state.pubkey, size: 60, highlight: .none, profiles: damus_state.profiles, picture: picture)
- } else {
- Image(systemName: "person.fill")
- }
- VStack(alignment: .leading) {
- if let display_name = profile?.display_name {
- Text(display_name)
- .foregroundColor(textColor())
- .font(.title)
+ VStack(alignment: .leading, spacing: 0) {
+ let profile = damus_state.profiles.lookup(id: damus_state.pubkey)
+ let followers = FollowersModel(damus_state: damus_state, target: damus_state.pubkey)
+ let profile_model = ProfileModel(pubkey: damus_state.pubkey, damus: damus_state)
+
+ NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
+
+ HStack {
+ ProfilePicView(pubkey: damus_state.pubkey, size: 60, highlight: .none, profiles: damus_state.profiles)
+
+ VStack(alignment: .leading) {
+ if let display_name = profile?.display_name {
+ Text(display_name)
+ .foregroundColor(textColor())
+ .font(.title)
+ .lineLimit(1)
+ }
+ if let name = profile?.name {
+ Text("@" + name)
+ .foregroundColor(Color("DamusMediumGrey"))
+ .font(.body)
+ .lineLimit(1)
+ }
+ }
}
- if let name = profile?.name {
- Text("@" + name)
- .foregroundColor(Color("DamusMediumGrey"))
- .font(.body)
+ .padding(.bottom, verticalSpacing)
+ }
+
+ Divider()
+
+ ScrollView {
+ VStack(spacing: verticalSpacing) {
+ NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
+ navLabel(title: NSLocalizedString("Profile", comment: "Sidebar menu label for Profile view."), systemImage: "person")
+ }
+
+ /*
+ NavigationLink(destination: EmptyView()) {
+ navLabel(title: NSLocalizedString("Wallet", comment: "Sidebar menu label for Wallet view."), systemImage: "bolt")
+ }
+ */
+
+ NavigationLink(destination: MutelistView(damus_state: damus_state, users: get_mutelist_users(damus_state.contacts.mutelist) )) {
+ navLabel(title: NSLocalizedString("Blocked", comment: "Sidebar menu label for Profile view."), systemImage: "exclamationmark.octagon")
+ }
+
+ NavigationLink(destination: RelayConfigView(state: damus_state)) {
+ navLabel(title: NSLocalizedString("Relays", comment: "Sidebar menu label for Relays view."), systemImage: "network")
+ }
+
+ NavigationLink(destination: ConfigView(state: damus_state)) {
+ navLabel(title: NSLocalizedString("Settings", comment: "Sidebar menu label for accessing the app settings"), systemImage: "gear")
+ }
}
+ .padding([.top, .bottom], verticalSpacing)
}
}
-
- Divider()
- .padding(.trailing,40)
-
- NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
- Label(NSLocalizedString("Profile", comment: "Sidebar menu label for Profile view."), systemImage: "person")
- .font(.title2)
- .foregroundColor(textColor())
- }
- .simultaneousGesture(TapGesture().onEnded {
- isSidebarVisible = false
- })
-
- /*
- NavigationLink(destination: EmptyView()) {
- Label(NSLocalizedString("Relays", comment: "Sidebar menu label for Relay servers view"), systemImage: "xserve")
- .font(.title2)
- .foregroundColor(textColor())
- }
- .simultaneousGesture(TapGesture().onEnded {
- isSidebarVisible.toggle()
- })
- */
-
- /*
- NavigationLink(destination: EmptyView()) {
- Label(NSLocalizedString("Wallet", comment: "Sidebar menu label for Wallet view."), systemImage: "bolt")
- .font(.title2)
- .foregroundColor(textColor())
- }
- .simultaneousGesture(TapGesture().onEnded {
- isSidebarVisible.toggle()
- })
- */
-
- NavigationLink(destination: MutelistView(damus_state: damus_state, users: get_mutelist_users(damus_state.contacts.mutelist) )) {
- Label(NSLocalizedString("Blocked", comment: "Sidebar menu label for Profile view."), systemImage: "exclamationmark.octagon")
- .font(.title2)
- .foregroundColor(textColor())
- }
-
- NavigationLink(destination: RelayConfigView(state: damus_state)) {
- Label(NSLocalizedString("Relays", comment: "Sidebar menu label for Relays view."), systemImage: "network")
- .font(.title2)
- .foregroundColor(textColor())
- }
-
- NavigationLink(destination: ConfigView(state: damus_state)) {
- Label(NSLocalizedString("Settings", comment: "Sidebar menu label for accessing the app settings"), systemImage: "gear")
- .font(.title2)
- .foregroundColor(textColor())
- }
.simultaneousGesture(TapGesture().onEnded {
isSidebarVisible = false
})
- Spacer()
+ Divider()
- HStack(alignment: .center) {
+ HStack() {
Button(action: {
//ConfigView(state: damus_state)
if damus_state.keypair.privkey == nil {
@@ -142,6 +125,7 @@ struct SideMenuView: View {
Label(NSLocalizedString("Sign out", comment: "Sidebar menu label to sign out of the account."), systemImage: "pip.exit")
.font(.title3)
.foregroundColor(textColor())
+ .frame(maxWidth: .infinity, alignment: .leading)
})
Spacer()
@@ -152,22 +136,18 @@ struct SideMenuView: View {
Label(NSLocalizedString("", comment: "Sidebar menu label for accessing QRCode view"), systemImage: "qrcode")
.font(.title)
.foregroundColor(textColor())
- .padding(.trailing, 20)
}).fullScreenCover(isPresented: $showQRCode) {
QRCodeView(damus_state: damus_state)
}
}
+ .padding(.top, verticalSpacing)
}
- .padding(.top, 60)
- .padding(.bottom, 40)
- .padding(.leading, 40)
+ .padding(.top, -15)
+ .padding([.leading, .trailing, .bottom], 30)
}
.frame(width: sideBarWidth)
.offset(x: isSidebarVisible ? 0 : -sideBarWidth)
.animation(.default, value: isSidebarVisible)
- .onTapGesture {
- isSidebarVisible.toggle()
- }
.alert("Logout", isPresented: $confirm_logout) {
Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user."), role: .cancel) {
confirm_logout = false
@@ -182,6 +162,15 @@ struct SideMenuView: View {
Spacer()
}
}
+
+
+ @ViewBuilder
+ func navLabel(title: String, systemImage: String) -> some View {
+ Label(title, systemImage: systemImage)
+ .font(.title2)
+ .foregroundColor(textColor())
+ .frame(maxWidth: .infinity, alignment: .leading)
+ }
}
struct Previews_SideMenuView_Previews: PreviewProvider {
