Fix reposts on macos

2023-04-19 11:08:59 -07:00
parent d667a9d8f7
commit 88db9de4ea
9 changed files with 232 additions and 137 deletions
--- a/damus/Views/ActionBar/BigButton.swift
+++ b/damus/Views/ActionBar/BigButton.swift
@@ -0,0 +1,41 @@
+//
+//  BigButton.swift
+//  damus
+//
+//  Created by William Casarin on 2023-04-19.
+//
+
+import SwiftUI
+
+struct BigButton: View {
+    let text: String
+    let action: () -> ()
+    
+    @Environment(\.colorScheme) var colorScheme
+    
+    init(_ text: String, action: @escaping () -> ()) {
+        self.text = text
+        self.action = action
+    }
+    
+    var body: some View {
+        Button(action: {
+            action()
+        }) {
+            Text(text)
+                .frame(minWidth: 300, maxWidth: .infinity, minHeight: 50, maxHeight: 50, alignment: .center)
+                .foregroundColor(colorScheme == .light ? DamusColors.black : DamusColors.white)
+                .overlay {
+                    RoundedRectangle(cornerRadius: 24)
+                        .stroke(colorScheme == .light ? DamusColors.mediumGrey : DamusColors.white, lineWidth: 1)
+                }
+                .padding(EdgeInsets(top: 10, leading: 50, bottom: 25, trailing: 50))
+        }
+    }
+}
+
+struct BigButton_Previews: PreviewProvider {
+    static var previews: some View {
+        BigButton("Cancel", action: {})
+    }
+}
--- a/damus/Views/ActionBar/EventActionBar.swift
+++ b/damus/Views/ActionBar/EventActionBar.swift
@@ -8,46 +8,26 @@
 import SwiftUI
 import UIKit

-enum ActionBarSheet: Identifiable {
-    case reply
-
-    var id: String {
-        switch self {
-        case .reply: return "reply"
-        }
-    }
-}

 struct EventActionBar: View {
    let damus_state: DamusState
    let event: NostrEvent
-    let test_lnurl: String?
    let generator = UIImpactFeedbackGenerator(style: .medium)
    
    // just used for previews
-    @State var sheet: ActionBarSheet? = nil
    @State var show_share_sheet: Bool = false
    @State var show_share_action: Bool = false
-    
-    @ObservedObject var bar: ActionBarModel
-    @ObservedObject var settings: UserSettingsStore
+    @State var show_repost_action: Bool = false
+    @State var bar: ActionBarModel = ActionBarModel()
    
    @Environment(\.colorScheme) var colorScheme
    
-    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil, test_lnurl: String? = nil) {
-        self.damus_state = damus_state
-        self.event = event
-        self.test_lnurl = test_lnurl
-        _bar = ObservedObject(wrappedValue: bar ?? make_actionbar_model(ev: event.id, damus: damus_state))
-        _settings = ObservedObject(wrappedValue: damus_state.settings)
-    }
-    
    var lnurl: String? {
-        test_lnurl ?? damus_state.profiles.lookup(id: event.pubkey)?.lnurl
+        damus_state.profiles.lookup(id: event.pubkey)?.lnurl
    }
    
    var show_like: Bool {
-        if settings.onlyzaps_mode {
+        if damus_state.settings.onlyzaps_mode {
            return false
        }
        
@@ -59,7 +39,7 @@ struct EventActionBar: View {
            if damus_state.keypair.privkey != nil {
                HStack(spacing: 4) {
                    EventActionButton(img: "bubble.left", col: bar.replied ? DamusColors.purple : Color.gray) {
-                        notify(.reply, event)
+                        notify(.compose, PostAction.replying_to(event))
                    }
                    .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
                    Text(verbatim: "\(bar.replies > 0 ? "\(bar.replies)" : "")")
@@ -74,7 +54,7 @@ struct EventActionBar: View {
                    if bar.boosted {
                        notify(.delete, bar.our_boost)
                    } else {
-                        send_boost()
+                        self.show_repost_action = true
                    }
                }
                .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
@@ -112,26 +92,35 @@ struct EventActionBar: View {
            }
            .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
        }
-        .sheet(isPresented: $show_share_action) {
+        .onAppear {
+            self.bar.update(damus: damus_state, evid: self.event.id)
+        }
+        .sheet(isPresented: $show_share_action, onDismiss: { self.show_share_action = false }) {
            if #available(iOS 16.0, *) {
-                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share_sheet: $show_share_sheet, show_share_action: $show_share_action)
+                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share: $show_share_sheet)
                    .presentationDetents([.height(300)])
                    .presentationDragIndicator(.visible)
            } else {
-                if let note_id = bech32_note_id(event.id) {
-                    if let url = URL(string: "https://damus.io/" + note_id) {
-                        ShareSheet(activityItems: [url])
-                    }
-                }
+                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share: $show_share_sheet)
            }
        }
-        .sheet(isPresented: $show_share_sheet) {
+        .sheet(isPresented: $show_share_sheet, onDismiss: { self.show_share_sheet = false }) {
            if let note_id = bech32_note_id(event.id) {
                if let url = URL(string: "https://damus.io/" + note_id) {
                    ShareSheet(activityItems: [url])
                }
            }
        }
+        .sheet(isPresented: $show_repost_action, onDismiss: { self.show_repost_action = false }) {
+        
+            if #available(iOS 16.0, *) {
+                RepostAction(damus_state: self.damus_state, event: event)
+                    .presentationDetents([.height(300)])
+                    .presentationDragIndicator(.visible)
+            } else {
+                RepostAction(damus_state: self.damus_state, event: event)
+            }
+        }
        .onReceive(handle_notify(.update_stats)) { n in
            let target = n.object as! String
            guard target == self.event.id else { return }
@@ -149,10 +138,6 @@ struct EventActionBar: View {
        }
    }
    
-    func send_boost() {
-        notify(.boost, self.event)
-    }
-    
    func send_like() {
        guard let privkey = damus_state.keypair.privkey else {
            return
@@ -254,8 +239,6 @@ struct EventActionBar_Previews: PreviewProvider {
            EventActionBar(damus_state: ds, event: ev, bar: extra_max_bar)

            EventActionBar(damus_state: ds, event: ev, bar: mega_max_bar)
-            
-            EventActionBar(damus_state: ds, event: ev, bar: zapbar, test_lnurl: "lnurl")
        }
        .padding(20)
    }
--- a/damus/Views/ActionBar/RepostAction.swift
+++ b/damus/Views/ActionBar/RepostAction.swift
@@ -0,0 +1,62 @@
+//
+//  RepostAction.swift
+//  damus
+//
+//  Created by William Casarin on 2023-04-19.
+//
+
+import SwiftUI
+
+struct RepostAction: View {
+    let damus_state: DamusState
+    let event: NostrEvent
+    
+    @Environment(\.dismiss) var dismiss
+    
+    var body: some View {
+        VStack {
+            Text("Repost Note", comment: "Title text to indicate that the buttons below are meant to be used to repost a note to others.")
+                .padding()
+                .font(.system(size: 17, weight: .bold))
+            
+            Spacer()
+
+            HStack(alignment: .top, spacing: 100) {
+                
+                ShareActionButton(img: "arrow.2.squarepath", text: NSLocalizedString("Repost", comment: "Button to repost a note")) {
+                    dismiss()
+                                
+                    guard let privkey = self.damus_state.keypair.privkey else {
+                        return
+                    }
+                    
+                    let boost = make_boost_event(pubkey: damus_state.keypair.pubkey, privkey: privkey, boosted: self.event)
+                    
+                    damus_state.postbox.send(boost)
+                }
+                
+                ShareActionButton(img: "quote.opening", text: NSLocalizedString("Quote", comment: "Button to compose a quoted note")) {
+                    dismiss()
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                        notify(.compose, PostAction.quoting(self.event))
+                    }
+                }
+                
+            }
+            
+            Spacer()
+            
+            HStack {
+                BigButton(NSLocalizedString("Cancel", comment: "Button to cancel a repost.")) {
+                    dismiss()
+                }
+            }
+        }
+    }
+}
+
+struct RepostAction_Previews: PreviewProvider {
+    static var previews: some View {
+        RepostAction(damus_state: test_damus_state(), event: test_event)
+    }
+}
--- a/damus/Views/ActionBar/ShareAction.swift
+++ b/damus/Views/ActionBar/ShareAction.swift
@@ -12,25 +12,22 @@ struct ShareAction: View {
    let bookmarks: BookmarksManager
    @State private var isBookmarked: Bool = false

-    @Binding var show_share_sheet: Bool
-    @Binding var show_share_action: Bool
+    @Binding var show_share: Bool
    
    @Environment(\.colorScheme) var colorScheme
+    @Environment(\.dismiss) var dismiss
    
-    init(event: NostrEvent, bookmarks: BookmarksManager, show_share_sheet: Binding<Bool>, show_share_action: Binding<Bool>) {
+    init(event: NostrEvent, bookmarks: BookmarksManager, show_share: Binding<Bool>) {
        let bookmarked = bookmarks.isBookmarked(event)
        self._isBookmarked = State(initialValue: bookmarked)
        
        self.bookmarks = bookmarks
        self.event = event
-        self._show_share_sheet = show_share_sheet
-        self._show_share_action = show_share_action
+        self._show_share = show_share
    }
    
    var body: some View {
        
-        let col = colorScheme == .light ? DamusColors.mediumGrey : DamusColors.white
-        
        VStack {
            Text("Share Note", comment: "Title text to indicate that the buttons below are meant to be used to share a note with others.")
                .padding()
@@ -40,28 +37,27 @@ struct ShareAction: View {

            HStack(alignment: .top, spacing: 25) {
                
-                ShareActionButton(img: "link", text: NSLocalizedString("Copy Link", comment: "Button to copy link to note"), col: col) {
-                    show_share_action = false
+                ShareActionButton(img: "link", text: NSLocalizedString("Copy Link", comment: "Button to copy link to note")) {
                    UIPasteboard.general.string = "https://damus.io/" + (bech32_note_id(event.id) ?? event.id)
                }
                
                let bookmarkImg = isBookmarked ? "bookmark.slash" : "bookmark"
                let bookmarkTxt = isBookmarked ? NSLocalizedString("Remove Bookmark", comment: "Button text to remove bookmark from a note.") : NSLocalizedString("Add Bookmark", comment: "Button text to add bookmark to a note.")
-                let boomarkCol = isBookmarked ? Color(.red) : col
+                let boomarkCol = isBookmarked ? Color(.red) : nil
                ShareActionButton(img: bookmarkImg, text: bookmarkTxt, col: boomarkCol) {
-                    show_share_action = false
+                    dismiss()
                    self.bookmarks.updateBookmark(event)
                    isBookmarked = self.bookmarks.isBookmarked(event)
                }
                
-                ShareActionButton(img: "globe", text: NSLocalizedString("Broadcast", comment: "Button to broadcast note to all your relays"), col: col) {
-                    show_share_action = false
+                ShareActionButton(img: "globe", text: NSLocalizedString("Broadcast", comment: "Button to broadcast note to all your relays")) {
+                    dismiss()
                    NotificationCenter.default.post(name: .broadcast_event, object: event)
                }
                
-                ShareActionButton(img: "square.and.arrow.up", text: NSLocalizedString("Share Via...", comment: "Button to present iOS share sheet"), col: col) {
-                    show_share_action = false
-                    show_share_sheet = true
+                ShareActionButton(img: "square.and.arrow.up", text: NSLocalizedString("Share Via...", comment: "Button to present iOS share sheet")) {
+                    show_share = true
+                    dismiss()
                }
                
            }
@@ -69,42 +65,11 @@ struct ShareAction: View {
            Spacer()
            
            HStack {
-                
-                Button(action: {
-                    show_share_action = false
-                }) {
-                    Text(NSLocalizedString("Cancel", comment: "Button to cancel a repost."))
-                    .frame(minWidth: 300, maxWidth: .infinity, minHeight: 50, maxHeight: 50, alignment: .center)
-                    .foregroundColor(colorScheme == .light ? DamusColors.black : DamusColors.white)
-                    .overlay {
-                        RoundedRectangle(cornerRadius: 24)
-                            .stroke(colorScheme == .light ? DamusColors.mediumGrey : DamusColors.white, lineWidth: 1)
-                    }
-                    .padding(EdgeInsets(top: 10, leading: 50, bottom: 25, trailing: 50))
+                BigButton(NSLocalizedString("Cancel", comment: "Button to cancel a repost.")) {
+                    dismiss()
                }
            }
        }
    }
 }

-func ShareActionButton(img: String, text: String, col: Color, action: @escaping () -> ()) -> some View {
-    Button(action: action) {
-        VStack() {
-            Image(systemName: img)
-                .foregroundColor(col)
-                .font(.system(size: 23, weight: .bold))
-                .overlay {
-                    Circle()
-                        .stroke(col, lineWidth: 1)
-                        .frame(width: 55.0, height: 55.0)
-                }
-                .frame(height: 25)
-            Text(verbatim: text)
-                .foregroundColor(col)
-                .font(.footnote)
-                .multilineTextAlignment(.center)
-                .padding(.top)
-        }
-    }
-
-}
--- a/damus/Views/ActionBar/ShareActionButton.swift
+++ b/damus/Views/ActionBar/ShareActionButton.swift
@@ -0,0 +1,62 @@
+//
+//  ShareActionButton.swift
+//  damus
+//
+//  Created by William Casarin on 2023-04-19.
+//
+
+import SwiftUI
+
+struct ShareActionButton: View {
+    let img: String
+    let text: String
+    let color: Color?
+    let action: () -> ()
+    
+    init(img: String, text: String, col: Color?, action: @escaping () -> ()) {
+        self.img = img
+        self.text = text
+        self.color = col
+        self.action = action
+    }
+    
+    init(img: String, text: String, action: @escaping () -> ()) {
+        self.img = img
+        self.text = text
+        self.action = action
+        self.color = nil
+    }
+    
+    var col: Color {
+        colorScheme == .light ? DamusColors.mediumGrey : DamusColors.white
+    }
+    
+    @Environment(\.colorScheme) var colorScheme
+        
+    var body: some View {
+        Button(action: action) {
+            VStack() {
+                Image(systemName: img)
+                    .foregroundColor(col)
+                    .font(.system(size: 23, weight: .bold))
+                    .overlay {
+                        Circle()
+                            .stroke(col, lineWidth: 1)
+                            .frame(width: 55.0, height: 55.0)
+                    }
+                    .frame(height: 25)
+                Text(verbatim: text)
+                    .foregroundColor(col)
+                    .font(.footnote)
+                    .multilineTextAlignment(.center)
+                    .padding(.top)
+            }
+        }
+    }
+}
+
+struct ShareActionButton_Previews: PreviewProvider {
+    static var previews: some View {
+        ShareActionButton(img: "figure.flexibility", text: "Stretch", action: {})
+    }
+}