#80[30m]. Refactor double precision code.

Author: Evgenii Kanivets

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

@@ -81,12 +81,7 @@ private void addAccount() {
         double initSum = Double.parseDouble(etInitSum.getText().toString().trim());
         String currency = (String) spinner.getSelectedItem();
 
-        int intInitSum = (int) initSum;
-        // Strange calculation because of double type precision issue
-        int decInitSum = (int) Math.round(initSum * 100 - intInitSum * 100);
-
-        Account account = new Account(title, intInitSum, currency, decInitSum);
-
+        Account account = new Account(title, initSum, currency);
         accountController.create(account);
     }
 }

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

@@ -108,16 +108,8 @@ private void doTransfer() {
             e.printStackTrace();
         }
 
-        int intFromAmount = (int) fromAmount;
-        // Strange calculation because of double type precision issue
-        int decFromAmount = (int) Math.round(fromAmount * 100 - intFromAmount * 100);
-
-        int intToAmount = (int) toAmount;
-        // Strange calculation because of double type precision issue
-        int decToAmount = (int) Math.round(toAmount * 100 - intToAmount * 100);
-
         Transfer transfer = new Transfer(System.currentTimeMillis(), fromAccount.getId(),
-                toAccount.getId(), intFromAmount, intToAmount, decFromAmount, decToAmount);
+                toAccount.getId(), fromAmount, toAmount);
         transferController.create(transfer);
     }
 }

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

@@ -243,31 +243,24 @@ private boolean prepareRecord() {
     private boolean doRecord(String title, String category, double price, @Nullable Account account) {
         if (account == null) return false;
 
-        int intPrice = (int) price;
-        // Strange calculation because of double type precision issue
-        int decPrice = (int) Math.round(price * 100 - 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), intPrice, account, account.getCurrency(),
-                            decPrice));
+                            title, new Category(category), price, account, account.getCurrency()));
                     return true;
 
                 case Record.TYPE_INCOME:
                     recordController.create(new Record(new Date().getTime(), Record.TYPE_INCOME,
-                            title, new Category(category), intPrice, account, account.getCurrency(),
-                            decPrice));
+                            title, new Category(category), price, account, account.getCurrency()));
                     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), intPrice, account, account.getCurrency(),
-                    decPrice);
+                    title, new Category(category), price, account, account.getCurrency());
             recordController.update(updatedRecord);
 
             return true;
@@ -277,4 +270,4 @@ title, new Category(category), intPrice, account, account.getCurrency(),
     }
 
     public enum Mode {MODE_ADD, MODE_EDIT}
-}
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/base/BaseEntity.java

@@ -18,4 +18,13 @@ protected boolean equals(String str1, String str2) {
         if (str1 == null) return str2 == null;
         else return str1.equals(str2);
     }
-}
+
+    protected int getInteger(double value) {
+        return (int) value;
+    }
+
+    protected int getDecimal(double value) {
+        // Strange calculation because of double type precision issue
+        return  (int) Math.round(value * 100 - getInteger(value) * 100);
+    }
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Account.java

@@ -25,12 +25,12 @@ public Account(long id, String title, int curSum, String currency, int decimals)
         this.decimals = decimals;
     }
 
-    public Account(String title, int curSum, String currency, int decimals) {
+    public Account(String title, double curSum, String currency) {
         this.id = -1;
         this.title = title;
-        this.curSum = curSum;
         this.currency = currency;
-        this.decimals = decimals;
+        this.curSum = getInteger(curSum);
+        this.decimals = getDecimal(curSum);
     }
 
     protected Account(Parcel in) {
@@ -76,17 +76,15 @@ public String getCurrency() {
     public void put(double amount) {
         double sum = curSum + decimals / 100.0;
         sum += amount;
-        curSum = (int) sum;
-        // Strange calculation because of double type precision issue
-        decimals = (int) Math.round(sum * 100 - curSum * 100);
+        curSum = getInteger(sum);
+        decimals = getDecimal(sum);
     }
 
     public void take(double amount) {
         double sum = curSum + decimals / 100.0;
         sum -= amount;
-        curSum = (int) sum;
-        // Strange calculation because of double type precision issue
-        decimals = (int) Math.round(sum * 100 - curSum * 100);
+        curSum = getInteger(sum);
+        decimals = getDecimal(sum);
     }
 
     @SuppressWarnings("SimplifiableIfStatement")

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java

@@ -50,17 +50,30 @@ public Record(long id, long time, int type, String title, Category category, int
         this.decimals = decimals;
     }
 
-    public Record(long time, int type, String title, Category category, int price, Account account,
-                  String currency, int decimals) {
+    public Record(long id, long time, int type, String title, Category category, double price,
+                  Account account, String currency) {
+        this.id = id;
+        this.time = time;
+        this.type = type;
+        this.title = title;
+        this.category = category;
+        this.account = account;
+        this.currency = currency;
+        this.price = getInteger(price);
+        this.decimals = getDecimal(price);
+    }
+
+    public Record(long time, int type, String title, Category category, double price, Account account,
+                  String currency) {
         this.id = -1;
         this.time = time;
         this.type = type;
         this.title = title;
         this.category = category;
-        this.price = price;
         this.account = account;
         this.currency = currency;
-        this.decimals = decimals;
+        this.price = getInteger(price);
+        this.decimals = getDecimal(price);
     }
 
     protected Record(Parcel in) {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Transfer.java

@@ -32,15 +32,14 @@ public Transfer(long id, long time, long fromAccountId, long toAccountId, int fr
         this.toAmount = toAmount;
     }
 
-    public Transfer(long time, long fromAccountId, long toAccountId, int fromAmount,
-                    int toAmount, int fromDecimals, int toDecimals) {
+    public Transfer(long time, long fromAccountId, long toAccountId, double fromAmount, double toAmount) {
         this.time = time;
         this.fromAccountId = fromAccountId;
         this.toAccountId = toAccountId;
-        this.fromAmount = fromAmount;
-        this.toAmount = toAmount;
-        this.fromDecimals = fromDecimals;
-        this.toDecimals = toDecimals;
+        this.fromAmount = getInteger(fromAmount);
+        this.fromDecimals = getDecimal(fromAmount);
+        this.toAmount = getInteger(toAmount);
+        this.toDecimals = getDecimal(toAmount);
     }
 
     protected Transfer(Parcel in) {