#12[30m]. Bind default currency to default account.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java

@@ -10,6 +10,7 @@
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.entity.Account;
 import com.blogspot.e_kanivets.moneytracker.model.Period;
 import com.blogspot.e_kanivets.moneytracker.entity.Record;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
@@ -54,8 +55,8 @@ protected boolean initData() {
         ExchangeRateController rateController = new ExchangeRateController(new ExchangeRateRepo(dbHelper));
 
         String currency = DbHelper.DEFAULT_ACCOUNT_CURRENCY;
-        if (accountController.readAll().size() > 0)
-            currency = accountController.readAll().get(0).getCurrency();
+        Account defaultAccount = accountController.readDefaultAccount();
+        if (defaultAccount != null) currency = defaultAccount.getCurrency();
 
         ReportMaker reportMaker = new ReportMaker(rateController);
         report = reportMaker.getReport(currency, period, recordList);

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

@@ -18,6 +18,7 @@
 import com.blogspot.e_kanivets.moneytracker.controller.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
 import com.blogspot.e_kanivets.moneytracker.controller.RecordController;
+import com.blogspot.e_kanivets.moneytracker.entity.Account;
 import com.blogspot.e_kanivets.moneytracker.entity.Category;
 import com.blogspot.e_kanivets.moneytracker.entity.Record;
 import com.blogspot.e_kanivets.moneytracker.model.Period;
@@ -186,8 +187,8 @@ private void update() {
         listView.setAdapter(new RecordAdapter(MainActivity.this, recordList));
 
         String currency = DbHelper.DEFAULT_ACCOUNT_CURRENCY;
-        if (accountController.readAll().size() > 0)
-            currency = accountController.readAll().get(0).getCurrency();
+        Account defaultAccount = accountController.readDefaultAccount();
+        if (defaultAccount != null) currency = defaultAccount.getCurrency();
 
         ReportMaker reportMaker = new ReportMaker(rateController);
         IReport report = reportMaker.getReport(currency, period, recordList);

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

@@ -12,6 +12,7 @@
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
+import com.blogspot.e_kanivets.moneytracker.entity.Account;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 import com.blogspot.e_kanivets.moneytracker.repo.ExchangeRateRepo;
 import com.blogspot.e_kanivets.moneytracker.report.ReportMaker;
@@ -67,8 +68,8 @@ public View create() {
                 android.R.layout.simple_list_item_1, currencyList));
 
         String currency = DbHelper.DEFAULT_ACCOUNT_CURRENCY;
-        if (accountController.readAll().size() > 0)
-            currency = accountController.readAll().get(0).getCurrency();
+        Account defaultAccount = accountController.readDefaultAccount();
+        if (defaultAccount != null) currency = defaultAccount.getCurrency();
 
         for (int i = 0; i < currencyList.size(); i++) {
             String item = currencyList.get(i);