Remove last use of deprecated AmountInputFormatter.

ZcMirror · Apr 18, 2016 · cbfb3cc · cbfb3cc
1 parent 07756f3
commit cbfb3cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 94 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/dialog/TransferFundsDialogFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/dialog/TransferFundsDialogFragment.java
@@ -42,7 +42,6 @@
 import org.gnucash.android.model.Price;
 import org.gnucash.android.ui.transaction.TransactionFormFragment;
 import org.gnucash.android.ui.transaction.TransactionsActivity;
-import org.gnucash.android.ui.util.AmountInputFormatter;
 import org.gnucash.android.ui.util.OnTransferFundsListener;
 
 import java.math.BigDecimal;
@@ -135,7 +134,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         mExchangeRateInput.addTextChangedListener(textChangeListener);
         mConvertedAmountInput.addTextChangedListener(textChangeListener);
-        mConvertedAmountInput.addTextChangedListener(new AmountInputFormatter(mConvertedAmountInput));
 
         mConvertedAmountRadioButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override

diff --git a/app/src/main/java/org/gnucash/android/ui/util/AmountInputFormatter.java b/app/src/main/java/org/gnucash/android/ui/util/AmountInputFormatter.java
diff --git a/app/src/main/res/layout/dialog_transfer_funds.xml b/app/src/main/res/layout/dialog_transfer_funds.xml
@@ -138,10 +138,13 @@
                     android:layout_width="0dp"
                     android:layout_weight="2"
                     android:layout_height="wrap_content">
+                    <!-- FIXME: make android:digits locale independent -->
                     <EditText android:id="@+id/input_converted_amount"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="numberDecimal"
+                        android:digits="0123456789.,"
+                        android:imeOptions="actionDone"
                         android:hint="@string/hint_converted_amount">
                         <requestFocus />
                     </EditText>