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-2395 Membership | Support tiers without names #1144

Merged
merged 2 commits into from
Apr 8, 2024
Merged

iOS-2395 Membership | Support tiers without names #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e63af72
IOS-2395 Fix redundant logs
ignatovv Apr 5, 2024
a59bed2
IOS-2395 Support tiers without names
ignatovv Apr 5, 2024
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
16 changes: 16 additions & 0 deletions Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipTierExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,20 @@ extension MembershipTier {
color: .purple
)
}

static var mockBuilderTest: MembershipTier {
MembershipTier(
type: .custom(id: 1337),
name: "Builder TEST",
anyName: .none,
features: [
Loc.Membership.Feature.storageGB(128),
Loc.Membership.Feature.sharedSpaces(3),
Loc.Membership.Feature.spaceWriters(10),
Loc.Membership.Feature.viewers("Unlimited")
],
paymentType: .mockExternal,
color: .blue
)
}
}
49 changes: 33 additions & 16 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 @@ -24,9 +24,7 @@ struct MembershipNameSheetView: View {
VStack(alignment: .leading, spacing: 0) {
Spacer.fixedHeight(26)
info
nameInput
.newDivider()
status
nameView
AnytypeText("\(model.tier.paymentType.displayPrice ?? "") ", style: .title, color: .Text.primary) +
AnytypeText(model.tier.paymentType.localizedPeriod ?? "", style: .relation1Regular, color: .Text.primary)
Spacer.fixedHeight(15)
Expand All @@ -35,6 +33,7 @@ struct MembershipNameSheetView: View {
style: .primaryLarge
) {
// TODO: Pay
// Support Test tiers without name and tiers if name already purchased
}
.disabled(!model.state.isValidated)
Spacer.fixedHeight(20)
Expand All @@ -44,7 +43,10 @@ struct MembershipNameSheetView: View {

var info: some View {
Group {
if model.anyName.isEmpty {
switch model.anyNameAvailability {
case .notAvailable, .alreadyBought:
EmptyView()
case .availableForPruchase:
AnytypeText(Loc.Membership.NameForm.title, style: .bodySemibold, color: .Text.primary)
Spacer.fixedHeight(6)
AnytypeText(Loc.Membership.NameForm.subtitle, style: .calloutRegular, color: .Text.primary)
Expand All @@ -53,27 +55,41 @@ struct MembershipNameSheetView: View {
}
}

var nameView: some View {
Group {
switch model.anyNameAvailability {
case .notAvailable:
EmptyView()
case .availableForPruchase:
nameInput
case .alreadyBought:
nameLabel
}
}
}

var nameInput: some View {
HStack {
if model.anyName.isEmpty {
VStack(spacing: 0) {
HStack {
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)
.newDivider()

nameStatus
}
.padding(.vertical, 12)
}

var status: some View {
Group {
if model.anyName.isEmpty {
nameStatus
}
var nameLabel: some View {
HStack {
AnytypeText(model.anyName, style: .uxBodyRegular, color: .Text.primary)
Spacer()
AnytypeText(".any", style: .bodyRegular, color: .Text.primary)
}
.padding(.vertical, 12)
.newDivider()
}

var nameStatus: some View {
Expand Down Expand Up @@ -104,5 +120,6 @@ struct MembershipNameSheetView: View {
TabView {
MembershipNameSheetView(tier: .mockBuilder, anyName: "")
MembershipNameSheetView(tier: .mockCoCreator, anyName: "SonyaBlade")
MembershipNameSheetView(tier: .mockBuilderTest, anyName: "")
}.tabViewStyle(.page)
}
21 changes: 20 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 @@ -18,12 +18,31 @@ enum MembershipNameSheetViewState {
}
}

enum MembershipAnyNameAvailability {
case notAvailable
case availableForPruchase
case alreadyBought
}


@MainActor
final class MembershipNameSheetViewModel: ObservableObject {
@Published var state = MembershipNameSheetViewState.default
let anyName: String
let tier: MembershipTier
let anyName: String

var anyNameAvailability: MembershipAnyNameAvailability {
switch tier.anyName {
case .none:
.notAvailable
case .some:
if anyName.isEmpty {
.availableForPruchase
} else {
.alreadyBought
}
}
}

var minimumNumberOfCharacters: UInt32 {
switch tier.anyName {
Expand Down
2 changes: 1 addition & 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 @@ -74,7 +74,7 @@ final class MembershipService: MembershipServiceProtocol {
public func verifyEmailCode(code: String) async throws {
try await ClientCommands.membershipVerifyEmailCode(.with {
$0.code = code
}).invoke()
}).invoke(ignoreLogErrors: .wrong)
}

public func validateName(name: String, tierType: MembershipTierType) async throws {
Expand Down
Loading