[30m]. Fix tests.

Author: Evgenii Kanivets

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

@@ -12,6 +12,7 @@
 import com.blogspot.e_kanivets.moneytracker.entity.Account;
 
 import java.util.List;
+import java.util.Locale;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -79,12 +80,16 @@ public View getView(final int position, View convertView, ViewGroup parent) {
         viewHolder.tvCurrency.setTextColor(account.getCurSum() >= 0 ? green : red);
 
         viewHolder.tvTitle.setText(account.getTitle());
-        viewHolder.tvCurSum.setText(Integer.toString(account.getCurSum()));
+        viewHolder.tvCurSum.setText(format(account.getCurSum()));
         viewHolder.tvCurrency.setText(account.getCurrency());
 
         return convertView;
     }
 
+    private String format(double amount) {
+        return (amount >= 0 ? "+ " : "- ") + String.format(Locale.getDefault(), "%.0f", Math.abs(amount));
+    }
+
     public static class ViewHolder {
         @Bind(R.id.tv_title)
         TextView tvTitle;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/AccountsSummaryPresenter.java

@@ -103,22 +103,26 @@ public void update() {
         if (report == null) {
             viewHolder.tvTotal.setTextColor(red);
             viewHolder.tvTotal.setText(R.string.error_exchange_rates);
+            viewHolder.tvCurrency.setText("");
         } else {
             viewHolder.tvTotal.setTextColor(report.getTotal() >= 0 ? green : red);
-            viewHolder.tvTotal.setText(format(report.getTotal(), report.getCurrency()));
+            viewHolder.tvTotal.setText(format(report.getTotal()));
+            viewHolder.tvCurrency.setTextColor(report.getTotal() >= 0 ? green : red);
+            viewHolder.tvCurrency.setText(report.getCurrency());
         }
     }
 
-    private String format(double amount, String currency) {
-        return (amount >= 0 ? "+ " : "- ") + String.format(Locale.getDefault(), "%.0f", Math.abs(amount))
-                + " " + currency;
+    private String format(double amount) {
+        return (amount >= 0 ? "+ " : "- ") + String.format(Locale.getDefault(), "%.0f", Math.abs(amount));
     }
 
     public static class ViewHolder {
         @Bind(R.id.spinner_currency)
         AppCompatSpinner spinnerCurrency;
         @Bind(R.id.tv_total)
         TextView tvTotal;
+        @Bind(R.id.tv_currency)
+        TextView tvCurrency;
 
         public ViewHolder(View view) {
             ButterKnife.bind(this, view);

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

@@ -49,9 +49,22 @@
 
         <TextView
             android:id="@+id/tv_total"
-            style="@style/Text_Body1"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:text="New Text"
+            android:theme="@style/Text_Body2" />
+
+        <TextView
+            android:id="@+id/tv_currency"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="monospace"
+            android:gravity="end"
+            android:paddingEnd="@dimen/zero_margin"
+            android:paddingStart="5dp"
+            android:text="New Text"
+            android:theme="@style/Text_Body1" />
 
     </LinearLayout>
 

app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ReportTest.java

@@ -254,5 +254,11 @@ public ExchangeRate getRate(@Nullable Record record) {
 
             }
         }
+
+        @Nullable
+        @Override
+        public ExchangeRate getRate(@Nullable Account account) {
+            return null;
+        }
     }
 }