Skip to content

Commit 5ed4e0c

Browse files
committed
Simplified accessoryType logic. Addressed PR feedback.
1 parent 8ea8883 commit 5ed4e0c

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

WooCommerce/Classes/ViewRelated/Coupons/Add and Edit Coupons/DiscountTypeBottomSheetListSelectorCommand.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ final class DiscountTypeBottomSheetListSelectorCommand: BottomSheetListSelectorC
2828
image: model.actionSheetIcon,
2929
imageTintColor: .gray(.shade20),
3030
numberOfLinesForText: 0,
31-
isSelected: isSelected(model: model),
32-
isActionable: false,
33-
showsDisclosureIndicator: true)
31+
isSelected: isSelected(model: model)
32+
)
3433
cell.updateUI(viewModel: viewModel)
3534
}
3635

WooCommerce/Classes/ViewRelated/Orders/Order Creation/FlowCoordinator/BottomSheetOrderType.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ final class OrderTypeBottomSheetListSelectorCommand: BottomSheetListSelectorComm
7777
image: model.actionSheetImage,
7878
imageTintColor: .gray(.shade20),
7979
numberOfLinesForTitle: 0,
80-
numberOfLinesForText: 0,
81-
isActionable: true)
80+
numberOfLinesForText: 0)
8281
cell.updateUI(viewModel: viewModel)
8382
}
8483

WooCommerce/Classes/ViewRelated/Products/Edit Product/Cells/ImageAndTitleAndTextTableViewCell.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ extension ImageAndTitleAndTextTableViewCell {
161161
contentImageView.image = viewModel.image
162162
contentImageStackView.isHidden = viewModel.image == nil
163163
accessoryType = viewModel.showsDisclosureIndicator ? .disclosureIndicator : .none
164-
if viewModel.isActionable && viewModel.showsDisclosureIndicator == false {
165-
accessoryType = .none
166-
} else if viewModel.isActionable == false && viewModel.showsDisclosureIndicator && viewModel.isSelected {
164+
if viewModel.showsDisclosureIndicator {
165+
accessoryType = .disclosureIndicator
166+
} else if viewModel.isSelected {
167167
accessoryType = .checkmark
168-
} else if viewModel.isActionable == false && viewModel.showsDisclosureIndicator && viewModel.isSelected == false {
168+
} else {
169169
accessoryType = .none
170170
}
171171
selectionStyle = viewModel.isActionable ? .default: .none

0 commit comments

Comments
 (0)