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

Revert "Sidebar Fixes"

Browse Source 
This reverts commit 6653798d27.
This commit is contained in:
William Casarin
2023-02-13 16:51:13 -08:00
parent 70a7239cfd
commit 98c7bf5afc
2 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
damus/ContentView.swift
View File

@@ -260,67 +260,62 @@ 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 { NavigationView {
VStack(alignment: .leading, spacing: 0) { ZStack {
ZStack { TabView { // Prevents navbar appearance change on scroll
TabView { // Prevents navbar appearance change on scroll MainContent(damus: damus)
MainContent(damus: damus) .toolbar() {
.toolbar() { ToolbarItem(placement: .navigationBarLeading) {
ToolbarItem(placement: .navigationBarLeading) { Button {
Button { isSideBarOpened.toggle()
isSideBarOpened.toggle() } label: {
} label: { ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles) .opacity(isSideBarOpened ? 0 : 1)
.opacity(isSideBarOpened ? 0 : 1) .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
.animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
}
.disabled(isSideBarOpened)
} }
.disabled(isSideBarOpened)
ToolbarItem(placement: .navigationBarTrailing) { }
HStack(alignment: .center) {
if home.signal.signal != home.signal.max_signal { ToolbarItem(placement: .navigationBarTrailing) {
NavigationLink(destination: RelayConfigView(state: damus_state!)) { HStack(alignment: .center) {
Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.") if home.signal.signal != home.signal.max_signal {
.font(.callout) NavigationLink(destination: RelayConfigView(state: damus_state!)) {
.foregroundColor(.gray) Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.")
} .font(.callout)
.foregroundColor(.gray)
} }
}
// maybe expand this to other timelines in the future
if selected_timeline == .search { // maybe expand this to other timelines in the future
Button(action: { if selected_timeline == .search {
//isFilterVisible.toggle() Button(action: {
self.active_sheet = .filter //isFilterVisible.toggle()
}) { self.active_sheet = .filter
// checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease..., line.3.horizontail.decrease }) {
Label("Filter", systemImage: "line.3.horizontal.decrease") // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease..., line.3.horizontail.decrease
.foregroundColor(.gray) Label("Filter", systemImage: "line.3.horizontal.decrease")
.foregroundColor(.gray)
//.contentShape(Rectangle()) //.contentShape(Rectangle())
}
} }
} }
} }
} }
} }
.tabViewStyle(.page(indexDisplayMode: .never))
} }
.tabViewStyle(.page(indexDisplayMode: .never))
TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
.padding([.bottom], 8)
} }
.overlay( .overlay(
SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation()) SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
) )
.navigationBarTitleDisplayMode(.inline)
} }
.navigationViewStyle(.stack) .navigationViewStyle(.stack)
TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
.padding([.bottom], 8)
} }
} }
.onAppear() { .onAppear() {
self.connect() self.connect()
setup_notifications() setup_notifications()

9
damus/Views/SideMenuView.swift
View File

@@ -166,13 +166,8 @@ struct SideMenuView: View {
@ViewBuilder @ViewBuilder
func navLabel(title: String, systemImage: String) -> some View { func navLabel(title: String, systemImage: String) -> some View {
Label { Label(title, systemImage: systemImage)
Text(title) .font(.title2)
.font(.title2)
} icon: {
Image(systemName: systemImage)
.frame(width:20)
}
.foregroundColor(textColor()) .foregroundColor(textColor())
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
} }