Added totals fields to report

Author: Evgeniy Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java

@@ -74,7 +74,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
         tvTime.setText(dateFormat.format(new Date(records.get(position).getTime())));
 
         tvPrice.setText((records.get(position).isIncome() ? "+ " : "- ")
-                + Integer.toString(records.get(position).getPrice()));
+                + "$" + Integer.toString(records.get(position).getPrice()));
         tvTitle.setText(records.get(position).getTitle());
         tvCategory.setText(records.get(position).getCategory());
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/model/Report.java

@@ -45,17 +45,26 @@ private void makeReport() {
         }
 
         // Calculate total of all records
-        int total = 0;
+        int totalIncome = 0, totalExpense = 0;
 
         //Convert HashMap to ArrayList
         reportList = new ArrayList<Pair<String, Integer>>();
         for(String name : map.keySet()) {
             reportList.add(new Pair<String, Integer>(name, map.get(name)));
-            total += map.get(name);
+            if(map.get(name) > 0) {
+                totalIncome += map.get(name);
+            }
+            else {
+                totalExpense += map.get(name);
+            }
         }
 
         //Add summary row to list
         reportList.add(new Pair<String, Integer>(
-                MTApp.get().getResources().getString(R.string.total) + " :", total));
+                MTApp.get().getResources().getString(R.string.total_incomes) + " :", totalIncome));
+        reportList.add(new Pair<String, Integer>(
+                MTApp.get().getResources().getString(R.string.total_expenses) + " :", totalExpense));
+        reportList.add(new Pair<String, Integer>(
+                MTApp.get().getResources().getString(R.string.total) + " :", totalExpense + totalIncome));
     }
 }

app/src/main/res/values/strings.xml

@@ -20,6 +20,8 @@
     <string name="report">Report</string>
     <string name="change_date">CHANGE THE DATE</string>
     <string name="total">TOTAL</string>
+    <string name="total_incomes">Total incomes</string>
+    <string name="total_expenses">Total expenses</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="save">Save</string>