-
Notifications
You must be signed in to change notification settings - Fork 496
feat(auth): add environment-driven theming for text fields, CTA buttons and typography #1402
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
Open
demolaf
wants to merge
8
commits into
main
Choose a base branch
from
auth/theming
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.
+488
−154
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c2de65d
Adjust EmailAuthView label font weights and drop hardcoded blue tint …
demolaf 91501d5
Add AuthTextFieldStyle and AuthCTAButtonStyle for environment-driven …
demolaf af4d015
Add AuthTypography for environment-driven custom font family, and clo…
demolaf bb91a07
fix(auth): apply AuthTypography to typed text and the authenticating …
demolaf 0922a3b
feat(auth): re-export FirebaseAuthUIComponents from FirebaseAuthSwiftUI
demolaf 2f38c67
fix(auth): avoid double Dynamic Type scaling for custom font families
demolaf be94baa
fix(auth): address review findings on theming defaults and API surface
demolaf afdb668
fix(auth): apply AuthTextFieldStyle to the verification code input
demolaf 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // Copyright 2025 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // FirebaseAuthUIComponents is not a library product, so re-export it to make | ||
| // AuthTextFieldStyle and AuthTypography reachable from `import FirebaseAuthSwiftUI`. | ||
| @_exported import FirebaseAuthUIComponents |
108 changes: 108 additions & 0 deletions
108
FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthCTAButtonModifier.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,108 @@ | ||
| // Copyright 2025 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import FirebaseAuthUIComponents | ||
| import SwiftUI | ||
|
|
||
| /// Styling configuration for the primary call-to-action buttons used throughout the auth flow | ||
| /// (sign in, send code, update password, etc). All fields default to `nil`, in which case | ||
| /// today's exact appearance is unchanged — including `backgroundColor`, which otherwise already | ||
| /// follows the environment's `.tint()` via `.buttonStyle(.borderedProminent)`; setting it here | ||
| /// overrides that for CTA buttons specifically, without affecting `.tint()` elsewhere. | ||
| public struct AuthCTAButtonStyle: Sendable { | ||
| public var backgroundColor: Color? | ||
| public var contentColor: Color? | ||
| public var shape: ButtonBorderShape? | ||
| public var font: Font? | ||
|
|
||
| public init(backgroundColor: Color? = nil, | ||
| contentColor: Color? = nil, | ||
| shape: ButtonBorderShape? = nil, | ||
| font: Font? = nil) { | ||
| self.backgroundColor = backgroundColor | ||
| self.contentColor = contentColor | ||
| self.shape = shape | ||
| self.font = font | ||
| } | ||
|
|
||
| public static let `default` = AuthCTAButtonStyle() | ||
| } | ||
|
|
||
| private struct AuthCTAButtonStyleKey: EnvironmentKey { | ||
| static let defaultValue: AuthCTAButtonStyle = .default | ||
| } | ||
|
|
||
| public extension EnvironmentValues { | ||
| var authCTAButtonStyle: AuthCTAButtonStyle { | ||
| get { self[AuthCTAButtonStyleKey.self] } | ||
| set { self[AuthCTAButtonStyleKey.self] = newValue } | ||
| } | ||
| } | ||
|
|
||
| /// Applies `.buttonStyle(.borderedProminent)` plus the colors/shape/font from the environment's | ||
| /// ``AuthCTAButtonStyle``, in place of a bare `.buttonStyle(.borderedProminent)` call. When | ||
| /// `style.font` is left unset, the button falls back to ``AuthTypography`` (via `.authFont(_:)`) | ||
| /// so it stays consistent with the rest of the auth flow's typography by default — an explicit | ||
| /// `style.font` still overrides that, for buttons that should intentionally look different. | ||
| struct AuthCTAButtonModifier: ViewModifier { | ||
| @Environment(\.authCTAButtonStyle) private var style | ||
|
|
||
| func body(content: Content) -> some View { | ||
| Group { | ||
| if let contentColor = style.contentColor { | ||
| content.foregroundStyle(contentColor) | ||
| } else { | ||
| content | ||
| } | ||
| } | ||
| .buttonStyle(.borderedProminent) | ||
| .buttonBorderShape(style.shape ?? .automatic) | ||
| .tint(style.backgroundColor) | ||
| .modifier(CTAFontModifier(explicitFont: style.font)) | ||
| } | ||
| } | ||
|
|
||
| private struct CTAFontModifier: ViewModifier { | ||
| let explicitFont: Font? | ||
|
|
||
| func body(content: Content) -> some View { | ||
| if let explicitFont { | ||
| content.font(explicitFont) | ||
| } else { | ||
| content.authFont(.body) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension View { | ||
| /// Applies the auth flow's primary call-to-action button styling, reading colors/shape/font | ||
| /// from the environment's ``AuthCTAButtonStyle`` (set via `.authCTAButtonStyle(_:)`). | ||
| func authCTAButtonStyle() -> some View { | ||
| modifier(AuthCTAButtonModifier()) | ||
| } | ||
| } | ||
|
|
||
| public extension View { | ||
| /// Sets the ``AuthCTAButtonStyle`` used by every CTA button in this view's subtree. | ||
| /// | ||
| /// ```swift | ||
| /// AuthPickerView { ... } | ||
| /// .authCTAButtonStyle( | ||
| /// AuthCTAButtonStyle(backgroundColor: theme.colors.tint, contentColor: .white, shape: .capsule) | ||
| /// ) | ||
| /// ``` | ||
| func authCTAButtonStyle(_ style: AuthCTAButtonStyle) -> some View { | ||
| environment(\.authCTAButtonStyle, style) | ||
| } | ||
| } | ||
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
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.
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.