Merge branch 'v1.7-madeira-release'

subscriber EULA and privacy policy notices on purple subscription
page

Signed-off-by: William Casarin <jb55@jb55.com>

CHANGELOG.md

@@ -1,3 +1,40 @@
+## [1.7-rc2] - 2024-02-28
+
+### Added
+
+- Add support for Apple In-App purchases (Daniel D’Aquino)
+- Notification reminders for Damus Purple impending expiration (Daniel D’Aquino)
+- Damus Purple membership! (William Casarin)
+- Fixed minor spacing and padding issues in onboarding views (ericholguin)
+
+
+### Changed
+
+- Disable inline text suggestions on 17.0 as they interfere with mention generation (William Casarin)
+- EULA is not shown by default (ericholguin)
+
+
+### Fixed
+
+- Fix welcome screen not showing if the user enters the app directly after a successful checkout without going through the link (Daniel D’Aquino)
+- Fix profile not updating bug (William Casarin)
+- Fix nostrscripts not loading (William Casarin)
+- Fix crash when accessing cached purple accounts (William Casarin)
+- Hide member signup date on reposts (kernelkind)
+- Fixed previews not rendering (ericholguin)
+- Fix load media formatting on small screens (kernelkind)
+- Fix shared nevents that are too long (kernelkind)
+- Fix many nostrdb transaction related crashes (William Casarin)
+
+
+### Removed
+
+- Removed copying public key action (ericholguin)
+
+
+
+[1.7-rc2]: https://github.com/damus-io/damus/releases/tag/v1.7-rc2
+
 ## [1.7-2] - 2024-01-24
 
 ### Added
@@ -1706,5 +1743,3 @@
 
 
 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2
-
-

damus.xcodeproj/project.pbxproj

@@ -175,6 +175,7 @@
 		4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */; };
 		4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */; };
 		4C42812C298C848200DBF26F /* TranslateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C42812B298C848200DBF26F /* TranslateView.swift */; };
+		4C463CBF2B960B96008A8C36 /* PurpleBackdrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C463CBE2B960B96008A8C36 /* PurpleBackdrop.swift */; };
 		4C4793012A993CDA00489948 /* mdb.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4793002A993B9A00489948 /* mdb.c */; settings = {COMPILER_FLAGS = "-w"; }; };
 		4C4793042A993DC000489948 /* midl.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4793032A993DB900489948 /* midl.c */; settings = {COMPILER_FLAGS = "-w"; }; };
 		4C4793052A993E3200489948 /* builder.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4792942A9939BD00489948 /* builder.c */; };
@@ -984,6 +985,7 @@
 		4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoicesView.swift; sourceTree = "<group>"; };
 		4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceView.swift; sourceTree = "<group>"; };
 		4C42812B298C848200DBF26F /* TranslateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslateView.swift; sourceTree = "<group>"; };
+		4C463CBE2B960B96008A8C36 /* PurpleBackdrop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurpleBackdrop.swift; sourceTree = "<group>"; };
 		4C478E242A9932C100489948 /* Ndb.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ndb.swift; sourceTree = "<group>"; };
 		4C478E262A99353500489948 /* threadpool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = threadpool.h; sourceTree = "<group>"; };
 		4C478E272A99354E00489948 /* protected_queue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = protected_queue.h; sourceTree = "<group>"; };
@@ -2700,6 +2702,7 @@
 				D7100C572B76FC8400C59298 /* MarketingContentView.swift */,
 				D7100C592B76FD5100C59298 /* LogoView.swift */,
 				D7100C5B2B77016700C59298 /* IAPProductStateView.swift */,
+				4C463CBE2B960B96008A8C36 /* PurpleBackdrop.swift */,
 			);
 			path = Detail;
 			sourceTree = "<group>";
@@ -3231,6 +3234,7 @@
 				7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */,
 				4C7D09722A0AEF5E00943473 /* DamusGradient.swift in Sources */,
 				4CCEB7B029B5415A0078AA28 /* SearchingProfileView.swift in Sources */,
+				4C463CBF2B960B96008A8C36 /* PurpleBackdrop.swift in Sources */,
 				BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */,
 				3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */,
 				4C32B9602A9AD44700DC3548 /* Struct.swift in Sources */,
@@ -3852,7 +3856,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3873,7 +3877,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MACOSX_DEPLOYMENT_TARGET = 12.3;
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.7.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3919,7 +3923,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3935,7 +3939,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MACOSX_DEPLOYMENT_TARGET = 12.3;
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.7.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -3955,7 +3959,6 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -4005,7 +4008,6 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;

damus/Views/Purple/DamusPurpleView.swift

@@ -44,14 +44,7 @@ struct DamusPurpleView: View, DamusPurpleStoreKitManagerDelegate {
     
     var body: some View {
         NavigationView {
-            ZStack {
+            PurpleBackdrop {
-                Color.black
-                    .edgesIgnoringSafeArea(.all)
-
-                Image("purple-blue-gradient-1")
-                    .resizable()
-                    .edgesIgnoringSafeArea(.all)
-
                 ScrollView {
                     MainContent
                         .padding(.top, 75)

damus/Views/Purple/Detail/IAPProductStateView.swift

@@ -131,6 +131,12 @@ extension DamusPurpleView {
                     })
                     .buttonStyle(GradientButtonStyle())
                 }
+
+                Text("By subscribing to Damus Purple you are accepting our [privacy policy](https://damus.io/privacy-policy.txt) and Apple's Standard [EULA](https://www.apple.com/legal/internet-services/itunes/dev/stdeula/)")
+                .foregroundColor(.white.opacity(0.6))
+                .font(.caption)
+                .padding()
+
             }
             .padding()
         }
@@ -176,5 +182,7 @@ extension DamusPurpleView {
 }
 
 #Preview {
-    DamusPurpleView.IAPProductStateView(products: .loaded([]), purchased: nil, account_uuid: UUID(), subscribe: {_ in })
+    PurpleBackdrop {
+        DamusPurpleView.IAPProductStateView(products: .loaded([]), purchased: nil, account_uuid: UUID(), subscribe: {_ in })
+    }
 }

damus/Views/Purple/Detail/MarketingContentView.swift

@@ -85,5 +85,7 @@ extension DamusPurpleView {
 }
 
 #Preview {
-    DamusPurpleView.MarketingContentView(purple: test_damus_state.purple)
+    PurpleBackdrop {
+        DamusPurpleView.MarketingContentView(purple: test_damus_state.purple)
+    }
 }

damus/Views/Purple/Detail/PurpleBackdrop.swift

@@ -0,0 +1,30 @@
+//
+//  PurpleBackdrop.swift
+//  damus
+//
+//  Created by William Casarin on 2024-03-04.
+//
+
+import SwiftUI
+
+struct PurpleBackdrop<T: View>: View {
+    @ViewBuilder let content: () -> T
+    var body: some View {
+        ZStack {
+            Color.black
+                .edgesIgnoringSafeArea(.all)
+
+            Image("purple-blue-gradient-1")
+                .resizable()
+                .edgesIgnoringSafeArea(.all)
+
+            content()
+        }
+    }
+}
+
+#Preview {
+    PurpleBackdrop {
+        Text("Hello, World")
+    }
+}