Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Don't force Material Theme with CardBrandView #7485

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Don't force Material Theme with CardBrandView #7485

merged 2 commits into from
Oct 24, 2023

Conversation

tillh-stripe
Copy link
Collaborator

@tillh-stripe tillh-stripe commented Oct 24, 2023 •
edited

Summary

This pull request fixes an issue where CardBrandView inadvertently required the use of a MaterialComponents theme.

Motivation

Resolves #7484

Testing

  • Added tests
  • Modified tests
  • Manually verified

Screenshots

Before After
before screenshot after screenshot

Changelog

@github-actions
Copy link
Contributor

Risky Change

This is considered a risky change because it adjusts the sample app build.gradle, please review carefully.
We've seen issues in the past which resulted in failed builds for merchants. Please make sure the build.gradle change is intended.

By adding the label accept-risky-change to this PR, I acknowledge that I'm changing an example app and have verified that the SDK remains in a shippable state.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 24, 2023 •
edited

Diffuse output:

OLD: paymentsheet-example-release-master.apk (signature: V1, V2)
NEW: paymentsheet-example-release-pr.apk (signature: V1, V2)

          │            compressed             │           uncompressed            
          ├───────────┬───────────┬───────────┼───────────┬───────────┬───────────
 APK      │ old       │ new       │ diff      │ old       │ new       │ diff      
──────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────
      dex │   3.5 MiB │   3.5 MiB │ +12.1 KiB │   7.7 MiB │   7.7 MiB │ +23.9 KiB 
     arsc │   2.2 MiB │   2.2 MiB │ +11.7 KiB │   2.2 MiB │   2.2 MiB │ +11.7 KiB 
 manifest │   5.1 KiB │   5.1 KiB │       0 B │  25.4 KiB │  25.4 KiB │       0 B 
      res │ 900.2 KiB │ 900.3 KiB │     +12 B │   1.3 MiB │   1.3 MiB │       0 B 
   native │   2.6 MiB │   2.6 MiB │       0 B │     6 MiB │     6 MiB │       0 B 
    asset │     3 MiB │     3 MiB │  +1.2 KiB │     3 MiB │     3 MiB │  +1.2 KiB 
    other │ 203.9 KiB │ 204.1 KiB │    +273 B │ 459.3 KiB │ 459.5 KiB │    +256 B 
──────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────
    total │  12.4 MiB │  12.4 MiB │ +25.3 KiB │  20.8 MiB │  20.8 MiB │   +37 KiB 

 DEX     │ old   │ new   │ diff                 
─────────┼───────┼───────┼──────────────────────
   files │     1 │     1 │    0                 
 strings │ 38255 │ 38437 │ +182 (+4835 -4653)   
   types │ 12589 │ 12610 │  +21 (+4671 -4650)   
 classes │ 10578 │ 10599 │  +21 (+4031 -4010)   
 methods │ 55208 │ 55260 │  +52 (+33465 -33413) 
  fields │ 35303 │ 35536 │ +233 (+22518 -22285) 

 ARSC    │ old  │ new  │ diff       
─────────┼──────┼──────┼────────────
 configs │  292 │  292 │  0         
 entries │ 6926 │ 6929 │ +3 (+3 -0)
APK 
      compressed      │     uncompressed      │                                                         
──────────┬───────────┼───────────┬───────────┤                                                         
 size     │ diff      │ size      │ diff      │ path                                                    
──────────┼───────────┼───────────┼───────────┼─────────────────────────────────────────────────────────
  3.5 MiB │ +12.1 KiB │   7.7 MiB │ +23.9 KiB │ ∆ classes.dex                                           
  2.2 MiB │ +11.7 KiB │   2.2 MiB │ +11.7 KiB │ ∆ resources.arsc                                        
  6.4 KiB │  +1.2 KiB │   6.2 KiB │  +1.2 KiB │ ∆ assets/dexopt/baseline.prof                           
    190 B │    +190 B │       6 B │      +6 B │ + META-INF/androidx.compose.material3_material3.version 
 49.7 KiB │     +52 B │ 146.7 KiB │    +125 B │ ∆ META-INF/MANIFEST.MF                                  
 65.4 KiB │     +31 B │ 146.7 KiB │    +125 B │ ∆ META-INF/CERT.SF                                      
    773 B │     -13 B │     641 B │     -13 B │ ∆ assets/dexopt/baseline.profm                          
    536 B │      +9 B │     984 B │       0 B │ ∆ res/aT.xml                                            
    686 B │      -2 B │   1.3 KiB │       0 B │ ∆ res/hR.xml                                            
    806 B │      +1 B │   1.7 KiB │       0 B │ ∆ res/0H.xml                                            
    637 B │      +1 B │   1.2 KiB │       0 B │ ∆ res/2n.xml                                            
    600 B │      +1 B │   1.1 KiB │       0 B │ ∆ res/2w.xml                                            
  1.1 KiB │      -1 B │   3.4 KiB │       0 B │ ∆ res/B4.xml                                            
    475 B │      -1 B │     904 B │       0 B │ ∆ res/JQ.xml                                            
    808 B │      -1 B │   2.3 KiB │       0 B │ ∆ res/Ql.xml                                            
    875 B │      -1 B │   2.3 KiB │       0 B │ ∆ res/YB.xml                                            
    440 B │      +1 B │     744 B │       0 B │ ∆ res/cc.xml                                            
    620 B │      +1 B │   1.1 KiB │       0 B │ ∆ res/gG.xml                                            
  1,005 B │      +1 B │   2.8 KiB │       0 B │ ∆ res/nn.xml                                            
    600 B │      +1 B │   1.1 KiB │       0 B │ ∆ res/pw.xml                                            
    620 B │      +1 B │   1.1 KiB │       0 B │ ∆ res/xa.xml                                            
    538 B │      +1 B │     952 B │       0 B │ ∆ res/zd.xml                                            
──────────┼───────────┼───────────┼───────────┼─────────────────────────────────────────────────────────
  5.9 MiB │ +25.3 KiB │  10.3 MiB │   +37 KiB │ (total)
DEX 
STRINGS:

   old   │ new   │ diff               
  ───────┼───────┼────────────────────
   38255 │ 38437 │ +182 (+4835 -4653) 
  + , bodyLarge=
  + , bodyMedium=
  + , bodySmall=
  + , displayMedium=
  + , extraLarge=
  + , headlineLarge=
  + , headlineMedium=
  + , headlineSmall=
  + , labelLarge=
  + , labelMedium=
  + , labelSmall=
  + , small=
  + , titleLarge=
  + , titleMedium=
  + , titleSmall=
  + ,displaySmall=
  + A2
  + A3
  + B2
  + B3
  + C2
  + C3
  + ColorScheme(primary=
  + D2
  + D3
  + E2
  + E3
  + F2
  + F3
  + G2
  + G3
  + H2
  + H3
  + I2
  + I3
  + J2
  + J3
  + K2
  + K3
  + L2
  + L3
  + LJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
  + LLJJJJJJJJJJJJI
  + La4/c;
  + La4/d;
  + La4/e;
  + La4/f;
  + La4/g;
  + La4/h;
  + La4/i;
  + La4/j;
  + La4/k;
  + La4/l;
  + La4/m;
  + La4/n;
  + La5/a0;
  + La5/b0;
  + La5/c0;
  + La5/c;
  + La5/d0;
  + La5/d;
  + La5/e0;
  + La5/e;
  + La5/f0;
  + La5/f;
  + La5/g0;
  + La5/g;
  + La5/h0;
  + La5/h;
  + La5/i0;
  + La5/i;
  + La5/j0;
  + La5/j;
  + La5/k0;
  + La5/k;
  + La5/l0;
  + La5/l;
  + La5/m0;
  + La5/m;
  + La5/n0;
  + La5/n;
  + La5/o0;
  + La5/o;
  + La5/p0;
  + La5/p;
  + La5/q0;
  + La5/q;
  + La5/r;
  + La5/s;
  + La5/t;
  + La5/u;
  + La5/v;
  + La5/w;
  + La5/x;
  + La5/y;
  + La5/z;
  + La6/e;
  + La6/f;
  + La6/g;
  + La6/h;
  + La6/i;
  + La6/j;
  + La6/k;
  + La6/l;
  + La6/m;
  + La6/n;
  + La7/c;
  + La9/c;
  + La9/d;
  + La9/e;
  + Laa/a0;
  + Laa/b0;
  + Laa/c0;
  + Laa/d0;
  + Laa/e0;
  + Laa/f0;
  + Laa/f;
  + Laa/g0;
  + Laa/g;
  + Laa/h0;
  + Laa/h;
  + Laa/i0;
  + Laa/i;
  + Laa/j0;
  + Laa/j;
  + Laa/k0;
  + Laa/k;
  + Laa/l;
  + Laa/m;
  + Laa/n;
  + Laa/o;
  + Laa/p;
  + Laa/q;
  + Laa/r;
  + Laa/s;
  + Laa/t;
  + Laa/u;
  + Laa/v;
  + Laa/w;
  + Laa/x;
  + Laa/y;
  + Laa/z;
  + Lab/a0;
  + Lab/b0;
  + Lab/c0;
  + Lab/d0;
  + Lab/e0;
  + Lab/f0;
  + Lab/g0;
  + Lab/h0;
  + Lab/i0;
  + Lab/j0;
  + Lab/j;
  + Lab/k0;
  + Lab/k;
  + Lab/l0;
  + Lab/l;
  + Lab/m0;
  + Lab/m;
  + Lab/n0;
  + Lab/n;
  + Lab/o0;
  + Lab/o;
  + Lab/p0;
  + Lab/p;
  + Lab/q0;
  + Lab/q;
  + Lab/r0;
  + Lab/r;
  + Lab/s0;
  + Lab/s;
  + Lab/t0;
  + Lab/t;
  + Lab/u0;
  + Lab/u;
  + Lab/v0;
  + Lab/v;
  + Lab/w0;
  + Lab/w;
  + Lab/x0;
  + Lab/x;
  + Lab/y0;
  + Lab/y;
  + Lab/z;
  + Lac/b;
  + Lac/c;
  + Lac/d;
  + Lac/e;
  + Lac/f;
  + Lac/g;
  + Lac/h;
  + Lac/i;
  + Lac/j;
  + Lac/k;
  + Lac/l;
  + Lac/m;
  + Lac/n;
  + Lac/o;
  + Lac/p;
  + Lac/q;
  + Lac/r;
  + Lad/a;
  + Lad/b;
  + Lad/c;
  + Lad/d;
  + Lad/e;
  + Lad/f;
  + Lad/g;
  + Lae/h0;
  + Lae/i0;
  + Lae/j0;
  + Lae/k0;
  + Lae/l0;
  + Lae/m0;
  + Lae/n0;
  + Lae/o0;
  + Lae/p0;
  + Lae/q0;
  + Lag/d;
  + Lag/e;
  + Lag/f;
  + Lag/g;
  + Lag/h;
  + Lag/i;
  + Lag/j;
  + Lag/k;
  + Lag/l;
  + Lag/m;
  + Lag/n;
  + Lag/o;
  + Lag/p;
  + Lag/q;
  + Lag/r;
  + Lag/s;
  + Lag/t;
  + Lag/u;
  + Lag/v;
  + Lah/b;
  + Lah/c;
  + Lah/d;
  + Lah/d<
  + Lah/e;
  + Lah/f;
  + Lah/g;
  + Lah/h;
  + Lah/i;
  + Lah/j;
  + Lai/c;
  + Lai/d;
  + Laj/e;
  + Landroidx/appcompat/widget/s4;
  + Landroidx/compose/ui/platform/j3;
  + Landroidx/compose/ui/platform/k3;
  + Landroidx/compose/ui/platform/l3;
  + Lb5/k;
  + Lb5/l;
  + Lb5/m;
  + Lb5/n;
  + Lb5/o;
  + Lb8/e;
  + Lb8/f;
  + Lb8/g;
  + Lb8/h;
  + Lb8/i;
  + Lb8/j;
  + Lb8/k;
  + Lbc/a0;
  + Lbc/b0;
  + Lbc/c0;
  + Lbc/d0;
  + Lbc/e0;
  + Lbc/f0;
  + Lbc/g0;
  + Lbc/g;
  + Lbc/h0;
  + Lbc/h;
  + Lbc/i0;
  + Lbc/i;
  + Lbc/j;
  + Lbc/k;
  + Lbc/l;
  + Lbc/m;
  + Lbc/n;
  + Lbc/o;
  + Lbc/p;
  + Lbc/q;
  + Lbc/r;
  + Lbc/s;
  + Lbc/t;
  + Lbc/u;
  + Lbc/v;
  + Lbc/w;
  + Lbc/x;
  + Lbc/y;
  + Lbc/z;
  + Lbd/a0;
  + Lbd/b0;
  + Lbd/c0;
  + Lbd/d0;
  + Lbd/e0;
  + Lbd/f0;
  + Lbd/g0;
  + Lbd/h0;
  + Lbd/i0;
  + Lbd/i;
  + Lbd/j0;
  + Lbd/j;
  + Lbd/k0;
  + Lbd/k;
  + Lbd/l0;
  + Lbd/l;
  + Lbd/m0;
  + Lbd/m;
  + Lbd/n0;
  + Lbd/n;
  + Lbd/o0;
  + Lbd/o;
  + Lbd/p0;
  + Lbd/p;
  + Lbd/q0;
  + Lbd/q;
  + Lbd/r0;
  + Lbd/r;
  + Lbd/s;
  + Lbd/t;
  + Lbd/u;
  + Lbd/v;
  + Lbd/w;
  + Lbd/x;
  + Lbd/y;
  + Lbd/z;
  + Lbg/b;
  + Lbg/c;
  + Lbg/d;
  + Lbg/e;
  + Lbg/f;
  + Lbg/g;
  + Lbg/h;
  + Lbg/i;
  + Lbg/j;
  + Lbg/k;
  + Lbg/l;
  + Lbg/m;
  + Lbg/n;
  + Lbg/o;
  + Lbg/p;
  + Lbh/b;
  + Lbh/c;
  + Lbh/d;
  + Lbh/e;
  + Lbh/f;
  + Lbh/g;
  + Lbi/a0;
  + Lbi/a1;
  + Lbi/b0;
  + Lbi/b1;
  + Lbi/c0;
  + Lbi/c1;
  + Lbi/c;
  + Lbi/d0;
  + Lbi/d1;
  + Lbi/d;
  + Lbi/e0;
  + Lbi/e1;
  + Lbi/e;
  + Lbi/f0;
  + Lbi/f1;
  + Lbi/f;
  + Lbi/g0;
  + Lbi/g1;
  + Lbi/g;
  + Lbi/h0;
...✂
ARSC 
ENTRIES:

   old  │ new  │ diff       
  ──────┼──────┼────────────
   6926 │ 6929 │ +3 (+3 -0) 
  + string/collapsed
  + string/dialog
  + string/expanded

@tillh-stripe tillh-stripe added the accept-risky-change accept-risky-change label Oct 24, 2023
@tillh-stripe tillh-stripe marked this pull request as ready for review October 24, 2023 15:42
@tillh-stripe tillh-stripe requested review from a team as code owners October 24, 2023 15:42
@tillh-stripe tillh-stripe requested review from ccen-stripe and samer-stripe and removed request for ccen-stripe October 24, 2023 15:42
samer-stripe
samer-stripe previously approved these changes Oct 24, 2023
View reviewed changes
@tillh-stripe tillh-stripe merged commit 89676af into master Oct 24, 2023
17 checks passed
@tillh-stripe tillh-stripe deleted the tillh/mdc-theme-fix branch October 24, 2023 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samer-stripe samer-stripe samer-stripe approved these changes

Assignees
No one assigned
Labels
accept-risky-change accept-risky-change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] CardInputWidget Crash
2 participants
@tillh-stripe @samer-stripe