[Identity] Gracefully handle non-material themes.#11583
Draft
carlosmuvi-stripe wants to merge 4 commits intomasterfrom
Draft
[Identity] Gracefully handle non-material themes.#11583carlosmuvi-stripe wants to merge 4 commits intomasterfrom
carlosmuvi-stripe wants to merge 4 commits intomasterfrom
Conversation
Contributor
|
Risky Change This is considered a risky change because it adjusts the sample app build.gradle, please review carefully. By adding the label |
carlosmuvi-stripe
changed the title
Comment on lines
+57
to
+65
| create("appcompat") { | ||
| manifestPlaceholders["appTheme"] = "@style/Theme.AppCompatTest" | ||
| manifestPlaceholders["appIcon"] = "@drawable/merchant_logo_purple" | ||
| manifestPlaceholders["appIconRound"] = "@drawable/merchant_logo_purple" | ||
|
|
||
| dimension = "theme" | ||
| applicationIdSuffix = ".appcompat" | ||
| versionNameSuffix = "-appcompat" | ||
| } |
Contributor
Author
There was a problem hiding this comment.
to test non-material theming, now you can use
./gradlew :identity-example:installAppcompatDebug
Contributor
|
Diffuse output: APKDEXARSC |
Comment on lines
183
to
214
| @Composable | ||
| private fun detectHostThemeType(): HostThemeType { | ||
| val context = LocalContext.current | ||
|
|
||
| val isMaterialTheme = remember { | ||
| runCatching { | ||
| context.obtainStyledAttributes(MaterialR.styleable.ThemeAdapterMaterialTheme).use { ta -> | ||
| ta.hasValue(MaterialR.styleable.ThemeAdapterMaterialTheme_isMaterialTheme) | ||
| } | ||
| }.getOrDefault(false) | ||
| } | ||
|
|
||
| val isMaterial3Theme = remember { | ||
| runCatching { | ||
| context.obtainStyledAttributes(Material3R.styleable.ThemeAdapterMaterial3Theme).use { ta -> | ||
| ta.hasValue(Material3R.styleable.ThemeAdapterMaterial3Theme_isMaterial3Theme) | ||
| } | ||
| }.getOrDefault(false) | ||
| } | ||
|
|
||
| return when { | ||
| isMaterialTheme -> HostThemeType.MaterialComponents | ||
| isMaterial3Theme -> HostThemeType.Material3 | ||
| else -> HostThemeType.AppCompat | ||
| } | ||
| } | ||
|
|
||
| private enum class HostThemeType { | ||
| MaterialComponents, | ||
| Material3, | ||
| AppCompat | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Extracted this from payments. Cannot move to a shared module (stripe-ui-core) since it requires mdc / material theming related dependencies that other SDKs might not use.
Comment on lines
+64
to
+68
| val defaultParameters = ThemeParameters( | ||
| colors = MaterialTheme.colors, | ||
| typography = MaterialTheme.typography, | ||
| shapes = MaterialTheme.shapes | ||
| ) |
Contributor
Author
There was a problem hiding this comment.
Use default Material theme if theme params cannot be extracted from a MaterialComponents theme.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
MaterialThemeis required for Identity, we should handle non-Material theme usage gracefully to avoid crashes.AppCompat theme is still required
Motivation
👻
Testing
Screenshots
Changelog