Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Side by Side Diff: ios/chrome/browser/payments/shipping_option_selection_view_controller.mm

Issue 2817953002: CollectionViewTextItem no longer styles CollectionViewTextCell (Closed)
Patch Set: rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/payments/shipping_option_selection_view_controller.h " 5 #import "ios/chrome/browser/payments/shipping_option_selection_view_controller.h "
6 6
7 #include "base/mac/foundation_util.h" 7 #include "base/mac/foundation_util.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/payments/core/currency_formatter.h" 10 #include "components/payments/core/currency_formatter.h"
11 #include "components/payments/core/strings_util.h" 11 #include "components/payments/core/strings_util.h"
12 #include "components/strings/grit/components_strings.h" 12 #include "components/strings/grit/components_strings.h"
13 #import "ios/chrome/browser/payments/cells/payments_text_item.h" 13 #import "ios/chrome/browser/payments/cells/payments_text_item.h"
14 #include "ios/chrome/browser/payments/payment_request.h" 14 #include "ios/chrome/browser/payments/payment_request.h"
15 #import "ios/chrome/browser/payments/shipping_option_selection_view_controller_a ctions.h" 15 #import "ios/chrome/browser/payments/shipping_option_selection_view_controller_a ctions.h"
16 #import "ios/chrome/browser/ui/autofill/cells/status_item.h" 16 #import "ios/chrome/browser/ui/autofill/cells/status_item.h"
17 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrom e.h" 17 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrom e.h"
18 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h" 18 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
19 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_cell.h "
19 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h " 20 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h "
20 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" 21 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
21 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h" 22 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
22 #import "ios/chrome/browser/ui/icons/chrome_icon.h" 23 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
23 #include "ios/chrome/browser/ui/uikit_ui_util.h" 24 #include "ios/chrome/browser/ui/uikit_ui_util.h"
24 #include "ios/chrome/grit/ios_strings.h" 25 #include "ios/chrome/grit/ios_strings.h"
25 #include "ios/chrome/grit/ios_theme_resources.h" 26 #include "ios/chrome/grit/ios_theme_resources.h"
26 #import "ios/third_party/material_components_ios/src/components/Typography/src/M aterialTypography.h" 27 #import "ios/third_party/material_components_ios/src/components/Typography/src/M aterialTypography.h"
27 #include "ios/web/public/payments/payment_request.h" 28 #include "ios/web/public/payments/payment_request.h"
28 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 122
122 for (const auto* shippingOption : _paymentRequest->shipping_options()) { 123 for (const auto* shippingOption : _paymentRequest->shipping_options()) {
123 CollectionViewTextItem* item = 124 CollectionViewTextItem* item =
124 [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingOption]; 125 [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingOption];
125 item.text = base::SysUTF16ToNSString(shippingOption->label); 126 item.text = base::SysUTF16ToNSString(shippingOption->label);
126 payments::CurrencyFormatter* currencyFormatter = 127 payments::CurrencyFormatter* currencyFormatter =
127 _paymentRequest->GetOrCreateCurrencyFormatter(); 128 _paymentRequest->GetOrCreateCurrencyFormatter();
128 item.detailText = SysUTF16ToNSString(currencyFormatter->Format( 129 item.detailText = SysUTF16ToNSString(currencyFormatter->Format(
129 base::UTF16ToASCII(shippingOption->amount.value))); 130 base::UTF16ToASCII(shippingOption->amount.value)));
130 131
131 // Styling.
132 item.textFont = [MDCTypography body2Font];
133 item.textColor = [[MDCPalette greyPalette] tint900];
134 item.detailTextFont = [MDCTypography body1Font];
135 item.detailTextColor = [[MDCPalette greyPalette] tint900];
136
137 if (_paymentRequest->selected_shipping_option() == shippingOption) { 132 if (_paymentRequest->selected_shipping_option() == shippingOption) {
138 item.accessoryType = MDCCollectionViewCellAccessoryCheckmark; 133 item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
139 _selectedItem = item; 134 _selectedItem = item;
140 } 135 }
141 136
142 [model addItem:item 137 [model addItem:item
143 toSectionWithIdentifier:SectionIdentifierShippingOption]; 138 toSectionWithIdentifier:SectionIdentifierShippingOption];
144 } 139 }
145 } 140 }
146 141
(...skipping 11 matching lines...) Expand all
158 #pragma mark UICollectionViewDataSource 153 #pragma mark UICollectionViewDataSource
159 154
160 - (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView 155 - (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
161 cellForItemAtIndexPath:(nonnull NSIndexPath*)indexPath { 156 cellForItemAtIndexPath:(nonnull NSIndexPath*)indexPath {
162 UICollectionViewCell* cell = 157 UICollectionViewCell* cell =
163 [super collectionView:collectionView cellForItemAtIndexPath:indexPath]; 158 [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
164 159
165 NSInteger itemType = 160 NSInteger itemType =
166 [self.collectionViewModel itemTypeForIndexPath:indexPath]; 161 [self.collectionViewModel itemTypeForIndexPath:indexPath];
167 switch (itemType) { 162 switch (itemType) {
163 case ItemTypeShippingOption: {
164 CollectionViewTextCell* textCell =
165 base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
166 textCell.detailTextLabel.textColor = [[MDCPalette greyPalette] tint900];
167 break;
168 }
168 case ItemTypeMessage: { 169 case ItemTypeMessage: {
169 PaymentsTextCell* messageCell = 170 PaymentsTextCell* messageCell =
170 base::mac::ObjCCastStrict<PaymentsTextCell>(cell); 171 base::mac::ObjCCastStrict<PaymentsTextCell>(cell);
171 messageCell.textLabel.textColor = [[MDCPalette cr_redPalette] tint600]; 172 messageCell.textLabel.textColor = [[MDCPalette cr_redPalette] tint600];
172 break; 173 break;
173 } 174 }
174 default: 175 default:
175 break; 176 break;
176 } 177 }
177 return cell; 178 return cell;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 hidesInkViewAtIndexPath:(NSIndexPath*)indexPath { 239 hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
239 NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath]; 240 NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
240 if (type == ItemTypeMessage) { 241 if (type == ItemTypeMessage) {
241 return YES; 242 return YES;
242 } else { 243 } else {
243 return NO; 244 return NO;
244 } 245 }
245 } 246 }
246 247
247 @end 248 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698