File tree 2 files changed +12
-11
lines changed
exampleAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput
2 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -54,6 +54,8 @@ class OrderInputFragment : Fragment() {
54
54
55
55
etQuantity.setText(String .format(" %d" , orderInfo.quantity))
56
56
etPrice.setText(String .format(" %.0f" , orderInfo.limitPrice))
57
+ btMarket.isChecked = orderInfo.type == OrderType .MARKET
58
+ btLimit.isChecked = orderInfo.type == OrderType .LIMIT
57
59
58
60
val lower = String .format(" %,.0f" , symbol.priceLowerLimit)
59
61
val upper = String .format(" %,.0f" , symbol.priceUpperLimit)
@@ -74,17 +76,12 @@ class OrderInputFragment : Fragment() {
74
76
btPriceMinus.setOnClickListener {
75
77
viewModel.decreasePrice()
76
78
}
77
- btLimit.isChecked = true
78
- btMarket.isChecked = false
79
79
btMarket.setOnClickListener {
80
- btLimit.isChecked = false
81
- btMarket.isChecked = true
80
+ viewModel.setMarketOrder()
82
81
togglePriceType()
83
- viewModel.resetPrice()
84
82
}
85
83
btLimit.setOnClickListener {
86
- btLimit.isChecked = true
87
- btMarket.isChecked = false
84
+ viewModel.setLimitOrder()
88
85
togglePriceType()
89
86
}
90
87
}
Original file line number Diff line number Diff line change @@ -5,8 +5,6 @@ import android.arch.lifecycle.MutableLiveData
5
5
import android.arch.lifecycle.ViewModel
6
6
7
7
class OrderInputViewModel : ViewModel () {
8
- // TODO: Implement the ViewModel
9
-
10
8
private lateinit var orderForm: MutableLiveData <OrderForm >
11
9
12
10
fun getOrderModel (): LiveData <OrderForm > {
@@ -63,9 +61,15 @@ class OrderInputViewModel : ViewModel() {
63
61
}
64
62
}
65
63
66
- fun resetPrice () {
64
+ fun setMarketOrder () {
65
+ orderForm.value = orderForm.value?.apply {
66
+ orderInfo = orderInfo.copy(type = OrderType .MARKET , limitPrice = symbol.price)
67
+ }
68
+ }
69
+
70
+ fun setLimitOrder () {
67
71
orderForm.value = orderForm.value?.apply {
68
- orderInfo = orderInfo.copy(limitPrice = symbol.price )
72
+ orderInfo = orderInfo.copy(type = OrderType . LIMIT )
69
73
}
70
74
}
71
75
}
You can’t perform that action at this time.
0 commit comments