therbron/Moodl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix amount and total value equation when adding a fee while recording a transaction

Browse Source
This commit is contained in:
Tanguy Herbron 2018-08-16 04:06:15 +02:00
parent 6194ff501a
commit 89246e0919
1 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java
View File

@ -64,6 +64,8 @@ public class BuyFragment extends CustomRecordFragment {
private int transactionId; private int transactionId;
private Transaction transaction; private Transaction transaction;
private boolean isAmountLastUpdated;
private TextWatcher amountTextWatcher = new TextWatcher() { private TextWatcher amountTextWatcher = new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -93,6 +95,7 @@ public class BuyFragment extends CustomRecordFragment {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
totalValueEditText.addTextChangedListener(totalValueTextWatcher); totalValueEditText.addTextChangedListener(totalValueTextWatcher);
isAmountLastUpdated = true;
} }
}; };
@ -125,6 +128,7 @@ public class BuyFragment extends CustomRecordFragment {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
amoutEditText.addTextChangedListener(amountTextWatcher); amoutEditText.addTextChangedListener(amountTextWatcher);
isAmountLastUpdated = false;
} }
}; };
@ -269,6 +273,77 @@ public class BuyFragment extends CustomRecordFragment {
}); });
fees_editText = view.findViewById(R.id.fees_editText); fees_editText = view.findViewById(R.id.fees_editText);
fees_editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
totalValueEditText.removeTextChangedListener(totalValueTextWatcher);
amoutEditText.removeTextChangedListener(amountTextWatcher);
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
if(isFieldCorrectlyFilled(amoutEditText, false) && isFieldCorrectlyFilled(buyPriceEditText, false) && isFieldCorrectlyFilled(totalValueEditText, false))
{
double amount = Double.parseDouble(amoutEditText.getText().toString());
double purchasePrice = Double.parseDouble(buyPriceEditText.getText().toString());
double fees;
double totalValue = Double.parseDouble(totalValueEditText.getText().toString());
String feeCurrency;
if(isAmountLastUpdated)
{
totalValue = amount * purchasePrice;
}
else
{
amount = totalValue / purchasePrice;
}
if(fees_editText.getText().toString().equals("") || fees_editText.getText().toString().equals("0"))
{
if(isAmountLastUpdated)
{
totalValueEditText.setText(String.valueOf(amount * purchasePrice));
}
else
{
amoutEditText.setText(String.valueOf(totalValue / purchasePrice));
}
}
else
{
if(feesCurrencySpinner.getSelectedItemPosition() < 1)
{
feeCurrency = fragmentPair.getFrom();
}
else
{
feeCurrency = fragmentPair.getTo();
}
fees = getFees(feeCurrency, amount, purchasePrice);
if(isAmountLastUpdated)
{
totalValueEditText.setText(String.valueOf(totalValue + fees));
}
else
{
amoutEditText.setText(String.valueOf(amount - (fees / purchasePrice )));
}
}
}
}
@Override
public void afterTextChanged(Editable s) {
totalValueEditText.addTextChangedListener(totalValueTextWatcher);
amoutEditText.addTextChangedListener(amountTextWatcher);
}
});
note_editText = view.findViewById(R.id.note_editText); note_editText = view.findViewById(R.id.note_editText);
checkCallingIntent(); checkCallingIntent();