Merge branch 'main' into uiscrollview-image-viewer

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 - Added a new image viewer that appears when you tap an image.
+- Included the npub in the properties list sent to analytics.
 - Removed the like and repost counts from the Main and Profile feeds.
 - Fixed an issue where the sheet asking users to set up a NIP-05 username would appear after reinstalling Nos, even if the profile already had a NIP-05 username.
 - Fixed a bug where urls with periods after them would include the period.

Nos/Assets/Colors.xcassets/action-banner-background-gradient-bottom.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Nos/Assets/Colors.xcassets/action-banner-background-gradient-top.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Nos/Assets/Colors.xcassets/big-action-button-linear-gradient-stop1.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x38",
+          "green" : "0x63",
+          "red" : "0xEF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Nos/Assets/Colors.xcassets/big-action-button-linear-gradient-stop2.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x54",
+          "green" : "0x4C",
+          "red" : "0xF2"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Nos/Service/Analytics.swift

@@ -115,12 +115,11 @@ class Analytics {
     }
 
     func identify(with keyPair: KeyPair, nip05: String? = nil) {
-        Log.info("Analytics: Identified \(keyPair.npub)")
-        let userProperties: [String: Any]?
+        let npub = keyPair.npub
+        Log.info("Analytics: Identified \(npub)")
+        var userProperties: [String: Any] = ["npub": npub]
         if let nip05 {
-            userProperties = ["NIP-05": nip05]
-        } else {
-            userProperties = nil
+            userProperties["NIP-05"] = nip05
         }
         postHog?.identify(keyPair.npub, userProperties: userProperties)
     }

Nos/Views/ActionBanner.swift

@@ -74,8 +74,8 @@ struct ActionBanner: View {
                     ZStack {
                         LinearGradient(
                             colors: [
-                                Color(red: 1, green: 1, blue: 1, opacity: 0.2),
-                                Color(red: 1, green: 1, blue: 1, opacity: 1.0),
+                                Color.actionBannerBackgroundGradientTop,
+                                Color.actionBannerBackgroundGradientBottom,
                             ],
                             startPoint: .top,
                             endPoint: .bottom

Nos/Views/BigActionButton.swift

@@ -69,8 +69,8 @@ struct BigActionButtonStyle: ButtonStyle {
                 ZStack {
                     LinearGradient(
                         stops: [
-                            Gradient.Stop(color: Color(red: 0.94, green: 0.39, blue: 0.22), location: 0.00),
-                            Gradient.Stop(color: Color(red: 0.95, green: 0.3, blue: 0.33), location: 1.00),
+                            Gradient.Stop(color: Color.bigActionButtonLinearGradientStop1, location: 0.00),
+                            Gradient.Stop(color: Color.bigActionButtonLinearGradientStop2, location: 1.00),
                         ],
                         startPoint: UnitPoint(x: 0.5, y: 0),
                         endPoint: UnitPoint(x: 0.5, y: 0.99)