Skip to content

Commit b65b85c

Browse files
committed
Use LeftImageTableViewCell, which is pretty much the same as BasicTableViewCell, but seems more appropiate
Move also localized strings to a Localizations enum
1 parent 3c3efa4 commit b65b85c

File tree

1 file changed

+33
-15
lines changed

1 file changed

+33
-15
lines changed

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsMenuViewController.swift

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,36 @@ private extension InPersonPaymentsMenuViewController {
5050
///
5151
func configure(_ cell: UITableViewCell, for row: Row, at indexPath: IndexPath) {
5252
switch cell {
53-
case let cell as BasicTableViewCell where row == .orderCardReader:
53+
case let cell as LeftImageTableViewCell where row == .orderCardReader:
5454
configureOrderCardReader(cell: cell)
55-
case let cell as BasicTableViewCell where row == .manageCardReader:
55+
case let cell as LeftImageTableViewCell where row == .manageCardReader:
5656
configureManageCardReader(cell: cell)
57-
case let cell as BasicTableViewCell where row == .bbposChipper2XBTManual:
57+
case let cell as LeftImageTableViewCell where row == .bbposChipper2XBTManual:
5858
configureBBPOSChipper2XBTManual(cell: cell)
5959
default:
6060
fatalError()
6161
}
6262
}
6363

64-
func configureOrderCardReader(cell: UITableViewCell) {
65-
cell.imageView?.image = .shoppingCartIcon
64+
func configureOrderCardReader(cell: LeftImageTableViewCell) {
6665
cell.imageView?.tintColor = .text
6766
cell.accessoryType = .disclosureIndicator
6867
cell.selectionStyle = .default
69-
cell.textLabel?.text = NSLocalizedString("Order card reader", comment: "Navigates to Card Reader ordering screen")
68+
cell.configure(image: .shoppingCartIcon, text: Localization.orderCardReader)
7069
}
7170

72-
func configureManageCardReader(cell: UITableViewCell) {
73-
cell.imageView?.image = .creditCardIcon
71+
func configureManageCardReader(cell: LeftImageTableViewCell) {
7472
cell.imageView?.tintColor = .text
7573
cell.accessoryType = .disclosureIndicator
7674
cell.selectionStyle = .default
77-
cell.textLabel?.text = NSLocalizedString("Manage card reader", comment: "Navigates to Card Reader management screen")
75+
cell.configure(image: .creditCardIcon, text: Localization.manageCardReader)
7876
}
7977

80-
func configureBBPOSChipper2XBTManual(cell: UITableViewCell) {
81-
cell.imageView?.image = .cardReaderManualIcon
78+
func configureBBPOSChipper2XBTManual(cell: LeftImageTableViewCell) {
8279
cell.imageView?.tintColor = .text
8380
cell.accessoryType = .disclosureIndicator
8481
cell.selectionStyle = .default
85-
cell.textLabel?.text = NSLocalizedString("Card reader manual", comment: "Navigates to Card Reader manual")
82+
cell.configure(image: .cardReaderManualIcon, text: Localization.cardReaderManual)
8683
}
8784
}
8885

@@ -154,6 +151,27 @@ extension InPersonPaymentsMenuViewController {
154151
}
155152
}
156153

154+
// MARK: - Localizations
155+
//
156+
private extension InPersonPaymentsMenuViewController {
157+
enum Localization {
158+
static let orderCardReader = NSLocalizedString(
159+
"Order card reader",
160+
comment: "Navigates to Card Reader ordering screen"
161+
)
162+
163+
static let manageCardReader = NSLocalizedString(
164+
"Manage card reader",
165+
comment: "Navigates to Card Reader management screen"
166+
)
167+
168+
static let cardReaderManual = NSLocalizedString(
169+
"Card reader manual",
170+
comment: "Navigates to Card Reader manual"
171+
)
172+
}
173+
}
174+
157175
private enum Row: CaseIterable {
158176
case orderCardReader
159177
case manageCardReader
@@ -162,11 +180,11 @@ private enum Row: CaseIterable {
162180
var type: UITableViewCell.Type {
163181
switch self {
164182
case .orderCardReader:
165-
return BasicTableViewCell.self
183+
return LeftImageTableViewCell.self
166184
case .manageCardReader:
167-
return BasicTableViewCell.self
185+
return LeftImageTableViewCell.self
168186
case .bbposChipper2XBTManual:
169-
return BasicTableViewCell.self
187+
return LeftImageTableViewCell.self
170188
}
171189
}
172190

0 commit comments

Comments
 (0)