Skip to content

Commit

Permalink
IOS-2395 Update middleware
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatovv committed Apr 2, 2024
1 parent 1d5222d commit b6344d2
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 286 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ extension MembershipTier {
}
}

var featureDescriptions: [String] {
var featureDescriptions = [anyName.description]
featureDescriptions.append(contentsOf: features.map(\.description))
return featureDescriptions
}

var successMessage: String {
switch self.type {
case .explorer:
Expand All @@ -73,44 +67,6 @@ extension MembershipTier {
}
}

extension MembershipAnyName {
var description: String {
switch self {
case .none:
Loc.Membership.Feature.localName
case .some(let minLenght):
Loc.Membership.Feature.uniqueName(minLenght)
}
}
}

extension MembershipFeature {
var description: String {
switch self {
case .storageGbs(let value):
Loc.Membership.Feature.storageGB(value)
case .invites(let value):
Loc.Membership.Feature.invites(value)
case .spaceWriters(let value):
Loc.Membership.Feature.spaceWriters(value)
case .spaceReaders(let value):
switch value {
case .int(let intValue):
if intValue >= 1024 { // Middleware understanding of Unlimited
Loc.Membership.Feature.unlimitedViewers
} else {
Loc.Membership.Feature.viewers(intValue)
}
case .string(let stringValue):
Loc.Membership.Feature.viewers(stringValue)
}
case .sharedSpaces(let value):
Loc.Membership.Feature.sharedSpaces(value)
}
}
}


// MARK: - Mocks
extension MembershipTier {
static var mockExplorer: MembershipTier {
Expand All @@ -119,10 +75,10 @@ extension MembershipTier {
name: "Explorer",
anyName: .none,
features: [
.storageGbs(.int(1)),
.sharedSpaces(.int(3)),
.spaceWriters(.int(3)),
.spaceReaders(.int(3))
Loc.Membership.Feature.storageGB(1),
Loc.Membership.Feature.sharedSpaces(3),
Loc.Membership.Feature.spaceWriters(3),
Loc.Membership.Feature.viewers(3)
]
)
}
Expand All @@ -133,10 +89,10 @@ extension MembershipTier {
name: "Builder",
anyName: .some(minLenght: 7),
features: [
.storageGbs(.int(128)),
.sharedSpaces(.int(3)),
.spaceWriters(.int(10)),
.spaceReaders(.int(1024))
Loc.Membership.Feature.storageGB(128),
Loc.Membership.Feature.sharedSpaces(3),
Loc.Membership.Feature.spaceWriters(10),
Loc.Membership.Feature.viewers("Unlimited")
]
)
}
Expand All @@ -147,10 +103,10 @@ extension MembershipTier {
name: "CockCreator",
anyName: .some(minLenght: 5),
features: [
.storageGbs(.int(256)),
.sharedSpaces(.int(3)),
.spaceWriters(.int(10)),
.spaceReaders(.int(1024))
Loc.Membership.Feature.storageGB(256),
Loc.Membership.Feature.sharedSpaces(3),
Loc.Membership.Feature.spaceWriters(10),
Loc.Membership.Feature.viewers("Unlimited")
]
)
}
Expand All @@ -161,10 +117,10 @@ extension MembershipTier {
name: "Na-Baron",
anyName: .some(minLenght: 3),
features: [
.storageGbs(.int(2560)),
.sharedSpaces(.int(333)),
.spaceWriters(.int(100)),
.spaceReaders(.int(1024)),
Loc.Membership.Feature.storageGB(2560),
Loc.Membership.Feature.sharedSpaces(333),
Loc.Membership.Feature.spaceWriters(100),
Loc.Membership.Feature.viewers("Unlimited")
]
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct MembershipTierInfoView: View {
VStack(alignment: .leading, spacing: 0) {
AnytypeText(Loc.whatSIncluded, style: .calloutRegular, color: .Text.secondary)
Spacer.fixedHeight(6)
ForEach(tier.featureDescriptions, id: \.self) { feature in
ForEach(tier.features, id: \.self) { feature in
HStack(spacing: 8) {
Image(asset: .System.textCheckMark)
.frame(width: 16, height: 16)
Expand Down
2 changes: 1 addition & 1 deletion Libraryfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MIDDLE_VERSION=v0.33.0-rc6
MIDDLE_VERSION=v0.33.0-rc7
Loading

0 comments on commit b6344d2

Please sign in to comment.