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

Update Google Pay button #5487

Merged
merged 7 commits into from
Sep 1, 2022
Merged

Update Google Pay button #5487

merged 7 commits into from
Sep 1, 2022

Conversation

brnunes-stripe
Copy link
Contributor

Summary

Update Google Pay button to match updated brand guidelines.
Update Link button to match size and corner radius.

Motivation

Google Pay branding guidelines changed.

Testing

  • Added tests
  • Modified tests
  • Manually verified

Screenshots

Before After
image image
image image
gpay.mp4

@brnunes-stripe brnunes-stripe marked this pull request as ready for review August 30, 2022 02:12
@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022 •
edited

Diffuse output:

OLD: paymentsheet-example-release-master.apk (signature: none)
NEW: paymentsheet-example-release-pr.apk (signature: none)

          │            compressed             │            uncompressed            
          ├───────────┬──────────┬────────────┼───────────┬───────────┬────────────
 APK      │ old       │ new      │ diff       │ old       │ new       │ diff       
──────────┼───────────┼──────────┼────────────┼───────────┼───────────┼────────────
      dex │  15.4 MiB │ 15.4 MiB │   -1.4 KiB │  52.1 MiB │  52.1 MiB │   -2.1 KiB 
     arsc │   1.8 MiB │  1.8 MiB │    +63 KiB │   1.8 MiB │   1.8 MiB │    +63 KiB 
 manifest │     4 KiB │    4 KiB │        0 B │  18.5 KiB │  18.5 KiB │        0 B 
      res │ 874.5 KiB │    1 MiB │ +162.8 KiB │   1.4 MiB │   1.8 MiB │   +418 KiB 
   native │   2.5 MiB │  2.5 MiB │        0 B │   5.9 MiB │   5.9 MiB │        0 B 
    asset │     3 MiB │    3 MiB │       -1 B │     3 MiB │     3 MiB │       -1 B 
    other │  81.7 KiB │ 81.7 KiB │        0 B │ 155.6 KiB │ 155.6 KiB │        0 B 
──────────┼───────────┼──────────┼────────────┼───────────┼───────────┼────────────
    total │  23.6 MiB │ 23.9 MiB │ +224.4 KiB │  64.3 MiB │  64.7 MiB │ +478.9 KiB 

         │          raw           │             unique              
         ├────────┬────────┬──────┼────────┬────────┬───────────────
 DEX     │ old    │ new    │ diff │ old    │ new    │ diff          
─────────┼────────┼────────┼──────┼────────┼────────┼───────────────
   files │      4 │      4 │    0 │        │        │               
 strings │ 251790 │ 251776 │  -14 │ 214766 │ 214754 │ -12 (+40 -52) 
   types │  44413 │  44408 │   -5 │  40773 │  40769 │  -4 (+0 -4)   
 classes │  37969 │  37967 │   -2 │  37969 │  37967 │  -2 (+0 -2)   
 methods │ 222036 │ 222020 │  -16 │ 214027 │ 214012 │ -15 (+9 -24)  
  fields │ 163243 │ 163230 │  -13 │ 162200 │ 162187 │ -13 (+13 -26) 

 ARSC    │ old  │ new  │ diff         
─────────┼──────┼──────┼──────────────
 configs │  292 │  334 │ +42 (+42 -0) 
 entries │ 6239 │ 6236 │  -3 (+5 -8)
APK 
      compressed      │     uncompressed      │                               
─────────┬────────────┼──────────┬────────────┤                               
 size    │ diff       │ size     │ diff       │ path                          
─────────┼────────────┼──────────┼────────────┼───────────────────────────────
 1.8 MiB │    +63 KiB │  1.8 MiB │    +63 KiB │ ∆ resources.arsc              
 5.9 KiB │   +5.9 KiB │  5.8 KiB │   +5.8 KiB │ + res/bM.9.png                
 4.8 KiB │   +4.8 KiB │ 13.8 KiB │  +13.8 KiB │ + res/y91.xml                 
 4.6 KiB │   +4.6 KiB │ 18.4 KiB │  +18.4 KiB │ + res/zK.xml                  
 4.4 KiB │   +4.4 KiB │ 16.3 KiB │  +16.3 KiB │ + res/WE.xml                  
 4.3 KiB │   +4.3 KiB │ 12.3 KiB │  +12.3 KiB │ + res/-O.xml                  
 4.3 KiB │   +4.3 KiB │ 11.4 KiB │  +11.4 KiB │ + res/X5.xml                  
 4.2 KiB │   +4.2 KiB │ 11.5 KiB │  +11.5 KiB │ + res/qp1.xml                 
 4.1 KiB │   +4.1 KiB │ 11.8 KiB │  +11.8 KiB │ + res/CW.xml                  
 4.1 KiB │   +4.1 KiB │ 11.8 KiB │  +11.8 KiB │ + res/ig.xml                  
 3.8 KiB │   +3.8 KiB │ 10.8 KiB │  +10.8 KiB │ + res/UJ.xml                  
 3.8 KiB │   +3.8 KiB │ 10.8 KiB │  +10.8 KiB │ + res/WK.xml                  
 3.7 KiB │   +3.7 KiB │  9.7 KiB │   +9.7 KiB │ + res/5N1.xml                 
 3.7 KiB │   +3.7 KiB │  9.7 KiB │   +9.7 KiB │ + res/Uy.xml                  
 3.6 KiB │   +3.6 KiB │    9 KiB │     +9 KiB │ + res/xN.xml                  
   4 KiB │   +3.6 KiB │ 13.3 KiB │  +12.5 KiB │ ∆ res/9z.xml                  
 3.6 KiB │   +3.6 KiB │  9.3 KiB │   +9.3 KiB │ + res/py.xml                  
 3.6 KiB │   +3.6 KiB │   10 KiB │    +10 KiB │ + res/kr.xml                  
 3.5 KiB │   +3.5 KiB │  9.2 KiB │   +9.2 KiB │ + res/zM1.xml                 
 3.5 KiB │   +3.5 KiB │    9 KiB │     +9 KiB │ + res/R61.xml                 
 3.5 KiB │   +3.5 KiB │    9 KiB │     +9 KiB │ + res/Fa.xml                  
 3.5 KiB │   +3.5 KiB │    9 KiB │     +9 KiB │ + res/rc.xml                  
 3.5 KiB │   +3.5 KiB │  9.9 KiB │   +9.9 KiB │ + res/Ms.xml                  
 3.5 KiB │   +3.5 KiB │  3.4 KiB │   +3.4 KiB │ + res/2j.9.png                
 3.4 KiB │   +3.4 KiB │  9.3 KiB │   +9.3 KiB │ + res/UT.xml                  
 3.4 KiB │   +3.4 KiB │  9.7 KiB │   +9.7 KiB │ + res/oX.xml                  
 3.4 KiB │   +3.4 KiB │  9.4 KiB │   +9.4 KiB │ + res/oR.xml                  
 3.4 KiB │   +3.4 KiB │  9.4 KiB │   +9.4 KiB │ + res/xr.xml                  
 3.3 KiB │   +3.3 KiB │  7.7 KiB │   +7.7 KiB │ + res/5l.xml                  
 3.3 KiB │   +3.3 KiB │  7.7 KiB │   +7.7 KiB │ + res/i3.xml                  
 3.3 KiB │   +3.3 KiB │  9.3 KiB │   +9.3 KiB │ + res/EV.xml                  
 3.3 KiB │   +3.3 KiB │  8.3 KiB │   +8.3 KiB │ + res/4H.xml                  
 3.3 KiB │   +3.3 KiB │  7.2 KiB │   +7.2 KiB │ + res/jS.xml                  
 3.2 KiB │   +3.2 KiB │  8.6 KiB │   +8.6 KiB │ + res/sU.xml                  
 3.1 KiB │   +3.1 KiB │    8 KiB │     +8 KiB │ + res/8d.xml                  
   3 KiB │     +3 KiB │  9.2 KiB │   +9.2 KiB │ + res/0F.xml                  
   3 KiB │     +3 KiB │  8.7 KiB │   +8.7 KiB │ + res/Rv.xml                  
   3 KiB │     +3 KiB │  6.7 KiB │   +6.7 KiB │ + res/Q01.xml                 
   3 KiB │     +3 KiB │  6.7 KiB │   +6.7 KiB │ + res/dQ1.xml                 
   3 KiB │     +3 KiB │  6.7 KiB │   +6.7 KiB │ + res/Rm.xml                  
   3 KiB │     +3 KiB │  6.7 KiB │   +6.7 KiB │ + res/WU.xml                  
   3 KiB │     +3 KiB │  6.7 KiB │   +6.7 KiB │ + res/g3.xml                  
 2.9 KiB │   +2.9 KiB │  7.5 KiB │   +7.5 KiB │ + res/b92.xml                 
 2.8 KiB │   +2.8 KiB │  8.2 KiB │   +8.2 KiB │ + res/_4.xml                  
 2.7 KiB │   +2.7 KiB │  5.6 KiB │   +5.6 KiB │ + res/bP.xml                  
 2.6 KiB │   +2.6 KiB │  2.5 KiB │   +2.5 KiB │ + res/8G.9.png                
 2.2 KiB │   +2.2 KiB │  4.5 KiB │   +4.5 KiB │ + res/hn.xml                  
   2 KiB │     +2 KiB │  1.9 KiB │   +1.9 KiB │ + res/4i.9.png                
         │   -1.6 KiB │          │   -3.8 KiB │ - res/dc.xml                  
 1.6 KiB │   +1.6 KiB │  3.8 KiB │   +3.8 KiB │ + res/V_.xml                  
         │   -1.6 KiB │          │   -3.8 KiB │ - res/hw.xml                  
 2.3 MiB │   -1.4 KiB │    7 MiB │   -2.1 KiB │ ∆ classes3.dex                
 1.2 KiB │   +1.2 KiB │  1.1 KiB │   +1.1 KiB │ + res/2M.9.png              
...✂
DEX 
STRINGS:

   old    │ new    │ diff          
  ────────┼────────┼───────────────
   214766 │ 214754 │ -12 (+40 -52) 
  + 6
  
  ���
  ���
  ���
  ���
  ���
  ���
  ���
  
  ���
  
  ���
  ���
  ���
  ����
  ����0�H�¢�����+����0�2��	��0
  2�����02�
  ������0�0�H�¢�����-����0�2�����02�������0�2�
  ������0�0�H�¢��������0�X��ø�¢��
  ��������0�X��¢��
  �����0�X��ø�¢��
  ������
  ���¨��
  + <
  ���
  ���
  
  ���
  
  ���
  
  ���
  ���
  ���
  
  ���
  ���
  ���
  ���
  ���
  �����2�0�B%��������0��
  ��������0���������0�¢����J�����0�H�J�����0�H�J�����0�H�J�����0�2�����0�H�J�����0�H�J�����0�2��	����0
  R��	����0
  X��¢��
  R�����0X��¢��
  ���
  ��¨��
  + v
  ���
  ���
  
  ���
  
  ���
  
  ���
  ���
  ���
  ���
  ���
  
  ���
  ���
  ���
  ���
  ���
  ���
  ���
  ���
  ���
  
  ���
  ���
  ��
  
  ���
  
  ���
  ���
  ���
  �����2�0�:�FGB%��������0��
  ��������0���������0�¢����J��3����042�������0�H�J��5��062�7������0608H�J��9��06H�J��:��06H�J��;��062��<��0=2��>����0�J��?��062��>����0�H�J��@��062��A��0&H�J��B��062��C����0�J��D��06H�J��E��062��,����0-R��	��0
  X��¢��
  R�����0�X��¢��
  R����0
  X��¢��
  R�����0�X��¢��
  R�����0
  X��¢��
  R&������0�8@X��¢��
  �����������������R&������0�8@X��¢��
  �����������������R�� ��0�X��¢��
  ���!���#�_R��%��0&X��¢��
  ���'�(��)�*R��+����0�X��¢��
  R��,����0-X��¢��
  R��.��0/8X��¢��
  ���0�����1�2¨�H
  + _r8_lambda_BYjw4_Y-XFZKK5S1QIZrGeTqcNc
  + _r8_lambda_ZFm5vFTCEV9TMsfCqLVy4NY1AoE
  + _r8_lambda_glHZMUMW2r8n6wK_NgQ9eaFp-sg
  + LinkButtonShape
  + SMAP
  GooglePayButton.kt
  Kotlin
  *S Kotlin
  *F
  + 1 GooglePayButton.kt
  com/stripe/android/paymentsheet/ui/GooglePayButton
  + 2 View.kt
  androidx/core/view/ViewKt
  *L
  1#1,80:1
  254#2,2:81
  254#2,2:83
  254#2,2:85
  254#2,2:87
  254#2,2:89
  254#2,2:91
  *S KotlinDebug
  *F
  + 1 GooglePayButton.kt
  com/stripe/android/paymentsheet/ui/GooglePayButton
  *L
  32#1:81,2
  33#1:83,2
  37#1:85,2
  38#1:87,2
  42#1:89,2
  43#1:91,2
  *E
  
  + SMAP
  LinkButtonView.kt
  Kotlin
  *S Kotlin
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonView
  + 2 SnapshotState.kt
  androidx/compose/runtime/SnapshotStateKt__SnapshotStateKt
  *L
  1#1,170:1
  76#2:171
  102#2,2:172
  76#2:174
  102#2,2:175
  *S KotlinDebug
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonView
  *L
  151#1:171
  151#1:172,2
  152#1:174
  152#1:175,2
  *E
  
  + SMAP
  LinkButtonView.kt
  Kotlin
  *S Kotlin
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonViewKt
  + 2 Dp.kt
  androidx/compose/ui/unit/DpKt
  *L
  1#1,170:1
  155#2:171
  155#2:172
  155#2:173
  *S KotlinDebug
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonViewKt
  *L
  42#1:171
  43#1:172
  44#1:173
  *E
  
  + SMAP
  LinkButtonView.kt
  Kotlin
  *S Kotlin
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonViewKt_LinkButton_4_1
  + 2 Dp.kt
  androidx/compose/ui/unit/DpKt
  *L
  1#1,170:1
  155#2:171
  *S KotlinDebug
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonViewKt_LinkButton_4_1
  *L
  85#1:171
  *E
  
  + SMAP
  LinkButtonView.kt
  Kotlin
  *S Kotlin
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonViewKt_LinkButton_4_1_1
  + 2 Dp.kt
  androidx/compose/ui/unit/DpKt
  + 3 CompositionLocal.kt
  androidx/compose/runtime/CompositionLocal
  + 4 Box.kt
  androidx/compose/foundation/layout/BoxKt
  + 5 Layout.kt
  androidx/compose/ui/layout/LayoutKt
  + 6 Composables.kt
  androidx/compose/runtime/ComposablesKt
  *L
  1#1,170:1
  155#2:171
  155#2:172
  155#2:173
  155#2:208
  76#3:174
  76#3:182
  67#4,6:175
  73#4:207
  77#4:213
  75#5:181
  76#5,11:183
  89#5:212
  460#6,13:194
  473#6,3:209
  *S KotlinDebug
  *F
  + 1 LinkButtonView.kt
  com/stripe/android/link/ui/LinkButtonViewKt_LinkButton_4_1_1
  *L
  102#1:171
  104#1:172
  105#1:173
  122#1:208
  108#1:174
  112#1:182
  112#1:175,6
  112#1:207
  112#1:213
  112#1:181
  112#1:183,11
  112#1:212
  112#1:194,13
  112#1:209,3
  *E
  
  + SMAP
  PaymentSheetActivity.kt
  Kotlin
  *S Kotlin
  *F
  + 1 PaymentSheetActivity.kt
  com/stripe/android/paymentsheet/PaymentSheetActivity
  + 2 ActivityViewModelLazy.kt
  androidx/activity/ActivityViewModelLazyKt
  + 3 View.kt
  androidx/core/view/ViewKt
  + 4 FragmentManager.kt
  androidx/fragment/app/FragmentManagerKt
  + 5 _Collections.kt
  kotlin/collections/CollectionsKt___CollectionsKt
  *L
  1#1,377:1
  75#2,13:378
  
...✂
ARSC 
CONFIGS:

   old │ new │ diff         
  ─────┼─────┼──────────────
   292 │ 334 │ +42 (+42 -0) 
  + drawable-ca
  + drawable-cs
  + drawable-da
  + drawable-de
  + drawable-el
  + drawable-en-rAU
  + drawable-en-rCA
  + drawable-en-rGB
  + drawable-en-rIN
  + drawable-es
  + drawable-es-rES
  + drawable-et
  + drawable-fi
  + drawable-fil
  + drawable-fr
  + drawable-fr-rCA
  + drawable-hr
  + drawable-hu
  + drawable-id
  + drawable-it
  + drawable-ja
  + drawable-ko
  + drawable-lt
  + drawable-lv
  + drawable-ms
  + drawable-nl
  + drawable-no
  + drawable-pl
  + drawable-pt-rBR
  + drawable-pt-rPT
  + drawable-ro
  + drawable-ru
  + drawable-sk
  + drawable-sl
  + drawable-sv
  + drawable-sw
  + drawable-th
  + drawable-tr
  + drawable-vi
  + drawable-zh-rCN
  + drawable-zh-rHK
  + drawable-zh-rTW
  

ENTRIES:

   old  │ new  │ diff       
  ──────┼──────┼────────────
   6239 │ 6236 │ -3 (+5 -8) 
  + drawable/googlepay_button_background
  + drawable/googlepay_button_background_image
  + drawable/googlepay_button_content
  + drawable/pay_with_googlepay_button_content
  + id/google_pay_button_layout
  
  - dimen/stripe_paymentsheet_googlepay_button_dark_margin
  - dimen/stripe_paymentsheet_googlepay_button_light_margin_horizontal
  - dimen/stripe_paymentsheet_googlepay_button_light_margin_vertical
  - drawable/stripe_googlepay_button_content_dark
  - drawable/stripe_googlepay_button_content_light
  - drawable/stripe_googlepay_button_no_shadow_background_dark
  - drawable/stripe_googlepay_button_no_shadow_background_light
  - id/google_pay_button_icon

@brnunes-stripe brnunes-stripe enabled auto-merge (squash) September 1, 2022 17:48
@brnunes-stripe brnunes-stripe merged commit 9d418bc into master Sep 1, 2022
@brnunes-stripe brnunes-stripe deleted the brnunes/gpay branch September 1, 2022 17:59
@jameswoo-stripe jameswoo-stripe mentioned this pull request Apr 4, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tillh-stripe tillh-stripe tillh-stripe approved these changes

@michelleb-stripe michelleb-stripe Awaiting requested review from michelleb-stripe

@jameswoo-stripe jameswoo-stripe Awaiting requested review from jameswoo-stripe

@ccen-stripe ccen-stripe Awaiting requested review from ccen-stripe

@awush-stripe awush-stripe Awaiting requested review from awush-stripe

Assignees

@michelleb-stripe michelleb-stripe

@jameswoo-stripe jameswoo-stripe

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@brnunes-stripe @tillh-stripe @michelleb-stripe @jameswoo-stripe