Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Japan example app #108

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

[WIP] Japan example app #108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
56f7f02
bump compile sdk version to 28
gigiyy Sep 24, 2018
cdc6247
new module for Japan example app
gigiyy Sep 24, 2018
76500e5
order input screen
gigiyy Oct 3, 2018
79fcb33
change imports for SmallTest
gigiyy Oct 4, 2018
243c209
add event listeners for price, quantity and price type chages
gigiyy Oct 4, 2018
756ec02
fix element size while switched to market price
gigiyy Oct 4, 2018
8412a85
clean up code according to reviews by Feras
gigiyy Oct 4, 2018
f27283a
use view model to drive the market limit order button instead
gigiyy Oct 5, 2018
45765f2
use view model factory to create the OrderInputViewModel
gigiyy Oct 5, 2018
cb20ffd
use EditText to input the price/quantity
gigiyy Oct 9, 2018
5ac6be9
add resource files from Yahoo Japan
gigiyy Oct 11, 2018
ab93f6a
user can set order expiry
gigiyy Oct 11, 2018
ae9b3b4
user can pick account type
gigiyy Oct 12, 2018
f96f29a
user can pick a date for expiry
gigiyy Oct 12, 2018
ea2b985
apply material design to price/quantity selector
gigiyy Oct 14, 2018
820cff2
show error message below the edittext using the layout
gigiyy Oct 15, 2018
c8ed8d6
show smaller error message
gigiyy Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exampleAppJapan/src/main/kotlin/it/trade/android/japanapp/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.main_activity)
if (savedInstanceState == null) {
supportFragmentManager.beginTransaction()
.replace(R.id.container, OrderInputFragment.newInstance())
.replace(R.id.container, OrderInputFragment.newInstance("8704"))
.commitNow()
}
}
Expand Down
11 changes: 11 additions & 0 deletions ...pleAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput/OrderInputFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ class OrderInputFragment : Fragment() {

companion object {
fun newInstance() = OrderInputFragment()
fun newInstance(symbol: String): OrderInputFragment {
val args = Bundle()
args.putString("symbol", symbol)
val fragment = OrderInputFragment()
fragment.arguments = args
return fragment
}
}

private lateinit var viewModel: OrderInputViewModel
Expand All @@ -29,6 +36,9 @@ class OrderInputFragment : Fragment() {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProviders.of(activity!!).get(OrderInputViewModel::class.java)
// TODO: Use the ViewModel
arguments?.getString("symbol")?.let {
viewModel.init(it)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To init a ViewModel you need to create custom factory and use it with ViewModelProviders: https://android.jlelse.eu/android-viewmodel-with-custom-arguments-d0ff0fba29e1

}
viewModel.getOrderModel().observe(this, Observer { orderForm ->
orderForm?.run {
tvSymbolName.text = symbol.name
Expand Down Expand Up @@ -71,6 +81,7 @@ class OrderInputFragment : Fragment() {
btLimit.isChecked = false
Copy link

@falnatsheh falnatsheh Oct 4, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any thoughts on having btLimit and btMarket boolean in the ViewModel vs here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they are actually the button itself, here we're make it selected or not. however it can be made more concise or nature if keep the status in viewModel and linked them together. I'll try

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using the model turns out a better solution. I've got a OrderType in my OrderInfo already.

btMarket.isChecked = true
togglePriceType()
viewModel.resetPrice()
}
btLimit.setOnClickListener {
btLimit.isChecked = true
Expand Down
24 changes: 21 additions & 3 deletions ...leAppJapan/src/main/kotlin/it/trade/android/japanapp/ui/orderinput/OrderInputViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,24 @@ class OrderInputViewModel : ViewModel() {
}
}

fun init(symbol: String?) {
// TODO need a cleaner way to initialize the OrderForm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!this::orderForm.isInitialized is needed? since this is the init of the class I assume this::orderForm.isInitialized will return false

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when screen rotates, Fragment will call init again. however we don't need to init the ViewModel since we should reuse the model in this case. I'm still looking if there is a way to call this init only once and when it's needed. (need to dig into how Fragment works for this)

Copy link

@falnatsheh falnatsheh Oct 4, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When configuration changes the fragment is destroyed and then recreated by the fragment manager. However the ViewModel survives configuration changes so when the activity is recreated and you call the ViewModelProviders here you actually get the same instance. https://developer.android.com/topic/libraries/architecture/viewmodel#lifecycle

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the view model factory works well. removed the init method now.

if (symbol != null) {
if (!this::orderForm.isInitialized || (this::orderForm.isInitialized && symbol != orderForm.value?.symbol?.symbol)) {
orderForm = MutableLiveData()
orderForm.value = OrderForm(
TradeItSDKHolder.getSymbolProvider().getJapanSymbol(symbol),
TradeItSDKHolder.getBuyingPower())
}
}
}

fun resetPrice() {
val value = orderForm.value
orderForm.value = value?.apply {
orderInfo = orderInfo.copy(limitPrice = symbol.price)
}
}
}

class OrderForm(val symbol: JapanSymbol, val buyingPower: BuyingPower) {
Expand Down Expand Up @@ -94,13 +112,13 @@ class OrderForm(val symbol: JapanSymbol, val buyingPower: BuyingPower) {

//TODO temp solutions below
interface JapanSymbolProvider {
fun getJapanSymbol(symol: String): JapanSymbol
fun getJapanSymbol(symbol: String): JapanSymbol
}

class SampleJapanSymbol : JapanSymbolProvider {
override fun getJapanSymbol(symol: String): JapanSymbol {
override fun getJapanSymbol(symbol: String): JapanSymbol {
return JapanSymbol("カブドットコム証券(株)",
"8703", "東証1部", 386.0,
symbol, "東証1部", 386.0,
384.0, 286.0, 486.0, 100)
}
}
Expand Down
13 changes: 7 additions & 6 deletions exampleAppJapan/src/main/res/layout/order_input_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,12 @@

<android.support.v7.widget.LinearLayoutCompat
android:id="@+id/orderInfo"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="@+id/quantityInput"
app:layout_constraintStart_toStartOf="@+id/quantityInput"
app:layout_constraintTop_toBottomOf="@+id/divider3">


Expand Down Expand Up @@ -342,8 +343,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="@+id/orderInfo"
app:layout_constraintStart_toStartOf="@+id/orderInfo"
app:layout_constraintEnd_toEndOf="@+id/quantityInput"
app:layout_constraintStart_toStartOf="@+id/quantityInput"
app:layout_constraintTop_toBottomOf="@+id/divider4">

<android.support.v7.widget.LinearLayoutCompat
Expand Down Expand Up @@ -417,8 +418,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="@+id/orderInfo"
app:layout_constraintStart_toStartOf="@+id/orderInfo"
app:layout_constraintEnd_toEndOf="@+id/quantityInput"
app:layout_constraintStart_toStartOf="@+id/quantityInput"
app:layout_constraintTop_toBottomOf="@+id/divider5">

<android.support.v7.widget.LinearLayoutCompat
Expand Down