Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IOS-2456 Membership | Support any name display #1054

Merged
merged 1 commit into from
Mar 26, 2024
Merged

IOS-2456 Membership | Support any name display #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions ...Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ struct MembershipTeirView: View {
tier: nil,
status: .unknown,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
MembershipTeirView(
Expand All @@ -117,7 +118,8 @@ struct MembershipTeirView: View {
tier: .explorer,
status: .pending,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
MembershipTeirView(
Expand All @@ -126,7 +128,8 @@ struct MembershipTeirView: View {
tier: .explorer,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
MembershipTeirView(
Expand All @@ -135,7 +138,8 @@ struct MembershipTeirView: View {
tier: .explorer,
status: .pending,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
MembershipTeirView(
Expand All @@ -144,7 +148,8 @@ struct MembershipTeirView: View {
tier: .builder,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
MembershipTeirView(
Expand All @@ -153,7 +158,8 @@ struct MembershipTeirView: View {
tier: .explorer,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
MembershipTeirView(
Expand All @@ -162,7 +168,8 @@ struct MembershipTeirView: View {
tier: .custom(id: 0),
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { }
}
Expand Down
18 changes: 12 additions & 6 deletions ...ces/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ struct MembershipTierListView: View {
tier: nil,
status: .unknown,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { _ in }

Expand All @@ -46,7 +47,8 @@ struct MembershipTierListView: View {
tier: .explorer,
status: .pending,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { _ in }

Expand All @@ -55,7 +57,8 @@ struct MembershipTierListView: View {
tier: .explorer,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { _ in }

Expand All @@ -64,7 +67,8 @@ struct MembershipTierListView: View {
tier: .custom(id: 0),
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { _ in }

Expand All @@ -74,7 +78,8 @@ struct MembershipTierListView: View {
tier: .builder,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { _ in }

Expand All @@ -83,7 +88,8 @@ struct MembershipTierListView: View {
tier: .coCreator,
status: .pending,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
) { _ in }
}
Expand Down
3 changes: 2 additions & 1 deletion Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipStatusExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ public extension MembershipStatus {
tier: nil,
status: .unknown,
dateEnds: .distantFuture,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
}

Expand Down
64 changes: 60 additions & 4 deletions ...rces/PresentationLayer/Modules/Membership/TierSelection/MembershipTierSelectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct MembershipTierSelectionView: View {
try await model.getVerificationEmail(email: email, subscribeToNewsletter: subscribeToNewsletter)
}
case .builder, .coCreator:
MembershipNameSheetView(tier: model.tierToDisplay)
MembershipNameSheetView(tier: model.tierToDisplay, anyName: model.userMembership.anyName)
case .custom:
EmptyView() // TBD in future updates
}
Expand All @@ -63,16 +63,72 @@ struct MembershipTierSelectionView: View {
}

#Preview {
ScrollView {
TabView {
MembershipTierSelectionView(
userMembership: MembershipStatus(
tier: .explorer,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard,
anyName: ""
),
tierToDisplay: .explorer,
showEmailVerification: { _ in }
)
MembershipTierSelectionView(
userMembership: MembershipStatus(
tier: nil,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard,
anyName: ""
),
tierToDisplay: .explorer,
showEmailVerification: { _ in }
)
MembershipTierSelectionView(
userMembership: MembershipStatus(
tier: .explorer,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard,
anyName: ""
),
tierToDisplay: .builder,
showEmailVerification: { _ in }
)
MembershipTierSelectionView(
userMembership: MembershipStatus(
tier: .builder,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: "SonyaBlade"
),
tierToDisplay: .builder,
showEmailVerification: { _ in }
)
}
MembershipTierSelectionView(
userMembership: MembershipStatus(
tier: .builder,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard,
anyName: "SonyaBlade"
),
tierToDisplay: .coCreator,
showEmailVerification: { _ in }
)
MembershipTierSelectionView(
userMembership: MembershipStatus(
tier: .coCreator,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard,
anyName: "SonyaBlade"
),
tierToDisplay: .coCreator,
showEmailVerification: { _ in }
)
}.tabViewStyle(.page)
}
55 changes: 42 additions & 13 deletions ...resentationLayer/Modules/Membership/TierSelection/NameSheet/MembershipNameSheetView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ struct MembershipNameSheetView: View {
@StateObject private var model: MembershipNameSheetViewModel
@State private var name = ""

init(tier: MembershipTier) {
init(tier: MembershipTier, anyName: String) {
_model = StateObject(
wrappedValue: MembershipNameSheetViewModel(tier: tier)
wrappedValue: MembershipNameSheetViewModel(tier: tier, anyName: anyName)
)
}

Expand All @@ -23,16 +23,8 @@ struct MembershipNameSheetView: View {
var content: some View {
VStack(alignment: .leading, spacing: 0) {
Spacer.fixedHeight(26)
AnytypeText(Loc.Membership.NameForm.title, style: .bodySemibold, color: .Text.primary)
Spacer.fixedHeight(6)
AnytypeText(Loc.Membership.NameForm.subtitle, style: .calloutRegular, color: .Text.primary)
Spacer.fixedHeight(10)
HStack {
TextField(Loc.myself, text: $name)
.textContentType(.username)
AnytypeText(".any", style: .bodyRegular, color: .Text.primary)
}
.padding(.vertical, 12)
info
nameInput
.newDivider()
status
AnytypeText("$99 ", style: .title, color: .Text.primary) +
Expand All @@ -50,7 +42,41 @@ struct MembershipNameSheetView: View {
.padding(.horizontal, 20)
}

var info: some View {
Group {
if model.anyName.isEmpty {
AnytypeText(Loc.Membership.NameForm.title, style: .bodySemibold, color: .Text.primary)
Spacer.fixedHeight(6)
AnytypeText(Loc.Membership.NameForm.subtitle, style: .calloutRegular, color: .Text.primary)
Spacer.fixedHeight(10)
}
}
}

var nameInput: some View {
HStack {
if model.anyName.isEmpty {
TextField(Loc.myself, text: $name)
.textContentType(.username)
AnytypeText(".any", style: .bodyRegular, color: .Text.primary)
} else {
AnytypeText(model.anyName, style: .uxBodyRegular, color: .Text.primary)
Spacer()
AnytypeText(".any", style: .bodyRegular, color: .Text.primary)
}
}
.padding(.vertical, 12)
}

var status: some View {
Group {
if model.anyName.isEmpty {
nameStatus
}
}
}

var nameStatus: some View {
HStack {
Spacer()
Group {
Expand All @@ -75,5 +101,8 @@ struct MembershipNameSheetView: View {
}

#Preview {
MembershipNameSheetView(tier: .builder)
TabView {
MembershipNameSheetView(tier: .builder, anyName: "")
MembershipNameSheetView(tier: .coCreator, anyName: "SonyaBlade")
}.tabViewStyle(.page)
}
4 changes: 3 additions & 1 deletion ...tationLayer/Modules/Membership/TierSelection/NameSheet/MembershipNameSheetViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ enum MembershipNameSheetViewState {
@MainActor
final class MembershipNameSheetViewModel: ObservableObject {
@Published var state = MembershipNameSheetViewState.default
let anyName: String

// TODO: use middleware api
var minimumNumberOfCharacters: Int {
Expand All @@ -39,8 +40,9 @@ final class MembershipNameSheetViewModel: ObservableObject {
private let tier: MembershipTier
private var validationTask: Task<(), any Error>?

init(tier: MembershipTier) {
init(tier: MembershipTier, anyName: String) {
self.tier = tier
self.anyName = anyName
}

func validateName(name: String) {
Expand Down
9 changes: 6 additions & 3 deletions ...esentationLayer/Modules/Membership/TierSelection/Views/MembershipOwnerInfoSheetView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,26 @@ struct MembershipOwnerInfoSheetView: View {
tier: .explorer,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodCard
paymentMethod: .methodCard,
anyName: ""
)
)
MembershipOwnerInfoSheetView(
membership: MembershipStatus(
tier: .builder,
status: .pending,
dateEnds: .tomorrow,
paymentMethod: .methodCrypto
paymentMethod: .methodCrypto,
anyName: ""
)
)
MembershipOwnerInfoSheetView(
membership: MembershipStatus(
tier: .coCreator,
status: .active,
dateEnds: .tomorrow,
paymentMethod: .methodAppleInapp
paymentMethod: .methodAppleInapp,
anyName: ""
)
)
}
Expand Down
3 changes: 2 additions & 1 deletion Modules/Services/Sources/Services/Membership/MembershipService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public extension Anytype_Model_Membership {
tier: membershipTier,
status: status,
dateEnds: Date(timeIntervalSince1970: TimeInterval(dateEnds)),
paymentMethod: paymentMethod
paymentMethod: paymentMethod,
anyName: requestedAnyName
)
}

Expand Down
5 changes: 4 additions & 1 deletion Modules/Services/Sources/Services/Membership/Model/MembershipStatus.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,20 @@ public struct MembershipStatus: Equatable {
public let status: MembershipSubscriptionStatus
public let dateEnds: Date
public let paymentMethod: MembershipPaymentMethod
public let anyName: String

public init(
tier: MembershipTier?,
status: MembershipSubscriptionStatus,
dateEnds: Date,
paymentMethod: MembershipPaymentMethod
paymentMethod: MembershipPaymentMethod,
anyName: String
) {
self.tier = tier
self.status = status
self.dateEnds = dateEnds
self.paymentMethod = paymentMethod
self.anyName = anyName
}
}

Loading