diff --git a/Anytype.xcodeproj/project.pbxproj b/Anytype.xcodeproj/project.pbxproj index c95d33af8f..ab326462bd 100644 --- a/Anytype.xcodeproj/project.pbxproj +++ b/Anytype.xcodeproj/project.pbxproj @@ -1239,7 +1239,7 @@ 3D5D0C5C2B8CAEA2005DB879 /* TypeSearchForNewObjectCoordinatorAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D0C5B2B8CAEA2005DB879 /* TypeSearchForNewObjectCoordinatorAssembly.swift */; }; 3D5D0C5E2B8CBC28005DB879 /* TypeSearchForNewObjectCoordinatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D0C5D2B8CBC28005DB879 /* TypeSearchForNewObjectCoordinatorView.swift */; }; 3D5D0C602B8CBC37005DB879 /* TypeSearchForNewObjectCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D0C5F2B8CBC37005DB879 /* TypeSearchForNewObjectCoordinatorViewModel.swift */; }; - 3D611E8E2B936B8300B33305 /* MembershipTeirView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D611E8D2B936B8300B33305 /* MembershipTeirView.swift */; }; + 3D611E8E2B936B8300B33305 /* MembershipTierView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D611E8D2B936B8300B33305 /* MembershipTierView.swift */; }; 3D611E902B93727700B33305 /* MembershipTeirGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D611E8F2B93727700B33305 /* MembershipTeirGradient.swift */; }; 3D611E932B93775B00B33305 /* MembershipTierListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D611E922B93775B00B33305 /* MembershipTierListView.swift */; }; 3D611E962B93779900B33305 /* MembershipTierExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D611E952B93779900B33305 /* MembershipTierExtensions.swift */; }; @@ -1324,7 +1324,7 @@ 3DB881362B9A7002009B294F /* MembershipOwnerInfoSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB881352B9A7002009B294F /* MembershipOwnerInfoSheetView.swift */; }; 3DB92F85264BF69900E83276 /* View+CornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB92F84264BF69900E83276 /* View+CornerRadius.swift */; }; 3DB92FA6264D8B0100E83276 /* SettingsSectionItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB92FA3264D8B0100E83276 /* SettingsSectionItemView.swift */; }; - 3DB9351E2BC4574D0004113B /* MembershipTeirViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9351D2BC4574C0004113B /* MembershipTeirViewModel.swift */; }; + 3DB9351E2BC4574D0004113B /* MembershipTierViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9351D2BC4574C0004113B /* MembershipTierViewModel.swift */; }; 3DB98100274E86AA00ECC882 /* Array+Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB980FF274E86AA00ECC882 /* Array+Emoji.swift */; }; 3DB981222750E2BA00ECC882 /* Comparable+Clamped.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DB981212750E2BA00ECC882 /* Comparable+Clamped.swift */; }; 3DBE2404262F04AA0065E9B6 /* Binding+OnChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBE2403262F04AA0065E9B6 /* Binding+OnChange.swift */; }; @@ -3008,7 +3008,7 @@ 3D5D0C5B2B8CAEA2005DB879 /* TypeSearchForNewObjectCoordinatorAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeSearchForNewObjectCoordinatorAssembly.swift; sourceTree = ""; }; 3D5D0C5D2B8CBC28005DB879 /* TypeSearchForNewObjectCoordinatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeSearchForNewObjectCoordinatorView.swift; sourceTree = ""; }; 3D5D0C5F2B8CBC37005DB879 /* TypeSearchForNewObjectCoordinatorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeSearchForNewObjectCoordinatorViewModel.swift; sourceTree = ""; }; - 3D611E8D2B936B8300B33305 /* MembershipTeirView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTeirView.swift; sourceTree = ""; }; + 3D611E8D2B936B8300B33305 /* MembershipTierView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTierView.swift; sourceTree = ""; }; 3D611E8F2B93727700B33305 /* MembershipTeirGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTeirGradient.swift; sourceTree = ""; }; 3D611E922B93775B00B33305 /* MembershipTierListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTierListView.swift; sourceTree = ""; }; 3D611E952B93779900B33305 /* MembershipTierExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTierExtensions.swift; sourceTree = ""; }; @@ -3092,7 +3092,7 @@ 3DB881352B9A7002009B294F /* MembershipOwnerInfoSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipOwnerInfoSheetView.swift; sourceTree = ""; }; 3DB92F84264BF69900E83276 /* View+CornerRadius.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+CornerRadius.swift"; sourceTree = ""; }; 3DB92FA3264D8B0100E83276 /* SettingsSectionItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsSectionItemView.swift; sourceTree = ""; }; - 3DB9351D2BC4574C0004113B /* MembershipTeirViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTeirViewModel.swift; sourceTree = ""; }; + 3DB9351D2BC4574C0004113B /* MembershipTierViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipTierViewModel.swift; sourceTree = ""; }; 3DB980FF274E86AA00ECC882 /* Array+Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+Emoji.swift"; sourceTree = ""; }; 3DB981212750E2BA00ECC882 /* Comparable+Clamped.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Comparable+Clamped.swift"; sourceTree = ""; }; 3DBE2403262F04AA0065E9B6 /* Binding+OnChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Binding+OnChange.swift"; sourceTree = ""; }; @@ -9016,13 +9016,13 @@ path = Sections; sourceTree = ""; }; - 3DB9351C2BC4573E0004113B /* MembershipTeirView */ = { + 3DB9351C2BC4573E0004113B /* MembershipTierView */ = { isa = PBXGroup; children = ( - 3D611E8D2B936B8300B33305 /* MembershipTeirView.swift */, - 3DB9351D2BC4574C0004113B /* MembershipTeirViewModel.swift */, + 3D611E8D2B936B8300B33305 /* MembershipTierView.swift */, + 3DB9351D2BC4574C0004113B /* MembershipTierViewModel.swift */, ); - path = MembershipTeirView; + path = MembershipTierView; sourceTree = ""; }; 3DB980FB274E868800ECC882 /* Model */ = { @@ -9090,7 +9090,7 @@ 3DD0CEB72B90ACBE00657402 /* Views */ = { isa = PBXGroup; children = ( - 3DB9351C2BC4573E0004113B /* MembershipTeirView */, + 3DB9351C2BC4573E0004113B /* MembershipTierView */, 3DD0CEB82B90ACED00657402 /* MembershipLegalButton.swift */, 3DD0CEBA2B90E6BB00657402 /* MembershipBannerView.swift */, 3D611E922B93775B00B33305 /* MembershipTierListView.swift */, @@ -10688,7 +10688,7 @@ 2ACD86F429C309AA0082E861 /* WidgetTypeChangeViewModel.swift in Sources */, 2AFCEB3929C8A25900841E13 /* CollectionsSubscriptionService.swift in Sources */, 53728CFB273596750092A8CF /* MarkupKind.swift in Sources */, - 3D611E8E2B936B8300B33305 /* MembershipTeirView.swift in Sources */, + 3D611E8E2B936B8300B33305 /* MembershipTierView.swift in Sources */, C97A9A19287300080032DE3E /* SimpleTableMenuView.swift in Sources */, 2A5025122BC01C6400A141B8 /* EmojiIconView.swift in Sources */, 2A43EAC72A98A18500DA4AAE /* QuickActionShortcutBuilder.swift in Sources */, @@ -11814,7 +11814,7 @@ 1244791427D8A37000581174 /* NewSearchView.swift in Sources */, 2A0B7151297697230003B1C5 /* HomeEditButtonStyle.swift in Sources */, 3DF418BB2B7CEF8B00C414D6 /* WidgetSwipeTip.swift in Sources */, - 3DB9351E2BC4574D0004113B /* MembershipTeirViewModel.swift in Sources */, + 3DB9351E2BC4574D0004113B /* MembershipTierViewModel.swift in Sources */, 2AD7412E2993E1EF004BD223 /* HomeWidgetCommonProviderAssembly.swift in Sources */, C9CD66A427EAFD3E001F1860 /* GridItemViewModel.swift in Sources */, 2E7C44672892CFCA0062287C /* SetFiltersDateRowView.swift in Sources */, diff --git a/Anytype/Sources/Design system/Colors/Gradients/MembershipTeirGradient.swift b/Anytype/Sources/Design system/Colors/Gradients/MembershipTeirGradient.swift index af58bb7941..01c527a29c 100644 --- a/Anytype/Sources/Design system/Colors/Gradients/MembershipTeirGradient.swift +++ b/Anytype/Sources/Design system/Colors/Gradients/MembershipTeirGradient.swift @@ -1,6 +1,6 @@ import SwiftUI -enum MembershipTeirGradient: String { +enum MembershipTierGradient: String { case teal case blue case red @@ -20,7 +20,7 @@ enum MembershipTeirGradient: String { } } -extension MembershipTeirGradient: View { +extension MembershipTierGradient: View { var body: some View { LinearGradient( stops: [ @@ -34,5 +34,5 @@ extension MembershipTeirGradient: View { } #Preview { - MembershipTeirGradient.teal + MembershipTierGradient.teal } diff --git a/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierListView.swift b/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierListView.swift index 5cccab1ac6..71bc0f8632 100644 --- a/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierListView.swift +++ b/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierListView.swift @@ -14,7 +14,7 @@ struct MembershipTierListView: View { Spacer.fixedWidth(0) ForEach(tiers) { tier in - MembershipTeirView(tierToDisplay: tier) { + MembershipTierView(tierToDisplay: tier) { onTierTap(tier) } .id(tier) diff --git a/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView/MembershipTeirView.swift b/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierView/MembershipTierView.swift similarity index 80% rename from Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView/MembershipTeirView.swift rename to Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierView/MembershipTierView.swift index c7e2259f17..99284073b6 100644 --- a/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView/MembershipTeirView.swift +++ b/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierView/MembershipTierView.swift @@ -2,8 +2,8 @@ import SwiftUI import Services -struct MembershipTeirView: View { - @StateObject private var model: MembershipTeirViewModel +struct MembershipTierView: View { + @StateObject private var model: MembershipTierViewModel @Environment(\.colorScheme) private var colorScheme @@ -12,7 +12,7 @@ struct MembershipTeirView: View { onTap: @escaping () -> Void ) { _model = StateObject( - wrappedValue: MembershipTeirViewModel( + wrappedValue: MembershipTierViewModel( tierToDisplay: tierToDisplay, onTap: onTap ) @@ -128,10 +128,10 @@ struct MembershipTeirView: View { ) } content: { HStack { - MembershipTeirView(tierToDisplay: .mockExplorer, onTap: { }) - MembershipTeirView(tierToDisplay: .mockBuilder, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCoCreator, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCustom, onTap: { }) + MembershipTierView(tierToDisplay: .mockExplorer, onTap: { }) + MembershipTierView(tierToDisplay: .mockBuilder, onTap: { }) + MembershipTierView(tierToDisplay: .mockCoCreator, onTap: { }) + MembershipTierView(tierToDisplay: .mockCustom, onTap: { }) } } } @@ -149,10 +149,10 @@ struct MembershipTeirView: View { ) } content: { HStack { - MembershipTeirView(tierToDisplay: .mockExplorer, onTap: { }) - MembershipTeirView(tierToDisplay: .mockBuilder, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCoCreator, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCustom, onTap: { }) + MembershipTierView(tierToDisplay: .mockExplorer, onTap: { }) + MembershipTierView(tierToDisplay: .mockBuilder, onTap: { }) + MembershipTierView(tierToDisplay: .mockCoCreator, onTap: { }) + MembershipTierView(tierToDisplay: .mockCustom, onTap: { }) } } } @@ -170,10 +170,10 @@ struct MembershipTeirView: View { ) } content: { HStack { - MembershipTeirView(tierToDisplay: .mockExplorer, onTap: { }) - MembershipTeirView(tierToDisplay: .mockBuilder, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCoCreator, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCustom, onTap: { }) + MembershipTierView(tierToDisplay: .mockExplorer, onTap: { }) + MembershipTierView(tierToDisplay: .mockBuilder, onTap: { }) + MembershipTierView(tierToDisplay: .mockCoCreator, onTap: { }) + MembershipTierView(tierToDisplay: .mockCustom, onTap: { }) } } } @@ -191,10 +191,10 @@ struct MembershipTeirView: View { ) } content: { HStack { - MembershipTeirView(tierToDisplay: .mockExplorer, onTap: { }) - MembershipTeirView(tierToDisplay: .mockBuilder, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCoCreator, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCustom, onTap: { }) + MembershipTierView(tierToDisplay: .mockExplorer, onTap: { }) + MembershipTierView(tierToDisplay: .mockBuilder, onTap: { }) + MembershipTierView(tierToDisplay: .mockCoCreator, onTap: { }) + MembershipTierView(tierToDisplay: .mockCustom, onTap: { }) } } } @@ -212,10 +212,10 @@ struct MembershipTeirView: View { ) } content: { HStack { - MembershipTeirView(tierToDisplay: .mockExplorer, onTap: { }) - MembershipTeirView(tierToDisplay: .mockBuilder, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCoCreator, onTap: { }) - MembershipTeirView(tierToDisplay: .mockCustom, onTap: { }) + MembershipTierView(tierToDisplay: .mockExplorer, onTap: { }) + MembershipTierView(tierToDisplay: .mockBuilder, onTap: { }) + MembershipTierView(tierToDisplay: .mockCoCreator, onTap: { }) + MembershipTierView(tierToDisplay: .mockCustom, onTap: { }) } } } diff --git a/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView/MembershipTeirViewModel.swift b/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierView/MembershipTierViewModel.swift similarity index 91% rename from Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView/MembershipTeirViewModel.swift rename to Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierView/MembershipTierViewModel.swift index 332533439f..86666e7683 100644 --- a/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTeirView/MembershipTeirViewModel.swift +++ b/Anytype/Sources/PresentationLayer/Modules/Membership/InitialScreen/Views/MembershipTierView/MembershipTierViewModel.swift @@ -1,7 +1,7 @@ import Services import SwiftUI -enum MembershipTeirViewState { +enum MembershipTierViewState { case owned case pending case unowned @@ -16,9 +16,9 @@ enum MembershipTeirViewState { } @MainActor -final class MembershipTeirViewModel: ObservableObject { +final class MembershipTierViewModel: ObservableObject { - @Published var state: MembershipTeirViewState = .owned + @Published var state: MembershipTierViewState = .owned @Published var userMembership: MembershipStatus = .empty let tierToDisplay: MembershipTier diff --git a/Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipTierExtensions.swift b/Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipTierExtensions.swift index 868b831893..378f2adb92 100644 --- a/Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipTierExtensions.swift +++ b/Anytype/Sources/PresentationLayer/Modules/Membership/Models/MembershipTierExtensions.swift @@ -44,7 +44,7 @@ extension MembershipTier { } } - var gradient: MembershipTeirGradient { + var gradient: MembershipTierGradient { switch color { case .green: .teal