#80[30m]. Update EditText fields to work with doubles.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java

@@ -78,10 +78,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void addAccount() {
         String title = etTitle.getText().toString().trim();
-        int initSum = Integer.parseInt(etInitSum.getText().toString().trim());
+        double initSum = Double.parseDouble(etInitSum.getText().toString().trim());
         String currency = (String) spinner.getSelectedItem();
 
-        Account account = new Account(title, initSum, currency, 0);
+        int intInitSum = (int) initSum;
+        int decInitSum = (int) ((initSum - intInitSum) * 100);
+
+        Account account = new Account(title, intInitSum, currency, decInitSum);
 
         accountController.create(account);
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java

@@ -94,22 +94,27 @@ private void doTransfer() {
         Account fromAccount = accountList.get(spinnerFrom.getSelectedItemPosition());
         Account toAccount = accountList.get(spinnerTo.getSelectedItemPosition());
 
-        int fromAmount = -1;
+        double fromAmount = -1;
         try {
-            fromAmount = Integer.parseInt(etFromAmount.getText().toString());
+            fromAmount = Double.parseDouble(etFromAmount.getText().toString());
         } catch (NumberFormatException e) {
             e.printStackTrace();
         }
 
-        int toAmount = -1;
+        double toAmount = -1;
         try {
-            toAmount = Integer.parseInt(etToAmount.getText().toString());
+            toAmount = Double.parseDouble(etToAmount.getText().toString());
         } catch (NumberFormatException e) {
             e.printStackTrace();
         }
 
+        int intFromAmount = (int) fromAmount;
+        int decFromAmount = (int) ((fromAmount - intFromAmount) * 100);
+        int intToAmount = (int) toAmount;
+        int decToAmount = (int) ((toAmount - intToAmount) * 100);
+
         Transfer transfer = new Transfer(System.currentTimeMillis(), fromAccount.getId(),
-                toAccount.getId(), fromAmount, toAmount, 0, 0);
+                toAccount.getId(), intFromAmount, intToAmount, decFromAmount, decToAmount);
         transferController.create(transfer);
     }
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java

@@ -224,9 +224,9 @@ private boolean prepareRecord() {
 
         //Check if price is valid
         //noinspection UnusedAssignment
-        int price = -1;
+        double price = -1;
         try {
-            price = Integer.parseInt(etPrice.getText().toString());
+            price = Double.parseDouble(etPrice.getText().toString());
         } catch (NumberFormatException e) {
             e.printStackTrace();
         }
@@ -240,27 +240,33 @@ private boolean prepareRecord() {
         } else return false;
     }
 
-    private boolean doRecord(String title, String category, int price, @Nullable Account account) {
+    private boolean doRecord(String title, String category, double price, @Nullable Account account) {
         if (account == null) return false;
 
+        int intPrice = (int) price;
+        int decPrice = (int) ((price - intPrice) * 100);
+
         if (mode == Mode.MODE_ADD) {
             switch (type) {
                 case Record.TYPE_EXPENSE:
                     recordController.create(new Record(new Date().getTime(), Record.TYPE_EXPENSE,
-                            title, new Category(category), price, account, account.getCurrency(), 0));
+                            title, new Category(category), intPrice, account, account.getCurrency(),
+                            decPrice));
                     return true;
 
                 case Record.TYPE_INCOME:
                     recordController.create(new Record(new Date().getTime(), Record.TYPE_INCOME,
-                            title, new Category(category), price, account, account.getCurrency(), 0));
+                            title, new Category(category), intPrice, account, account.getCurrency(),
+                            decPrice));
                     return true;
 
                 default:
                     return false;
             }
         } else if (mode == Mode.MODE_EDIT) {
             Record updatedRecord = new Record(record.getId(), record.getTime(), record.getType(),
-                    title, new Category(category), price, account, account.getCurrency(), 0);
+                    title, new Category(category), intPrice, account, account.getCurrency(),
+                    decPrice);
             recordController.update(updatedRecord);
 
             return true;

app/src/main/res/layout/content_add_account.xml

@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/initial_sum"
-            android:inputType="numberSigned"
+            android:inputType="numberDecimal|numberSigned"
             android:maxLines="1"
             android:singleLine="true" />
 

app/src/main/res/layout/content_add_record.xml

@@ -29,9 +29,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/price"
-            android:inputType="numberSigned"
             android:maxLines="1"
-            android:singleLine="true" />
+            android:singleLine="true"
+            android:inputType="numberDecimal" />
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout

app/src/main/res/layout/content_transfer.xml

@@ -40,10 +40,10 @@
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:hint="@string/amount"
-                android:inputType="number"
                 android:maxLines="1"
                 android:nextFocusDown="@+id/et_to_amount"
-                android:singleLine="true" />
+                android:singleLine="true"
+                android:inputType="numberDecimal" />
         </android.support.design.widget.TextInputLayout>
     </LinearLayout>
 
@@ -77,9 +77,9 @@
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:hint="@string/amount"
-                android:inputType="number"
                 android:maxLines="1"
-                android:singleLine="true" />
+                android:singleLine="true"
+                android:inputType="numberDecimal" />
         </android.support.design.widget.TextInputLayout>
     </LinearLayout>