Skip to content

Commit 3aa1dc2

Browse files
Remove dead OrderStatus view Mode mechanism and redundant custom-status color arm
1 parent b498548 commit 3aa1dc2

4 files changed

Lines changed: 7 additions & 30 deletions

File tree

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/aiassistant/AiAssistantOrderCardRenderer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,5 @@ private fun resolveOrderStatusColor(status: String): Int =
8484
is Order.Status.Completed -> R.color.tag_bg_completed
8585
is Order.Status.Failed -> R.color.tag_bg_failed
8686
is Order.Status.OnHold -> R.color.tag_bg_on_hold
87-
is Order.Status.Custom -> R.color.tag_bg_other
8887
else -> R.color.tag_bg_other
8988
}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ import com.woocommerce.android.ui.orders.creation.views.ExpandableProductCard
8989
import com.woocommerce.android.ui.orders.creation.views.OrderCreateEditSectionView
9090
import com.woocommerce.android.ui.orders.creation.views.OrderCreateEditSectionView.AddButton
9191
import com.woocommerce.android.ui.orders.details.OrderStatusSelectorDialog.Companion.KEY_ORDER_STATUS_RESULT
92-
import com.woocommerce.android.ui.orders.details.views.OrderDetailOrderStatusView
9392
import com.woocommerce.android.ui.products.selector.ProductSelectorFragment
9493
import com.woocommerce.android.ui.products.selector.ProductSelectorFragmentArgs
9594
import com.woocommerce.android.ui.products.selector.ProductSelectorSharedViewModel
@@ -312,7 +311,6 @@ class OrderCreateEditFormFragment :
312311

313312
is Edit -> {
314313
orderStatusView.initView(
315-
mode = OrderDetailOrderStatusView.Mode.OrderEdit,
316314
editOrderStatusClickListener = {
317315
viewModel.orderStatusData.value?.let {
318316
viewModel.onEditOrderStatusClicked(it)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ import com.woocommerce.android.ui.orders.creation.shipping.ShippingLineDetails
7979
import com.woocommerce.android.ui.orders.details.adapter.OrderDetailShippingLabelsAdapter.OnShippingLabelClickListener
8080
import com.woocommerce.android.ui.orders.details.editing.OrderEditingViewModel
8181
import com.woocommerce.android.ui.orders.details.views.OrderDetailAttributionInfoView
82-
import com.woocommerce.android.ui.orders.details.views.OrderDetailOrderStatusView.Mode
8382
import com.woocommerce.android.ui.orders.details.views.OrderDetailWooShippingShipmentListView
8483
import com.woocommerce.android.ui.orders.fulfill.OrderFulfillViewModel
8584
import com.woocommerce.android.ui.orders.list.OrderListFragment
@@ -236,7 +235,7 @@ class OrderDetailFragment :
236235
setupResultHandlers(viewModel)
237236
setupOrdersCommunicationObservers(communicationViewModel)
238237

239-
binding.orderDetailOrderStatus.initView(mode = Mode.OrderEdit) {
238+
binding.orderDetailOrderStatus.initView {
240239
viewModel.onEditOrderStatusSelected()
241240
}
242241
binding.orderRefreshLayout.apply {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/views/OrderDetailOrderStatusView.kt

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,31 +52,12 @@ class OrderDetailOrderStatusView @JvmOverloads constructor(
5252
return "${date.getMediumDate(context)}, ${date.getTimeString(context)}"
5353
}
5454

55-
fun initView(mode: Mode, editOrderStatusClickListener: EditStatusClickListener? = null) {
56-
when (mode) {
57-
Mode.OrderEdit -> {
58-
val listener = requireNotNull(editOrderStatusClickListener) {
59-
"editOrderStatusClickListener must be provided when mode is OrderEdit"
60-
}
61-
binding.orderStatusEditImage.isVisible = true
62-
with(binding.orderStatusContainer) {
63-
isClickable = true
64-
isFocusable = true
65-
setOnClickListener(listener)
66-
}
67-
}
68-
Mode.ReadOnly -> {
69-
binding.orderStatusEditImage.isVisible = false
70-
with(binding.orderStatusContainer) {
71-
isClickable = false
72-
isFocusable = false
73-
setOnClickListener(null)
74-
}
75-
}
55+
fun initView(editOrderStatusClickListener: EditStatusClickListener) {
56+
binding.orderStatusEditImage.isVisible = true
57+
with(binding.orderStatusContainer) {
58+
isClickable = true
59+
isFocusable = true
60+
setOnClickListener(editOrderStatusClickListener)
7661
}
7762
}
78-
79-
enum class Mode {
80-
OrderEdit, ReadOnly
81-
}
8263
}

0 commit comments

Comments
 (0)