-
Notifications
You must be signed in to change notification settings - Fork 663
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
Add Stripe
resource prefix
#6603
Conversation
Diffuse output:
APK
MANIFEST
DEX
ARSC
|
d3365f9
to
8b93dc8
Compare
8b93dc8
to
a9a9e07
Compare
a9a9e07
to
4701f77
Compare
37c2e5b
to
987c5d5
Compare
bf0ba1f
to
cdc61f9
Compare
4701f77
to
c457cdf
Compare
d430575
to
7563d82
Compare
7563d82
to
a942b9d
Compare
a942b9d
to
70faa85
Compare
0079ead
to
289db63
Compare
<resources xmlns:tools="http://schemas.android.com/tools"> | ||
<declare-styleable name="StripeCameraView"> | ||
<!--defines the shape, aspect ratio of the viewfinder--> | ||
<attr name="viewFinderType" format="enum"> | ||
<attr name="stripeViewFinderType" format="enum"> |
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.
@ccen-stripe and @awush-stripe: It looks to me like these are only intended for internal use. Is that correct?
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.
yes it is!, StripeCameraView is not supposed to be public
<string name="consent_pane_tc">You agree to Stripe\'s <annotation clickable="terms">Terms</annotation> and <annotation clickable="privacy">Privacy Policy</annotation>. <annotation clickable="privacy_center">Learn more</annotation></string> | ||
<string name="consent_pane_manual_entry"><annotation clickable="manual_entry">Enter account details manually instead</annotation></string> | ||
<string name="consent_pane_manual_entry_microdeposits"><annotation clickable="manual_entry">Enter account details manually instead</annotation> (takes 1–2 business days)</string> | ||
<string name="stripe_consent_pane_tc">You agree to Stripe\'s <annotation clickable="terms">Terms</annotation> and <annotation clickable="privacy">Privacy Policy</annotation>. <annotation clickable="privacy_center">Learn more</annotation></string> |
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.
These strings aren’t coming from Lokalize, so they weren’t updated as part of #6608. (cc @carlosmuvi: any plans to localize them?)
<resources xmlns:tools="http://schemas.android.com/tools"> | ||
<declare-styleable name="CardInputView" tools:ignore="ResourceName"> | ||
<attr name="cardHintText" format="string" /> |
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.
Ignoring the prefix here because these properties are intended for public use.
@@ -1,17 +1,17 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<resources> | |||
<resources xmlns:tools="http://schemas.android.com/tools"> |
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.
Ignoring the prefix here because these properties are intended for public use.
@@ -1,33 +1,4 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<resources> | |||
<declare-styleable name="CardInputView"> |
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.
These are already available in payments-core
.
<!-- Public Styles --> | ||
<public name="StripeDefaultTheme" type="style" /> | ||
<public name="StripeToolBarStyle" type="style" /> |
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.
These are already available in payments-core
.
android:exported="false" | ||
android:label="@string/link" |
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.
It looks like we need to update payments-core/donottranslate.xml
Summary
This pull request makes sure that our resources use a
stripe_
prefix to avoid conflicts with resources of the host application. This is a follow-up for #6608 that fetched our updated strings from Lokalize.Motivation
Resolves #6531
Testing
Screenshots
Changelog