Merge branch 'master' into camera

damus-io · Oct 28, 2023 · dd1474f · dd1474f
2 parents 5510996 + 7710839
commit dd1474f
Show file tree

Hide file tree

Showing 87 changed files with 2,572 additions and 562 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## [1.6-24] - 2023-10-22 - AppStore Rejection Cope
+
+### Added
+
+- Improve discoverability of profile zaps with zappability badges and profile action sheets (Daniel D’Aquino)
+- Add suggested hashtags to universe view (Daniel D’Aquino)
+- Suggest first post during onboarding (Daniel D’Aquino)
+- Add expiry date for images in cache to be auto-deleted after a preset time to save space on storage (Daniel D’Aquino)
+- Add QR scan nsec logins. (Jericho Hasselbush)
+
+
+### Changed
+
+- Improved status view design (ericholguin)
+- Improve clear cache functionality (Daniel D’Aquino)
+
+
+### Fixed
+
+- Reduce size of event menu hitbox (William Casarin)
+- Do not show DMs from muted users (Daniel D’Aquino)
+- Add more spacing between display name and username, and prefix username with `@` character (Daniel D’Aquino)
+- Broadcast quoted notes when posting a note with quotes (Daniel D’Aquino)
+
+
+[1.6-24]: https://github.com/damus-io/damus/releases/tag/v1.6-24
+
 ## [1.6-23] - 2023-10-06 - Appstore Release
 
 ### Added

diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj
diff --git a/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,6 +33,24 @@
       "state" : {
         "revision" : "76bb7971da7fbf429de1c84f1244adf657242fee"
       }
+    },
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
+      "state" : {
+        "revision" : "5b356adceabff6ca027f6574aac79e9fee145d26",
+        "version" : "1.14.1"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax.git",
+      "state" : {
+        "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
+        "version" : "509.0.0"
+      }
     }
   ],
   "version" : 2

diff --git a/damus/Assets.xcassets/Colors/DamusAdaptableWhite.colorset/Contents.json b/damus/Assets.xcassets/Colors/DamusAdaptableWhite.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/damus/Components/DamusColors.swift b/damus/Components/DamusColors.swift
@@ -11,6 +11,7 @@ import SwiftUI
 class DamusColors {
     static let adaptableGrey = Color("DamusAdaptableGrey")
     static let adaptableBlack = Color("DamusAdaptableBlack")
+    static let adaptableWhite = Color("DamusAdaptableWhite")
     static let white = Color("DamusWhite")
     static let black = Color("DamusBlack")
     static let brown = Color("DamusBrown")

diff --git a/damus/Components/InvoiceView.swift b/damus/Components/InvoiceView.swift
@@ -39,7 +39,12 @@ struct InvoiceView: View {
             if settings.show_wallet_selector {
                 present_sheet(.select_wallet(invoice: invoice.string))
             } else {
-                open_with_wallet(wallet: settings.default_wallet.model, invoice: invoice.string)
+                do {
+                    try open_with_wallet(wallet: settings.default_wallet.model, invoice: invoice.string)
+                }
+                catch {
+                    present_sheet(.select_wallet(invoice: invoice.string))
+                }
             }
         } label: {
             RoundedRectangle(cornerRadius: 20, style: .circular)
@@ -82,21 +87,26 @@ struct InvoiceView: View {
     }
 }
 
-func open_with_wallet(wallet: Wallet.Model, invoice: String) {
+enum OpenWalletError: Error {
+    case no_wallet_to_open
+    case store_link_invalid
+    case system_cannot_open_store_link
+}
+
+func open_with_wallet(wallet: Wallet.Model, invoice: String) throws {
     if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
         UIApplication.shared.open(url)
     } else {
         guard let store_link = wallet.appStoreLink else {
-            // TODO: do something here if we don't have an appstore link
-            return
+            throw OpenWalletError.no_wallet_to_open
         }
 
         guard let url = URL(string: store_link) else {
-            return
+            throw OpenWalletError.store_link_invalid
         }
 
         guard UIApplication.shared.canOpenURL(url) else {
-            return
+            throw OpenWalletError.system_cannot_open_store_link
         }
 
         UIApplication.shared.open(url)

diff --git a/damus/Components/NeutralButtonStyle.swift b/damus/Components/NeutralButtonStyle.swift
@@ -20,6 +20,20 @@ struct NeutralButtonStyle: ButtonStyle {
     }
 }
 
+struct NeutralCircleButtonStyle: ButtonStyle {
+    func makeBody(configuration: Self.Configuration) -> some View {
+        return configuration.label
+            .padding(20)
+            .background(DamusColors.neutral1)
+            .cornerRadius(9999)
+            .overlay(
+                RoundedRectangle(cornerRadius: 9999)
+                    .stroke(DamusColors.neutral3, lineWidth: 1)
+            )
+            .scaleEffect(configuration.isPressed ? 0.95 : 1)
+    }
+}
+
 
 struct NeutralButtonStyle_Previews: PreviewProvider {
     static var previews: some View {

diff --git a/damus/Components/ZapButton.swift → damus/Components/NoteZapButton.swift b/damus/Components/ZapButton.swift → damus/Components/NoteZapButton.swift
@@ -1,5 +1,5 @@
 //
-//  ZapButton.swift
+//  NoteZapButton.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-17.
@@ -18,6 +18,19 @@ enum ZappingError {
     case bad_lnurl
     case canceled
     case send_failed
+
+    func humanReadableMessage() -> String {
+        switch self {
+            case .fetching_invoice:
+                return NSLocalizedString("Error fetching lightning invoice", comment: "Message to display when there was an error fetching a lightning invoice while attempting to zap.")
+            case .bad_lnurl:
+                return NSLocalizedString("Invalid lightning address", comment: "Message to display when there was an error attempting to zap due to an invalid lightning address.")
+            case .canceled:
+                return NSLocalizedString("Zap attempt from connected wallet was canceled.", comment: "Message to display when a zap from the user's connected wallet was canceled.")
+            case .send_failed:
+                return NSLocalizedString("Zap attempt from connected wallet failed.", comment: "Message to display when sending a zap from the user's connected wallet failed.")
+        }
+    }
 }
 
 struct ZappingEvent {
@@ -26,7 +39,7 @@ struct ZappingEvent {
     let target: ZapTarget
 }
 
-struct ZapButton: View {
+struct NoteZapButton: View {
     let damus_state: DamusState
     let target: ZapTarget
     let lnurl: String
@@ -144,7 +157,7 @@ struct ZapButton_Previews: PreviewProvider {
         let pending_zap = PendingZap(amount_msat: 1000, target: ZapTarget.note(id: test_note.id, author: test_note.pubkey), request: .normal(test_zap_request), type: .pub, state: .external(.init(state: .fetching_invoice)))
         let zaps = ZapsDataModel([.pending(pending_zap)])
 
-        ZapButton(damus_state: test_damus_state, target: ZapTarget.note(id: test_note.id, author: test_note.pubkey), lnurl: "lnurl", zaps: zaps)
+        NoteZapButton(damus_state: test_damus_state, target: ZapTarget.note(id: test_note.id, author: test_note.pubkey), lnurl: "lnurl", zaps: zaps)
     }
 }
 

diff --git a/damus/Components/SelectableText.swift b/damus/Components/SelectableText.swift
@@ -11,19 +11,27 @@ import SwiftUI
 struct SelectableText: View {
 
     let attributedString: AttributedString
+    let textAlignment: NSTextAlignment
 
     @State private var selectedTextHeight: CGFloat = .zero
     @State private var selectedTextWidth: CGFloat = .zero
 
     let size: EventViewKind
 
+    init(attributedString: AttributedString, textAlignment: NSTextAlignment? = nil, size: EventViewKind) {
+        self.attributedString = attributedString
+        self.textAlignment = textAlignment ?? NSTextAlignment.natural
+        self.size = size
+    }
+
     var body: some View {
         GeometryReader { geo in
             TextViewRepresentable(
                 attributedString: attributedString,
                 textColor: UIColor.label,
                 font: eventviewsize_to_uifont(size),
                 fixedWidth: selectedTextWidth,
+                textAlignment: self.textAlignment,
                 height: $selectedTextHeight
             )
             .padding([.leading, .trailing], -1.0)
@@ -48,6 +56,7 @@ struct SelectableText: View {
     let textColor: UIColor
     let font: UIFont
     let fixedWidth: CGFloat
+    let textAlignment: NSTextAlignment
 
     @Binding var height: CGFloat
 
@@ -61,12 +70,14 @@ struct SelectableText: View {
         view.textContainerInset = .zero
         view.textContainerInset.left = 1.0
         view.textContainerInset.right = 1.0
+        view.textAlignment = textAlignment
         return view
     }
 
     func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<Self>) {
         let mutableAttributedString = createNSAttributedString()
         uiView.attributedText = mutableAttributedString
+        uiView.textAlignment = self.textAlignment
 
         let newHeight = mutableAttributedString.height(containerWidth: fixedWidth)