File tree Expand file tree Collapse file tree
WooCommerce/src/main/kotlin/com/woocommerce/android/ui Expand file tree Collapse file tree Original file line number Diff line number Diff 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 }
Original file line number Diff line number Diff line change @@ -89,7 +89,6 @@ import com.woocommerce.android.ui.orders.creation.views.ExpandableProductCard
8989import com.woocommerce.android.ui.orders.creation.views.OrderCreateEditSectionView
9090import com.woocommerce.android.ui.orders.creation.views.OrderCreateEditSectionView.AddButton
9191import com.woocommerce.android.ui.orders.details.OrderStatusSelectorDialog.Companion.KEY_ORDER_STATUS_RESULT
92- import com.woocommerce.android.ui.orders.details.views.OrderDetailOrderStatusView
9392import com.woocommerce.android.ui.products.selector.ProductSelectorFragment
9493import com.woocommerce.android.ui.products.selector.ProductSelectorFragmentArgs
9594import 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)
Original file line number Diff line number Diff line change @@ -79,7 +79,6 @@ import com.woocommerce.android.ui.orders.creation.shipping.ShippingLineDetails
7979import com.woocommerce.android.ui.orders.details.adapter.OrderDetailShippingLabelsAdapter.OnShippingLabelClickListener
8080import com.woocommerce.android.ui.orders.details.editing.OrderEditingViewModel
8181import com.woocommerce.android.ui.orders.details.views.OrderDetailAttributionInfoView
82- import com.woocommerce.android.ui.orders.details.views.OrderDetailOrderStatusView.Mode
8382import com.woocommerce.android.ui.orders.details.views.OrderDetailWooShippingShipmentListView
8483import com.woocommerce.android.ui.orders.fulfill.OrderFulfillViewModel
8584import 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 {
Original file line number Diff line number Diff 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}
You can’t perform that action at this time.
0 commit comments