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.

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

Remove style clobbering in cardscan. #6664

Merged

Conversation

jaynewstrom-stripe
Copy link
Collaborator

Summary

Cardscan wanted its own unique style, not to override those used in payments.

Motivation

conductor-onset incident

Testing

  • Added tests
  • Modified tests
  • Manually verified

Cardscan wanted its own unique style, not to override those used in payments.
@jaynewstrom-stripe jaynewstrom-stripe marked this pull request as ready for review May 3, 2023 16:56
@jaynewstrom-stripe jaynewstrom-stripe requested review from a team as code owners May 3, 2023 16:56
@github-actions
Copy link
Contributor

github-actions bot commented May 3, 2023

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.4 MiB │   3.4 MiB │   -2 B │   7.4 MiB │   7.4 MiB │    0 B 
     arsc │   2.1 MiB │   2.1 MiB │ +296 B │   2.1 MiB │   2.1 MiB │ +296 B 
 manifest │   4.6 KiB │   4.6 KiB │   +3 B │  22.3 KiB │  22.3 KiB │    0 B 
      res │ 869.1 KiB │ 869.1 KiB │   -4 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 B │     3 MiB │     3 MiB │   -1 B 
    other │ 199.6 KiB │ 199.6 KiB │  +16 B │ 446.8 KiB │ 446.8 KiB │    0 B 
──────────┼───────────┼───────────┼────────┼───────────┼───────────┼────────
    total │  12.1 MiB │  12.1 MiB │ +308 B │  20.3 MiB │  20.3 MiB │ +295 B 

 DEX     │ old   │ new   │ diff      
─────────┼───────┼───────┼───────────
   files │     1 │     1 │ 0         
 strings │ 36280 │ 36280 │ 0 (+0 -0) 
   types │ 12023 │ 12023 │ 0 (+0 -0) 
 classes │ 10133 │ 10133 │ 0 (+0 -0) 
 methods │ 53560 │ 53560 │ 0 (+0 -0) 
  fields │ 34127 │ 34127 │ 0 (+0 -0) 

 ARSC    │ old  │ new  │ diff       
─────────┼──────┼──────┼────────────
 configs │  291 │  291 │  0         
 entries │ 6940 │ 6942 │ +2 (+2 -0)
APK
    compressed     │    uncompressed    │                               
──────────┬────────┼───────────┬────────┤                               
 size     │ diff   │ size      │ diff   │ path                          
──────────┼────────┼───────────┼────────┼───────────────────────────────
  2.1 MiB │ +296 B │   2.1 MiB │ +296 B │ ∆ resources.arsc              
 48.4 KiB │  +15 B │ 140.8 KiB │    0 B │ ∆ META-INF/MANIFEST.MF        
  4.6 KiB │   +3 B │  22.3 KiB │    0 B │ ∆ AndroidManifest.xml         
  3.4 MiB │   -2 B │   7.4 MiB │    0 B │ ∆ classes.dex                 
 62.7 KiB │   +2 B │ 140.9 KiB │    0 B │ ∆ META-INF/CERT.SF            
  5.1 KiB │   -1 B │     5 KiB │   -1 B │ ∆ assets/dexopt/baseline.prof 
    838 B │   +1 B │   1.8 KiB │    0 B │ ∆ res/AZ.xml                  
    761 B │   -1 B │   1.4 KiB │    0 B │ ∆ res/BA.xml                  
    723 B │   -1 B │   1.6 KiB │    0 B │ ∆ res/HO.xml                  
  1.1 KiB │   -1 B │   3.4 KiB │    0 B │ ∆ res/IZ.xml                  
    757 B │   -1 B │   1.4 KiB │    0 B │ ∆ res/WZ.xml                  
    735 B │   -1 B │   1.4 KiB │    0 B │ ∆ res/_Y.xml                  
  3.1 KiB │   +1 B │  21.1 KiB │    0 B │ ∆ res/dn.xml                  
    846 B │   -1 B │   1.8 KiB │    0 B │ ∆ res/lK.xml                  
    932 B │   -1 B │   2.6 KiB │    0 B │ ∆ res/m6.xml                  
  3.2 KiB │   +1 B │  21.4 KiB │    0 B │ ∆ res/s0.xml                  
    529 B │   -1 B │     856 B │    0 B │ ∆ res/vz.xml                  
    632 B │   +1 B │   1.1 KiB │    0 B │ ∆ res/wV.xml                  
  1.2 KiB │   -1 B │   1.2 KiB │    0 B │ ∆ META-INF/CERT.RSA           
──────────┼────────┼───────────┼────────┼───────────────────────────────
  5.6 MiB │ +308 B │   9.9 MiB │ +295 B │ (total)
MANIFEST
@@ -127,3 +127,3 @@
         android:screenOrientation=5
-        android:theme=@style/StripeDefaultTheme
+        android:theme=@style/StripeCardScanDefaultTheme
         />
@@ -132,3 +132,3 @@
         android:screenOrientation=5
-        android:theme=@style/StripeDefaultTheme
+        android:theme=@style/StripeCardScanDefaultTheme
         />
ARSC
ENTRIES:

   old  │ new  │ diff       
  ──────┼──────┼────────────
   6940 │ 6942 │ +2 (+2 -0) 
  + style/StripeCardScanBaseTheme
  + style/StripeCardScanDefaultTheme

@jaynewstrom-stripe jaynewstrom-stripe merged commit 45645ef into master May 3, 2023
9 checks passed
@jaynewstrom-stripe jaynewstrom-stripe deleted the jaynewstrom/conductor-onset-cardscan-clobber branch May 3, 2023 17:22
jameswoo-stripe pushed a commit that referenced this pull request May 3, 2023
Cardscan wanted its own unique style, not to override those used in payments.
jaynewstrom-stripe added a commit that referenced this pull request May 3, 2023
Cardscan wanted its own unique style, not to override those used in payments.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants