-
Notifications
You must be signed in to change notification settings - Fork 417
Add PaywallsV2 header component #6548
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
5f17cb0
Add PaywallsV2 header component
facumenzella b3dbf1c
Fix file author headers
facumenzella 239cda8
Make HeaderComponent fully public, matching StickyFooterComponent
facumenzella b6e83db
Complete full spec for HeaderComponent
facumenzella 490dee2
Add HeaderComponent containsUnsupportedConditions tests
facumenzella 95e28db
Keep header internal and overlay it above body
facumenzella dbcd897
Merge branch 'main' of github.com:RevenueCat/purchases-ios into feat/…
facumenzella f80d0e4
Fix header component overlaying body content correctly
facumenzella 7f76cf4
Fix bottom safe area padding condition in RootView
facumenzella 65b6f1c
Avoid ignoring top safe area when header is present
facumenzella 2e367fb
Merge branch 'main' into feat/paywalls-v2-header-component
facumenzella ea6f7e3
Merge branch 'main' into feat/paywalls-v2-header-component
facumenzella 46cc885
Fix paywalls v2 header safe area handling
facumenzella 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 hidden or 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
50 changes: 50 additions & 0 deletions
50
RevenueCatUI/Templates/V2/Components/Header/HeaderComponentView.swift
This file contains hidden or 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,50 @@ | ||
| // | ||
| // 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 | ||
| // | ||
| // HeaderComponentView.swift | ||
| // | ||
| // Created by Facundo Menzella on 02/04/2026. | ||
|
|
||
| import SwiftUI | ||
|
|
||
| #if !os(tvOS) // For Paywalls V2 | ||
|
|
||
| @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
| struct HeaderComponentView: View { | ||
|
|
||
| @Environment(\.safeAreaInsets) | ||
| private var safeAreaInsets | ||
|
|
||
| private let viewModel: HeaderComponentViewModel | ||
| private let onDismiss: () -> Void | ||
|
|
||
| init( | ||
| viewModel: HeaderComponentViewModel, | ||
| onDismiss: @escaping () -> Void | ||
| ) { | ||
| self.viewModel = viewModel | ||
| self.onDismiss = onDismiss | ||
| } | ||
|
|
||
| var body: some View { | ||
| StackComponentView( | ||
| viewModel: self.viewModel.stackViewModel, | ||
| onDismiss: self.onDismiss, | ||
| additionalPadding: .init( | ||
| top: self.viewModel.firstItemIgnoresSafeArea ? 0 : self.safeAreaInsets.top, | ||
| leading: 0, | ||
| bottom: 0, | ||
| trailing: 0 | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #endif |
38 changes: 38 additions & 0 deletions
38
RevenueCatUI/Templates/V2/Components/Header/HeaderComponentViewModel.swift
This file contains hidden or 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 | ||
| // | ||
| // HeaderComponentViewModel.swift | ||
| // | ||
| // Created by Facundo Menzella on 02/04/2026. | ||
|
|
||
| @_spi(Internal) import RevenueCat | ||
| import SwiftUI | ||
|
|
||
| #if !os(tvOS) // For Paywalls V2 | ||
|
|
||
| @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) | ||
| class HeaderComponentViewModel { | ||
|
|
||
| let component: PaywallComponent.HeaderComponent | ||
| let stackViewModel: StackComponentViewModel | ||
| let firstItemIgnoresSafeArea: Bool | ||
|
|
||
| init( | ||
| component: PaywallComponent.HeaderComponent, | ||
| stackViewModel: StackComponentViewModel, | ||
| firstItemIgnoresSafeArea: Bool | ||
| ) { | ||
| self.component = component | ||
| self.stackViewModel = stackViewModel | ||
| self.firstItemIgnoresSafeArea = firstItemIgnoresSafeArea | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #endif |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.