Browse Source

Updated sidebar to close when tab items at the bottom are clicked too.

translations_damus-localizations-en-us-xcloc-localized-contents-en-us-xliff--master_es_419
Ben Weeks 2 years ago
parent
commit
cb54ac0494
  1. 3
      damus/ContentView.swift
  2. 12
      damus/Views/MainTabView.swift

3
damus/ContentView.swift

@ -240,7 +240,7 @@ struct ContentView: View {
} }
.navigationViewStyle(.stack) .navigationViewStyle(.stack)
TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline) TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
.padding([.bottom], 8) .padding([.bottom], 8)
} }
} }
@ -283,7 +283,6 @@ struct ContentView: View {
guard let privkey = self.privkey else { guard let privkey = self.privkey else {
return return
} }
let ev = notif.object as! NostrEvent let ev = notif.object as! NostrEvent
let boost = make_boost_event(pubkey: pubkey, privkey: privkey, boosted: ev) let boost = make_boost_event(pubkey: pubkey, privkey: privkey, boosted: ev)
self.damus_state?.pool.send(.event(boost)) self.damus_state?.pool.send(.event(boost))

12
damus/Views/MainTabView.swift

@ -31,9 +31,9 @@ func timeline_bit(_ timeline: Timeline) -> Int {
struct TabButton: View { struct TabButton: View {
let timeline: Timeline let timeline: Timeline
let img: String let img: String
@Binding var selected: Timeline? @Binding var selected: Timeline?
@Binding var new_events: NewEventsBits @Binding var new_events: NewEventsBits
@Binding var isSidebarVisible: Bool
let action: (Timeline) -> () let action: (Timeline) -> ()
@ -56,6 +56,7 @@ struct TabButton: View {
Button(action: { Button(action: {
action(timeline) action(timeline)
new_events = NewEventsBits(prev: new_events, unsetting: timeline) new_events = NewEventsBits(prev: new_events, unsetting: timeline)
isSidebarVisible = false
}) { }) {
Label("", systemImage: selected == timeline ? "\(img).fill" : img) Label("", systemImage: selected == timeline ? "\(img).fill" : img)
.contentShape(Rectangle()) .contentShape(Rectangle())
@ -69,6 +70,7 @@ struct TabButton: View {
struct TabBar: View { struct TabBar: View {
@Binding var new_events: NewEventsBits @Binding var new_events: NewEventsBits
@Binding var selected: Timeline? @Binding var selected: Timeline?
@Binding var isSidebarVisible: Bool
let action: (Timeline) -> () let action: (Timeline) -> ()
@ -76,10 +78,10 @@ struct TabBar: View {
VStack { VStack {
Divider() Divider()
HStack { HStack {
TabButton(timeline: .home, img: "house", selected: $selected, new_events: $new_events, action: action).keyboardShortcut("1") TabButton(timeline: .home, img: "house", selected: $selected, new_events: $new_events, isSidebarVisible: $isSidebarVisible, action: action).keyboardShortcut("1")
TabButton(timeline: .dms, img: "bubble.left.and.bubble.right", selected: $selected, new_events: $new_events, action: action).keyboardShortcut("2") TabButton(timeline: .dms, img: "bubble.left.and.bubble.right", selected: $selected, new_events: $new_events, isSidebarVisible: $isSidebarVisible, action: action).keyboardShortcut("2")
TabButton(timeline: .search, img: "magnifyingglass.circle", selected: $selected, new_events: $new_events, action: action).keyboardShortcut("3") TabButton(timeline: .search, img: "magnifyingglass.circle", selected: $selected, new_events: $new_events, isSidebarVisible: $isSidebarVisible, action: action).keyboardShortcut("3")
TabButton(timeline: .notifications, img: "bell", selected: $selected, new_events: $new_events, action: action).keyboardShortcut("4") TabButton(timeline: .notifications, img: "bell", selected: $selected, new_events: $new_events, isSidebarVisible: $isSidebarVisible, action: action).keyboardShortcut("4")
} }
} }
} }

Loading…
Cancel
Save