-
Notifications
You must be signed in to change notification settings - Fork 315
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.
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
Adds scaffolding for the ButtonComponent. #4348
Open
JayShortway
wants to merge
10
commits into
main
Choose a base branch
from
paywalls-components/button-component-1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+194
−0
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
8324986
Adds scaffolding for the ButtonComponent.
JayShortway 4200f5e
ButtonComponent uses the correct type.
JayShortway 13c48c6
Adds an empty preview
JayShortway 95fe157
Buttons contain text!
JayShortway 857fad6
Removes EmptyView.
JayShortway 62b33f7
Buttons are stacks now
JayShortway 310bee9
Merge branch 'main' into paywalls-components/button-component-1
JayShortway 26fbb79
Merge branch 'main' into paywalls-components/button-component-1
JayShortway 393590a
Makes ButtonComponentViewModel public for PaywallsTester
JayShortway c0f4f73
Merge branch 'main' into paywalls-components/button-component-1
JayShortway File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
RevenueCatUI/Templates/Components/Button/ButtonComponentView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // | ||
| // Copyright RevenueCat Inc. All Rights Reserved. | ||
| // | ||
| // Licensed under the MIT License (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://opensource.org/licenses/MIT | ||
| // | ||
| // ButtonComponentView.swift | ||
| // | ||
| // Created by Jay Shortway on 02/10/2024. | ||
|
|
||
| import Foundation | ||
| import RevenueCat | ||
| import SwiftUI | ||
|
|
||
| #if PAYWALL_COMPONENTS | ||
|
|
||
| @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
| struct ButtonComponentView: View { | ||
|
|
||
| private let viewModel: ButtonComponentViewModel | ||
|
|
||
| internal init(viewModel: ButtonComponentViewModel) { | ||
| self.viewModel = viewModel | ||
| } | ||
|
|
||
| var body: some View { | ||
| StackComponentView(viewModel: viewModel.stackViewModel) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #if DEBUG | ||
|
|
||
| @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
| struct ButtonComponentView_Previews: PreviewProvider { | ||
|
|
||
| static var previews: some View { | ||
| VStack { | ||
| ButtonComponentView( | ||
| // swiftlint:disable:next force_try | ||
| viewModel: try! .init( | ||
| component: .init( | ||
| stack: .init( | ||
| components: [ | ||
| PaywallComponent.text( | ||
| PaywallComponent.TextComponent( | ||
| textLid: "buttonText", | ||
| color: .init(light: "#000000") | ||
| ) | ||
| ) | ||
| ], | ||
| backgroundColor: nil | ||
| ) | ||
| ), | ||
| locale: Locale(identifier: "en_US"), | ||
| localizedStrings: [ | ||
| "buttonText": PaywallComponentsData.LocalizationData.string("Do something") | ||
| ], | ||
| offering: Offering(identifier: "", serverDescription: "", availablePackages: []) | ||
| ) | ||
| ) | ||
| } | ||
| .previewLayout(.fixed(width: 400, height: 400)) | ||
| .previewDisplayName("Default") | ||
| } | ||
| } | ||
|
|
||
| #endif | ||
|
|
||
| #endif |
44 changes: 44 additions & 0 deletions
44
RevenueCatUI/Templates/Components/Button/ButtonComponentViewModel.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // | ||
| // Copyright RevenueCat Inc. All Rights Reserved. | ||
| // | ||
| // Licensed under the MIT License (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://opensource.org/licenses/MIT | ||
| // | ||
| // ButtonComponentViewModel.swift | ||
| // | ||
| // Created by Jay Shortway on 02/10/2024. | ||
| // | ||
| // swiftlint:disable missing_docs | ||
|
|
||
| import Foundation | ||
| import RevenueCat | ||
|
|
||
| #if PAYWALL_COMPONENTS | ||
|
|
||
| @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
| public class ButtonComponentViewModel { | ||
|
|
||
| private let component: PaywallComponent.ButtonComponent | ||
| let stackViewModel: StackComponentViewModel | ||
|
|
||
| init( | ||
| component: PaywallComponent.ButtonComponent, | ||
| locale: Locale, | ||
| localizedStrings: PaywallComponent.LocalizationDictionary, | ||
| offering: Offering | ||
| ) throws { | ||
| self.component = component | ||
| self.stackViewModel = try StackComponentViewModel( | ||
| locale: locale, | ||
| component: component.stack, | ||
| localizedStrings: localizedStrings, | ||
| offering: offering | ||
| ) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // | ||
| // Copyright RevenueCat Inc. All Rights Reserved. | ||
| // | ||
| // Licensed under the MIT License (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://opensource.org/licenses/MIT | ||
| // | ||
| // PaywallButtonComponent.swift | ||
| // | ||
| // Created by Jay Shortway on 02/10/2024. | ||
| // | ||
| // swiftlint:disable missing_docs | ||
|
|
||
| import Foundation | ||
|
|
||
| #if PAYWALL_COMPONENTS | ||
|
|
||
| public extension PaywallComponent { | ||
|
|
||
| struct ButtonComponent: PaywallComponentBase { | ||
|
|
||
| let type: ComponentType | ||
| public let stack: PaywallComponent.StackComponent | ||
|
|
||
| public init( | ||
| stack: PaywallComponent.StackComponent | ||
| ) { | ||
| self.type = .button | ||
| self.stack = stack | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| #endif | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So in my packages PRs, I have that
StackableComponentprotocol (see here) that does a similar thing to this 🤔But instead of the
ButtonComponenthaving a stack, it would make theButtonComponentbehave like a stack.I know we don't
StackableComponentin this branch yet but we should probably make sure we do the same approach for all the things 😇I do think this having a stack looks a lot cleaner in the code! 🫶 However, it does make the JSON data structure of the
ButtonComponentmore nesty...vs
Any thoughts? 😇
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yes, making it "have" a stack was a bit WIPpy to just get the idea out of my head and onto "paper" haha. Can definitely be changed still! If we want it to be a
StackableComponent, I'll wait until your branch is merged.I don't have a very strong opinion on this, but I do have some counter arguments we might wanna consider:
What do you think?