Merge pull request #55 from evgenii-kanivets/dagger

Dagger 2

Author: Evgenii

app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/RecordRepoTest.java

@@ -47,7 +47,7 @@ public void testContentValues() throws Exception {
         expected.put(DbHelper.TYPE_COLUMN, Record.TYPE_EXPENSE);
         expected.put(DbHelper.TITLE_COLUMN, "title");
         expected.put(DbHelper.CATEGORY_ID_COLUMN, 1L);
-        expected.put(DbHelper.PRICE_COLUMN, 100);
+        expected.put(DbHelper.PRICE_COLUMN, 100.0);
         expected.put(DbHelper.ACCOUNT_ID_COLUMN, 1L);
         expected.put(DbHelper.CURRENCY_COLUMN, "NON");
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java

@@ -2,6 +2,11 @@
 
 import android.app.Application;
 
+import com.blogspot.e_kanivets.moneytracker.di.AppComponent;
+import com.blogspot.e_kanivets.moneytracker.di.DaggerAppComponent;
+import com.blogspot.e_kanivets.moneytracker.di.module.ControllerModule;
+import com.blogspot.e_kanivets.moneytracker.di.module.RepoModule;
+
 /**
  * Custom application implementation.
  * Created on 29/08/14.
@@ -16,10 +21,24 @@ public static MtApp get() {
         return mtApp;
     }
 
+    private AppComponent component;
+
     @Override
     public void onCreate() {
         super.onCreate();
 
         mtApp = this;
+        component = buildComponent();
+    }
+
+    public AppComponent getAppComponent() {
+        return component;
+    }
+
+    private AppComponent buildComponent() {
+        return DaggerAppComponent.builder()
+                .repoModule(new RepoModule(get()))
+                .controllerModule(new ControllerModule())
+                .build();
     }
 }

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

@@ -2,45 +2,42 @@
 
 import android.os.Environment;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
-import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
-import com.blogspot.e_kanivets.moneytracker.controller.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.controller.RecordController;
-import com.blogspot.e_kanivets.moneytracker.entity.Category;
-import com.blogspot.e_kanivets.moneytracker.entity.Record;
-import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
-import com.blogspot.e_kanivets.moneytracker.repo.CategoryRepo;
-import com.blogspot.e_kanivets.moneytracker.repo.RecordRepo;
-import com.blogspot.e_kanivets.moneytracker.repo.base.IRepo;
 import com.blogspot.e_kanivets.moneytracker.util.Constants;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.OnClick;
 
 public class ExportActivity extends BaseBackActivity {
+    @SuppressWarnings("unused")
     private static final String TAG = "ExportActivity";
 
+    @Inject
+    RecordController recordController;
+
     @Override
     protected int getContentViewId() {
         return R.layout.activity_export;
     }
 
+    @Override
+    protected boolean initData() {
+        boolean result = super.initData();
+        MtApp.get().getAppComponent().inject(ExportActivity.this);
+        return result;
+    }
+
     @OnClick(R.id.btn_export)
     public void exportRecords() {
-        DbHelper dbHelper = new DbHelper(ExportActivity.this);
-        IRepo<Category> categoryRepo = new CategoryRepo(dbHelper);
-        CategoryController categoryController = new CategoryController(categoryRepo);
-        AccountController accountController = new AccountController(new AccountRepo(dbHelper));
-        IRepo<Record> recordRepo = new RecordRepo(dbHelper);
-
-        RecordController recordController = new RecordController(recordRepo, categoryController, accountController);
-
         List<String> records = recordController.getRecordsForExport(0, Long.MAX_VALUE);
 
         File outFile = new File(Environment.getExternalStorageDirectory(), Constants.DEFAULT_EXPORT_FILE_NAME);

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

@@ -4,6 +4,7 @@
 import android.support.v7.app.AlertDialog;
 import android.widget.ExpandableListView;
 
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.ExpandableListReportAdapter;
@@ -13,15 +14,15 @@
 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;
-import com.blogspot.e_kanivets.moneytracker.repo.ExchangeRateRepo;
 import com.blogspot.e_kanivets.moneytracker.report.ReportConverter;
 import com.blogspot.e_kanivets.moneytracker.report.ReportMaker;
 import com.blogspot.e_kanivets.moneytracker.report.base.IReport;
 import com.blogspot.e_kanivets.moneytracker.ui.ShortSummaryPresenter;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.Bind;
 
 public class ReportActivity extends BaseBackActivity {
@@ -31,9 +32,15 @@ public class ReportActivity extends BaseBackActivity {
     public static final String KEY_PERIOD = "key_period";
     public static final String KEY_RECORD_LIST = "key_record_list";
 
+    @Inject
+    ExchangeRateController rateController;
+    @Inject
+    AccountController accountController;
+
+    private IReport report;
+
     @Bind(R.id.exp_list_view)
     ExpandableListView expandableListView;
-    private IReport report;
 
     @Override
     protected int getContentViewId() {
@@ -50,9 +57,7 @@ protected boolean initData() {
         Period period = getIntent().getParcelableExtra(KEY_PERIOD);
         if (period == null) return false;
 
-        DbHelper dbHelper = new DbHelper(ReportActivity.this);
-        AccountController accountController = new AccountController(new AccountRepo(dbHelper));
-        ExchangeRateController rateController = new ExchangeRateController(new ExchangeRateRepo(dbHelper));
+        MtApp.get().getAppComponent().inject(ReportActivity.this);
 
         String currency = DbHelper.DEFAULT_ACCOUNT_CURRENCY;
         Account defaultAccount = accountController.readDefaultAccount();
@@ -92,9 +97,7 @@ private void showExchangeRatesNeededDialog(String currency, List<String> ratesNe
         }
 
         builder.setMessage(sb.toString());
-
         builder.setPositiveButton(android.R.string.ok, null);
-
         builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {

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

@@ -5,16 +5,17 @@
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.entity.Account;
-import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 public class SettingsActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "SettingsActivity";
@@ -35,14 +36,14 @@ protected void initViews() {
     }
 
     public static class SettingsFragment extends PreferenceFragment {
-        private AccountController accountController;
+        @Inject
+        AccountController accountController;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
-            DbHelper dbHelper = new DbHelper(getActivity());
-            accountController = new AccountController(new AccountRepo(dbHelper));
+            MtApp.get().getAppComponent().inject(SettingsFragment.this);
 
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);

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

@@ -9,14 +9,15 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
-import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 import com.blogspot.e_kanivets.moneytracker.ui.AccountsSummaryPresenter;
 
+import javax.inject.Inject;
+
 import butterknife.Bind;
 import butterknife.OnClick;
 
@@ -27,7 +28,9 @@ public class AccountsActivity extends BaseBackActivity {
     private static final int REQUEST_ADD_ACCOUNT = 1;
     private static final int REQUEST_TRANSFER = 2;
 
-    private AccountController accountController;
+    @Inject
+    AccountController accountController;
+
     private AccountsSummaryPresenter summaryPresenter;
 
     @Bind(R.id.list_view)
@@ -40,10 +43,10 @@ protected int getContentViewId() {
 
     @Override
     protected boolean initData() {
-        DbHelper dbHelper = new DbHelper(AccountsActivity.this);
-        accountController = new AccountController(new AccountRepo(dbHelper));
+        boolean result = super.initData();
+        MtApp.get().getAppComponent().inject(AccountsActivity.this);
         summaryPresenter = new AccountsSummaryPresenter(AccountsActivity.this);
-        return super.initData();
+        return result;
     }
 
     @Override

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

@@ -6,22 +6,26 @@
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.entity.Account;
-import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 import com.blogspot.e_kanivets.moneytracker.util.CurrencyProvider;
 
 import java.util.ArrayList;
 
+import javax.inject.Inject;
+
 import butterknife.Bind;
 
 public class AddAccountActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "AddAccountActivity";
 
+    @Inject
+    AccountController accountController;
+
     @Bind(R.id.et_title)
     EditText etTitle;
     @Bind(R.id.et_init_sum)
@@ -34,6 +38,13 @@ protected int getContentViewId() {
         return R.layout.activity_add_account;
     }
 
+    @Override
+    protected boolean initData() {
+        boolean result = super.initData();
+        MtApp.get().getAppComponent().inject(AddAccountActivity.this);
+        return result;
+    }
+
     @Override
     protected void initViews() {
         super.initViews();
@@ -71,6 +82,6 @@ private void addAccount() {
 
         Account account = new Account(title, initSum, currency);
 
-        new AccountController(new AccountRepo(new DbHelper(AddAccountActivity.this))).create(account);
+        accountController.create(account);
     }
 }

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

@@ -6,26 +6,29 @@
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.controller.TransferController;
 import com.blogspot.e_kanivets.moneytracker.entity.Account;
 import com.blogspot.e_kanivets.moneytracker.entity.Transfer;
-import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
-import com.blogspot.e_kanivets.moneytracker.repo.TransferRepo;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.Bind;
 
 public class TransferActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "TransferActivity";
 
-    private TransferController transferController;
+    @Inject
+    TransferController transferController;
+    @Inject
+    AccountController accountController;
 
     private List<Account> accountList;
 
@@ -45,14 +48,10 @@ protected int getContentViewId() {
 
     @Override
     protected boolean initData() {
-        DbHelper dbHelper = new DbHelper(TransferActivity.this);
-
-        AccountController accountController = new AccountController(new AccountRepo(dbHelper));
-        transferController = new TransferController(new TransferRepo(dbHelper), accountController);
-
+        boolean result = super.initData();
+        MtApp.get().getAppComponent().inject(TransferActivity.this);
         accountList = accountController.readAll();
-
-        return super.initData();
+        return result;
     }
 
     @Override