Merge branch 'v1.7-madeira-release'

This commit is contained in:
William Casarin
2024-03-04 17:28:01 +00:00
6 changed files with 88 additions and 18 deletions

View File

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

View File

@@ -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 })
}
}

View File

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

View File

@@ -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")
}
}