use view model to drive the market limit order button instead

tradingticket · Oct 5, 2018 · f27283a · f27283a
1 parent 8412a85
commit f27283a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/...pleAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput/OrderInputFragment.kt b/...pleAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput/OrderInputFragment.kt
@@ -54,6 +54,8 @@ class OrderInputFragment : Fragment() {
 
                 etQuantity.setText(String.format("%d", orderInfo.quantity))
                 etPrice.setText(String.format("%.0f", orderInfo.limitPrice))
+                btMarket.isChecked = orderInfo.type == OrderType.MARKET
+                btLimit.isChecked = orderInfo.type == OrderType.LIMIT
 
                 val lower = String.format("%,.0f", symbol.priceLowerLimit)
                 val upper = String.format("%,.0f", symbol.priceUpperLimit)
@@ -74,17 +76,12 @@ class OrderInputFragment : Fragment() {
         btPriceMinus.setOnClickListener {
             viewModel.decreasePrice()
         }
-        btLimit.isChecked = true
-        btMarket.isChecked = false
         btMarket.setOnClickListener {
-            btLimit.isChecked = false
-            btMarket.isChecked = true
+            viewModel.setMarketOrder()
             togglePriceType()
-            viewModel.resetPrice()
         }
         btLimit.setOnClickListener {
-            btLimit.isChecked = true
-            btMarket.isChecked = false
+            viewModel.setLimitOrder()
             togglePriceType()
         }
     }

diff --git a/...leAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput/OrderInputViewModel.kt b/...leAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput/OrderInputViewModel.kt
@@ -5,8 +5,6 @@ import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
 
 class OrderInputViewModel : ViewModel() {
-    // TODO: Implement the ViewModel
-
     private lateinit var orderForm: MutableLiveData<OrderForm>
 
     fun getOrderModel(): LiveData<OrderForm> {
@@ -63,9 +61,15 @@ class OrderInputViewModel : ViewModel() {
         }
     }
 
-    fun resetPrice() {
+    fun setMarketOrder() {
+        orderForm.value = orderForm.value?.apply {
+            orderInfo = orderInfo.copy(type = OrderType.MARKET, limitPrice = symbol.price)
+        }
+    }
+
+    fun setLimitOrder() {
         orderForm.value = orderForm.value?.apply {
-            orderInfo = orderInfo.copy(limitPrice = symbol.price)
+            orderInfo = orderInfo.copy(type = OrderType.LIMIT)
         }
     }
 }