Skip to content

Commit a96b095

Browse files
authored
[Mobile Payments] Fix blurry payment method icons in payment methods screen (#15659)
2 parents e6bdcbb + d2e05d5 commit a96b095

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ def networking_watch_os_pods
6363
end
6464

6565
def gridicons
66-
pod 'Gridicons', '~> 1.2.0'
66+
# pod 'Gridicons', '~> 1.2.0'
67+
pod 'Gridicons', git: 'https://github.com/Automattic/Gridicons-iOS.git', commit: 'c904cb73e26e86463a78e1335c6f4fd54a9e9223'
6768
end
6869

6970
def wordpress_ui

Podfile.lock

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
22
- Alamofire (5.8.1)
3-
- Gridicons (1.2.0)
3+
- Gridicons (1.3.0-beta.1)
44
- KeychainAccess (4.2.2)
55
- Kingfisher (7.6.2)
66
- NSObject-SafeExpectations (0.0.6)
@@ -48,7 +48,7 @@ PODS:
4848

4949
DEPENDENCIES:
5050
- Alamofire (~> 5.0)
51-
- Gridicons (~> 1.2.0)
51+
- Gridicons (from `https://github.com/Automattic/Gridicons-iOS.git`, commit `c904cb73e26e86463a78e1335c6f4fd54a9e9223`)
5252
- KeychainAccess (~> 4.2.2)
5353
- Kingfisher (~> 7.6.2)
5454
- NSObject-SafeExpectations (~> 0.0.4)
@@ -68,7 +68,6 @@ DEPENDENCIES:
6868
SPEC REPOS:
6969
trunk:
7070
- Alamofire
71-
- Gridicons
7271
- KeychainAccess
7372
- Kingfisher
7473
- NSObject-SafeExpectations
@@ -91,9 +90,19 @@ SPEC REPOS:
9190
- ZendeskSupportProvidersSDK
9291
- ZendeskSupportSDK
9392

93+
EXTERNAL SOURCES:
94+
Gridicons:
95+
:commit: c904cb73e26e86463a78e1335c6f4fd54a9e9223
96+
:git: https://github.com/Automattic/Gridicons-iOS.git
97+
98+
CHECKOUT OPTIONS:
99+
Gridicons:
100+
:commit: c904cb73e26e86463a78e1335c6f4fd54a9e9223
101+
:git: https://github.com/Automattic/Gridicons-iOS.git
102+
94103
SPEC CHECKSUMS:
95104
Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
96-
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
105+
Gridicons: 2c30feba78143786aa04e6d1304a86e246779689
97106
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
98107
Kingfisher: 6c5449c6450c5239166510ba04afe374a98afc4f
99108
NSObject-SafeExpectations: c01c8881cbd97efad6f668286b913cd0b7d62ab5
@@ -116,6 +125,6 @@ SPEC CHECKSUMS:
116125
ZendeskSupportProvidersSDK: 281acf2bb731d2a67f913cfe653ed0da9f5b2f42
117126
ZendeskSupportSDK: b512cfc74b6bf8490e589f02cf52e27ed4f2bebe
118127

119-
PODFILE CHECKSUM: e8b7a720e1a5dfbd786d981801b57560dd250395
128+
PODFILE CHECKSUM: d31cc69df3854753fd96bdc473de14827b26a880
120129

121130
COCOAPODS: 1.16.2

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
22.5
55
-----
6+
- [*] Payments: payment method icons on the payment methods screen no longer appear blurry. [https://github.com/woocommerce/woocommerce-ios/pull/15659]
67
- [internal] Optimized product image handling to reduce memory pressure by leveraging KingFisher's built-in capabilities [https://github.com/woocommerce/woocommerce-ios/pull/15629]
78

89
22.4

WooCommerce/Classes/ViewRelated/Orders/Payment Methods/PaymentMethodsView.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,27 @@ struct PaymentMethodsView: View {
5252
Divider()
5353
}
5454

55-
MethodRow(icon: .priceImage, title: Localization.cash, accessibilityID: Accessibility.cashMethod) {
55+
MethodRow(icon: Image.gridicon(.money), title: Localization.cash, accessibilityID: Accessibility.cashMethod) {
5656
showingCashAlert = true
5757
viewModel.trackCollectByCash()
5858
}
5959

6060
if viewModel.showPayWithCardRow {
6161
Divider()
6262

63-
MethodRow(icon: .creditCardImage, title: Localization.card, accessibilityID: Accessibility.cardMethod) {
63+
MethodRow(
64+
icon: Image.gridicon(.creditCard),
65+
title: Localization.card,
66+
accessibilityID: Accessibility.cardMethod
67+
) {
6468
viewModel.collectPayment(using: .bluetoothScan, on: rootViewController, onSuccess: dismiss, onFailure: dismiss)
6569
}
6670
}
6771

6872
if viewModel.showPaymentLinkRow {
6973
Divider()
7074

71-
MethodRow(icon: .linkImage, title: Localization.link, accessibilityID: Accessibility.paymentLink) {
75+
MethodRow(icon: Image.gridicon(.link), title: Localization.link, accessibilityID: Accessibility.paymentLink) {
7276
sharingPaymentLink = true
7377
viewModel.trackCollectByPaymentLink()
7478
}

0 commit comments

Comments
 (0)