From b3f63c2799c55bf4be0513e20a3562e05429ec58 Mon Sep 17 00:00:00 2001
From: Bogdan Evtushenko <bogdanevtushenko@Bogdans-MacBook-Pro.local>
Date: Mon, 8 Jul 2019 17:16:40 +0300
Subject: [PATCH 01/10] Update kotlin version

---
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0213347..aab7789 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-  ext.kotlin_version = '1.2.61'
+  ext.kotlin_version = '1.3.10'
   repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
       classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0948dc9..4075bc0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 05 21:01:23 CEST 2018
+#Mon Jul 08 17:10:21 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From f31342e62b3ac00fb60e9ef5c3c3cd495aff5c35 Mon Sep 17 00:00:00 2001
From: Bogdan Evtushenko <evtushencko.b@gmail.com>
Date: Fri, 12 Jul 2019 16:34:19 +0300
Subject: [PATCH 02/10] #167. Kotlinify MainActivity.

---
 .../activity/account/AccountsActivity.java    |   4 +-
 .../charts/fragment/SummaryFragment.java      |   2 +-
 .../exchange_rate/ExchangeRatesActivity.java  |   4 +-
 .../activity/external/BackupActivity.java     |   4 +-
 .../activity/record/MainActivity.java         | 211 ------------------
 .../activity/record/MainActivity.kt           | 188 ++++++++++++++++
 .../moneytracker/adapter/AccountAdapter.java  |   2 +-
 .../moneytracker/adapter/RecordAdapter.java   |   2 +-
 .../presenter/AccountsSummaryPresenter.java   |   2 +-
 app/src/main/res/layout/activity_backup.xml   |   2 +-
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/layout/content_accounts.xml  |   2 +-
 .../res/layout/content_exchange_rates.xml     |   2 +-
 app/src/main/res/layout/content_main.xml      |   6 +-
 app/src/main/res/layout/fragment_summary.xml  |   2 +-
 app/src/main/res/layout/view_account.xml      |   2 +-
 .../res/layout/view_nav_drawer_header.xml     |   6 +-
 app/src/main/res/layout/view_record.xml       |   2 +-
 .../main/res/layout/view_summary_accounts.xml |   2 +-
 19 files changed, 212 insertions(+), 235 deletions(-)
 delete mode 100644 app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java
 create mode 100644 app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
index b89eb62..e46f78d 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
@@ -32,7 +32,7 @@ public class AccountsActivity extends BaseBackActivity {
 
     private AccountsSummaryPresenter summaryPresenter;
 
-    @BindView(R.id.list_view) ListView listView;
+    @BindView(R.id.listView) ListView listView;
 
     @Override protected int getContentViewId() {
         return R.layout.activity_accounts;
@@ -70,7 +70,7 @@ public class AccountsActivity extends BaseBackActivity {
         }
     }
 
-    @OnItemClick(R.id.list_view) public void onAccountClick(int position) {
+    @OnItemClick(R.id.listView) public void onAccountClick(int position) {
         Account account = accountController.readAll().get(position - 1);
         startActivityForResult(EditAccountActivity.Companion.newIntent(this, account), REQUEST_EDIT_ACCOUNT);
     }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java
index 509eab1..6d30b1d 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java
@@ -26,7 +26,7 @@ public class SummaryFragment extends Fragment {
     @Nullable
     private IMonthReport monthReport;
 
-    @BindView(R.id.list_view)
+    @BindView(R.id.listView)
     ListView listView;
 
     public SummaryFragment() {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
index 3628eaa..b5d7233 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
@@ -37,7 +37,7 @@ public class ExchangeRatesActivity extends BaseBackActivity {
 
     private List<ExchangeRatePair> exchangeRateList;
 
-    @BindView(R.id.list_view)
+    @BindView(R.id.listView)
     ListView listView;
 
     @Override
@@ -93,7 +93,7 @@ public void addExchangeRate() {
         startActivityForResult(intent, REQUEST_ADD_EXCHANGE_RATE);
     }
 
-    @OnItemClick(R.id.list_view)
+    @OnItemClick(R.id.listView)
     public void addExchangeRateOnBaseOfExisted(int position) {
         AnswersProxy.get().logButton("Edit Exchange Rate");
         if (position < 0 || position >= exchangeRateList.size()) return;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java
index ca078be..a670c5e 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java
@@ -38,7 +38,7 @@ public class BackupActivity extends BaseBackActivity
     private DbxClientV2 dbClient;
 
     @BindView(R.id.btn_backup_now) View btnBackupNow;
-    @BindView(R.id.list_view) ListView listView;
+    @BindView(R.id.listView) ListView listView;
 
     @Override protected int getContentViewId() {
         return R.layout.activity_backup;
@@ -180,7 +180,7 @@ public class BackupActivity extends BaseBackActivity
         backupController.makeBackup(dbClient);
     }
 
-    @OnItemClick(R.id.list_view) public void restoreBackupClicked(int position) {
+    @OnItemClick(R.id.listView) public void restoreBackupClicked(int position) {
         AnswersProxy.get().logButton("Restore backup");
         final String backupName = listView.getAdapter().getItem(position).toString();
 
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java
deleted file mode 100644
index 3a155f8..0000000
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.blogspot.e_kanivets.moneytracker.activity.record;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
-import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity;
-import com.blogspot.e_kanivets.moneytracker.activity.base.BaseDrawerActivity;
-import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter;
-import com.blogspot.e_kanivets.moneytracker.controller.FormatController;
-import com.blogspot.e_kanivets.moneytracker.controller.PeriodController;
-import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
-import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController;
-import com.blogspot.e_kanivets.moneytracker.controller.PreferenceController;
-import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
-import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
-import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
-import com.blogspot.e_kanivets.moneytracker.entity.Period;
-import com.blogspot.e_kanivets.moneytracker.report.ReportMaker;
-import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport;
-import com.blogspot.e_kanivets.moneytracker.ui.AppRateDialog;
-import com.blogspot.e_kanivets.moneytracker.ui.PeriodSpinner;
-import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter;
-import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-import butterknife.OnItemClick;
-
-public class MainActivity extends BaseDrawerActivity {
-    @SuppressWarnings("unused")
-    private static final String TAG = "MainActivity";
-
-    private static final int REQUEST_ACTION_RECORD = 6;
-
-    private List<Record> recordList;
-    private Period period;
-
-    @Inject
-    RecordController recordController;
-    @Inject
-    ExchangeRateController rateController;
-    @Inject
-    AccountController accountController;
-    @Inject
-    CurrencyController currencyController;
-    @Inject
-    PreferenceController preferenceController;
-    @Inject
-    PeriodController periodController;
-    @Inject
-    FormatController formatController;
-
-    private ShortSummaryPresenter summaryPresenter;
-
-    @BindView(R.id.list_view)
-    ListView listView;
-    @BindView(R.id.spinner_period)
-    PeriodSpinner spinner;
-
-    TextView tvDefaultAccountTitle;
-    TextView tvDefaultAccountSum;
-    TextView tvCurrency;
-
-    @Override
-    protected int getContentViewId() {
-        return R.layout.activity_main;
-    }
-
-    @Override
-    protected boolean initData() {
-        super.initData();
-        getAppComponent().inject(MainActivity.this);
-
-        preferenceController.addLaunchCount();
-        summaryPresenter = new ShortSummaryPresenter(MainActivity.this);
-
-        return super.initData();
-    }
-
-    @Override
-    protected void initViews() {
-        super.initViews();
-
-        setTitle(R.string.title_records);
-
-        tvDefaultAccountTitle = navigationView.getHeaderView(0).findViewById(R.id.tv_default_account_title);
-        tvDefaultAccountSum = navigationView.getHeaderView(0).findViewById(R.id.tv_default_account_sum);
-        tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tv_currency);
-
-        if (preferenceController.checkRateDialog()) showAppRateDialog();
-
-        View summaryView = summaryPresenter.create(true);
-        listView.addHeaderView(summaryView);
-        summaryView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showReport();
-            }
-        });
-
-        spinner.setPeriodSelectedListener(new PeriodSpinner.OnPeriodSelectedListener() {
-            @Override
-            public void onPeriodSelected(Period period) {
-                MainActivity.this.period = period;
-                periodController.writeLastUsedPeriod(period);
-                update();
-            }
-        });
-        spinner.setPeriod(periodController.readLastUsedPeriod());
-    }
-
-    @OnItemClick(R.id.list_view)
-    public void editRecord(int position) {
-        AnswersProxy.get().logButton("Edit Record");
-        // Minus one because of list view's header view
-        Record record = recordList.get(position - 1);
-        startAddRecordActivity(record, AddRecordActivity.Mode.MODE_EDIT, record.getType());
-    }
-
-    @OnClick(R.id.btn_add_expense)
-    public void addExpense() {
-        AnswersProxy.get().logButton("Add Expense");
-        startAddRecordActivity(null, AddRecordActivity.Mode.MODE_ADD, Record.TYPE_EXPENSE);
-    }
-
-    @OnClick(R.id.btn_add_income)
-    public void addIncome() {
-        AnswersProxy.get().logButton("Add Income");
-        startAddRecordActivity(null, AddRecordActivity.Mode.MODE_ADD, Record.TYPE_INCOME);
-    }
-
-    public void showReport() {
-        AnswersProxy.get().logButton("Show Report");
-        Intent intent = new Intent(MainActivity.this, ReportActivity.class);
-        intent.putExtra(ReportActivity.KEY_PERIOD, period);
-        startActivity(intent);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode == AppCompatActivity.RESULT_OK) {
-            switch (requestCode) {
-                case REQUEST_ACTION_RECORD:
-                    update();
-                    break;
-
-                case REQUEST_BACKUP:
-                    getAppComponent().inject(MainActivity.this);
-                    update();
-                    break;
-
-                default:
-                    break;
-            }
-        }
-    }
-
-    @Override
-    protected void update() {
-        recordList = recordController.getRecordsForPeriod(period);
-        Collections.reverse(recordList);
-
-        listView.setAdapter(new RecordAdapter(MainActivity.this, recordList));
-
-        String currency = currencyController.readDefaultCurrency();
-
-        ReportMaker reportMaker = new ReportMaker(rateController);
-        IRecordReport report = reportMaker.getRecordReport(currency, period, recordList);
-        summaryPresenter.update(report, currency, reportMaker.currencyNeeded(currency, recordList));
-
-        fillDefaultAccount();
-    }
-
-    private void showAppRateDialog() {
-        AnswersProxy.get().logEvent("Show App Rate Dialog");
-        AppRateDialog dialog = new AppRateDialog(MainActivity.this);
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.show();
-    }
-
-    private void startAddRecordActivity(Record record, AddRecordActivity.Mode mode, int type) {
-        Intent intent = new Intent(MainActivity.this, AddRecordActivity.class);
-        intent.putExtra(AddRecordActivity.KEY_RECORD, record);
-        intent.putExtra(AddRecordActivity.KEY_MODE, mode);
-        intent.putExtra(AddRecordActivity.KEY_TYPE, type);
-        startActivityForResult(intent, REQUEST_ACTION_RECORD);
-    }
-
-    @SuppressLint("SetTextI18n")
-    private void fillDefaultAccount() {
-        Account defaultAccount = accountController.readDefaultAccount();
-        if (defaultAccount == null) return;
-
-        tvDefaultAccountTitle.setText(defaultAccount.getTitle());
-        tvDefaultAccountSum.setText(formatController.formatAmount(defaultAccount.getFullSum()));
-        tvCurrency.setText(defaultAccount.getCurrency());
-    }
-}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
new file mode 100644
index 0000000..a7e8188
--- /dev/null
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
@@ -0,0 +1,188 @@
+package com.blogspot.e_kanivets.moneytracker.activity.record
+
+import android.content.Intent
+import android.support.v7.app.AppCompatActivity
+import android.widget.TextView
+import com.blogspot.e_kanivets.moneytracker.R
+import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseDrawerActivity
+import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter
+import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController
+import com.blogspot.e_kanivets.moneytracker.controller.FormatController
+import com.blogspot.e_kanivets.moneytracker.controller.PeriodController
+import com.blogspot.e_kanivets.moneytracker.controller.PreferenceController
+import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
+import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController
+import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController
+import com.blogspot.e_kanivets.moneytracker.entity.Period
+import com.blogspot.e_kanivets.moneytracker.entity.data.Record
+import com.blogspot.e_kanivets.moneytracker.report.ReportMaker
+import com.blogspot.e_kanivets.moneytracker.ui.AppRateDialog
+import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.content_main.*
+import javax.inject.Inject
+
+
+class MainActivity : BaseDrawerActivity() {
+
+    private lateinit var recordList: List<Record>
+    private lateinit var period: Period
+
+    @Inject
+    lateinit var recordController: RecordController
+    @Inject
+    lateinit var rateController: ExchangeRateController
+    @Inject
+    lateinit var accountController: AccountController
+    @Inject
+    lateinit var currencyController: CurrencyController
+    @Inject
+    lateinit var preferenceController: PreferenceController
+    @Inject
+    lateinit var periodController: PeriodController
+    @Inject
+    lateinit var formatController: FormatController
+
+    private lateinit var summaryPresenter: ShortSummaryPresenter
+
+    private lateinit var tvDefaultAccountTitle: TextView
+    private lateinit var tvDefaultAccountSum: TextView
+    private lateinit var tvCurrency: TextView
+
+    override fun getContentViewId(): Int {
+        return R.layout.activity_main
+    }
+
+    override fun initData(): Boolean {
+        super.initData()
+        appComponent.inject(this@MainActivity)
+
+        preferenceController.addLaunchCount()
+        summaryPresenter = ShortSummaryPresenter(this@MainActivity)
+
+        return super.initData()
+    }
+
+    override fun initViews() {
+        super.initViews()
+
+        setTitle(R.string.title_records)
+
+        if (preferenceController.checkRateDialog()) showAppRateDialog()
+
+        tvDefaultAccountTitle = navigationView.getHeaderView(0).findViewById(R.id.tvDefaultAccountTitle)
+        tvDefaultAccountSum = navigationView.getHeaderView(0).findViewById(R.id.tvDefaultAccountSum)
+        tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tvCurrency)
+
+        val summaryView = summaryPresenter.create(true)
+        listView.addHeaderView(summaryView)
+        summaryView.setOnClickListener { showReport() }
+
+        spinner.setPeriodSelectedListener { period ->
+            this.period = period
+            periodController.writeLastUsedPeriod(period)
+            update()
+        }
+
+        spinner.setPeriod(periodController.readLastUsedPeriod())
+
+        listView.setOnItemClickListener { _, _, position, _ ->
+            editRecord(position)
+        }
+
+        btnAddExpense.setOnClickListener { addExpense() }
+        btnAddIncome.setOnClickListener { addIncome() }
+    }
+
+    private fun editRecord(position: Int) {
+        AnswersProxy.get().logButton("Edit Record")
+        // Minus one because of list view's header view
+        val record = recordList[position - 1]
+        startAddRecordActivity(record, AddRecordActivity.Mode.MODE_EDIT, record.type)
+    }
+
+    private fun addExpense() {
+        AnswersProxy.get().logButton("Add Expense")
+        startAddRecordActivity(null, AddRecordActivity.Mode.MODE_ADD, Record.TYPE_EXPENSE)
+    }
+
+    private fun addIncome() {
+        AnswersProxy.get().logButton("Add Income")
+        startAddRecordActivity(null, AddRecordActivity.Mode.MODE_ADD, Record.TYPE_INCOME)
+    }
+
+    private fun showReport() {
+        AnswersProxy.get().logButton("Show Report")
+        val intent = Intent(this@MainActivity, ReportActivity::class.java)
+        intent.putExtra(ReportActivity.KEY_PERIOD, period)
+        startActivity(intent)
+    }
+
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (resultCode == AppCompatActivity.RESULT_OK) {
+            when (requestCode) {
+                REQUEST_ACTION_RECORD -> {
+                    appComponent.inject(this@MainActivity)
+                    update()
+                }
+
+                REQUEST_BACKUP -> {
+                    appComponent.inject(this@MainActivity)
+                    update()
+                }
+
+                else -> {
+                }
+            }
+        }
+    }
+
+    override fun update() {
+        println("Hello update")
+        recordList = recordController.getRecordsForPeriod(period)
+        recordList = recordList.reversed()
+
+        listView.adapter = RecordAdapter(this@MainActivity, recordList)
+
+        val currency = currencyController.readDefaultCurrency()
+
+        val reportMaker = ReportMaker(rateController)
+        val report = reportMaker.getRecordReport(currency, period, recordList)
+        summaryPresenter.update(report, currency, reportMaker.currencyNeeded(currency, recordList))
+
+        fillDefaultAccount()
+    }
+
+    private fun showAppRateDialog() {
+        AnswersProxy.get().logEvent("Show App Rate Dialog")
+        val dialog = AppRateDialog(this@MainActivity)
+        dialog.setCanceledOnTouchOutside(false)
+        dialog.show()
+    }
+
+    private fun startAddRecordActivity(record: Record?, mode: AddRecordActivity.Mode, type: Int) {
+        val intent = Intent(this@MainActivity, AddRecordActivity::class.java)
+        intent.putExtra(AddRecordActivity.KEY_RECORD, record)
+        intent.putExtra(AddRecordActivity.KEY_MODE, mode)
+        intent.putExtra(AddRecordActivity.KEY_TYPE, type)
+        startActivityForResult(intent, REQUEST_ACTION_RECORD)
+    }
+
+    private fun fillDefaultAccount() {
+        val defaultAccount = accountController.readDefaultAccount() ?: return
+
+        tvDefaultAccountSum.text = defaultAccount.title
+        tvDefaultAccountSum.text = formatController.formatAmount(defaultAccount.fullSum)
+        tvCurrency.text = defaultAccount.currency
+    }
+
+    companion object {
+        private const val TAG = "MainActivity"
+        private const val REQUEST_ACTION_RECORD = 6
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java
index c6afbb2..a993a0b 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java
@@ -105,7 +105,7 @@ public static class ViewHolder {
         TextView tvTitle;
         @BindView(R.id.tv_cur_sum)
         TextView tvCurSum;
-        @BindView(R.id.tv_currency)
+        @BindView(R.id.tvCurrency)
         TextView tvCurrency;
 
         public ViewHolder(View view) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java
index 5c8a31e..57fd78b 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java
@@ -106,7 +106,7 @@ public static class ViewHolder {
         TextView tvTitle;
         @BindView(R.id.tv_category)
         TextView tvCategory;
-        @BindView(R.id.tv_currency)
+        @BindView(R.id.tvCurrency)
         TextView tvCurrency;
 
         public ViewHolder(View view) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java
index 858cb31..a28675f 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java
@@ -120,7 +120,7 @@ public static class ViewHolder {
         AppCompatSpinner spinnerCurrency;
         @BindView(R.id.tv_total)
         TextView tvTotal;
-        @BindView(R.id.tv_currency)
+        @BindView(R.id.tvCurrency)
         TextView tvCurrency;
 
         public ViewHolder(View view) {
diff --git a/app/src/main/res/layout/activity_backup.xml b/app/src/main/res/layout/activity_backup.xml
index adc8bc1..a43c2fa 100644
--- a/app/src/main/res/layout/activity_backup.xml
+++ b/app/src/main/res/layout/activity_backup.xml
@@ -28,7 +28,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <ListView
-            android:id="@+id/list_view"
+            android:id="@+id/listView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 61cf9bd..2b678d1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,7 +25,7 @@
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
                 <com.blogspot.e_kanivets.moneytracker.ui.PeriodSpinner
-                    android:id="@+id/spinner_period"
+                    android:id="@+id/spinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/app/src/main/res/layout/content_accounts.xml b/app/src/main/res/layout/content_accounts.xml
index 8283f8d..93d2946 100644
--- a/app/src/main/res/layout/content_accounts.xml
+++ b/app/src/main/res/layout/content_accounts.xml
@@ -9,7 +9,7 @@
     tools:context=".activity.account.AccountsActivity">
 
     <ListView
-        android:id="@+id/list_view"
+        android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/content_exchange_rates.xml b/app/src/main/res/layout/content_exchange_rates.xml
index dfe4b6c..ca4ee27 100644
--- a/app/src/main/res/layout/content_exchange_rates.xml
+++ b/app/src/main/res/layout/content_exchange_rates.xml
@@ -9,7 +9,7 @@
     tools:showIn="@layout/activity_exchange_rates">
 
     <ListView
-        android:id="@+id/list_view"
+        android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 90d2bef..a84fb9e 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -8,7 +8,7 @@
     tools:showIn="@layout/activity_main">
 
     <ListView
-        android:id="@+id/list_view"
+        android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
@@ -23,7 +23,7 @@
         android:orientation="horizontal">
 
         <Button
-            android:id="@+id/btn_add_income"
+            android:id="@+id/btnAddIncome"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -32,7 +32,7 @@
             android:text="@string/add_income" />
 
         <Button
-            android:id="@+id/btn_add_expense"
+            android:id="@+id/btnAddExpense"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_summary.xml b/app/src/main/res/layout/fragment_summary.xml
index ad590ce..3dfa82e 100644
--- a/app/src/main/res/layout/fragment_summary.xml
+++ b/app/src/main/res/layout/fragment_summary.xml
@@ -5,7 +5,7 @@
     tools:context="com.blogspot.e_kanivets.moneytracker.activity.charts.fragment.SummaryFragment">
 
     <ListView
-        android:id="@+id/list_view"
+        android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/view_account.xml b/app/src/main/res/layout/view_account.xml
index cfdb3ae..dc91891 100644
--- a/app/src/main/res/layout/view_account.xml
+++ b/app/src/main/res/layout/view_account.xml
@@ -27,7 +27,7 @@
         android:theme="@style/Text_Body2" />
 
     <TextView
-        android:id="@+id/tv_currency"
+        android:id="@+id/tvCurrency"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
diff --git a/app/src/main/res/layout/view_nav_drawer_header.xml b/app/src/main/res/layout/view_nav_drawer_header.xml
index 2ad4389..e673d11 100644
--- a/app/src/main/res/layout/view_nav_drawer_header.xml
+++ b/app/src/main/res/layout/view_nav_drawer_header.xml
@@ -13,7 +13,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/tv_default_account_title"
+            android:id="@+id/tvDefaultAccountTitle"
             style="@style/Text_Body2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
             android:textColor="@color/text_white" />
 
         <TextView
-            android:id="@+id/tv_default_account_sum"
+            android:id="@+id/tvDefaultAccountSum"
             style="@style/Text_Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             android:textColor="@color/text_white" />
 
         <TextView
-            android:id="@+id/tv_currency"
+            android:id="@+id/tvCurrency"
             style="@style/Text_Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_record.xml b/app/src/main/res/layout/view_record.xml
index 4da9721..1ff6aa9 100644
--- a/app/src/main/res/layout/view_record.xml
+++ b/app/src/main/res/layout/view_record.xml
@@ -93,7 +93,7 @@
           />
 
       <TextView
-          android:id="@+id/tv_currency"
+          android:id="@+id/tvCurrency"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:background="@android:color/transparent"
diff --git a/app/src/main/res/layout/view_summary_accounts.xml b/app/src/main/res/layout/view_summary_accounts.xml
index 8b953b3..9970f1c 100644
--- a/app/src/main/res/layout/view_summary_accounts.xml
+++ b/app/src/main/res/layout/view_summary_accounts.xml
@@ -56,7 +56,7 @@
             android:theme="@style/Text_Body2" />
 
         <TextView
-            android:id="@+id/tv_currency"
+            android:id="@+id/tvCurrency"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="monospace"

From fbc82ead2e0468831b663abd0916576935ddabd3 Mon Sep 17 00:00:00 2001
From: Bogdan Evtushenko <evtushencko.b@gmail.com>
Date: Fri, 12 Jul 2019 16:54:37 +0300
Subject: [PATCH 03/10] #167. Add review fixes.

---
 .../activity/record/MainActivity.kt           | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
index a7e8188..3668967 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
@@ -24,7 +24,6 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.content_main.*
 import javax.inject.Inject
 
-
 class MainActivity : BaseDrawerActivity() {
 
     private lateinit var recordList: List<Record>
@@ -51,16 +50,14 @@ class MainActivity : BaseDrawerActivity() {
     private lateinit var tvDefaultAccountSum: TextView
     private lateinit var tvCurrency: TextView
 
-    override fun getContentViewId(): Int {
-        return R.layout.activity_main
-    }
+    override fun getContentViewId(): Int = R.layout.activity_main
 
     override fun initData(): Boolean {
         super.initData()
-        appComponent.inject(this@MainActivity)
+        appComponent.inject(this)
 
         preferenceController.addLaunchCount()
-        summaryPresenter = ShortSummaryPresenter(this@MainActivity)
+        summaryPresenter = ShortSummaryPresenter(this)
 
         return super.initData()
     }
@@ -115,7 +112,7 @@ class MainActivity : BaseDrawerActivity() {
 
     private fun showReport() {
         AnswersProxy.get().logButton("Show Report")
-        val intent = Intent(this@MainActivity, ReportActivity::class.java)
+        val intent = Intent(this, ReportActivity::class.java)
         intent.putExtra(ReportActivity.KEY_PERIOD, period)
         startActivity(intent)
     }
@@ -125,10 +122,7 @@ class MainActivity : BaseDrawerActivity() {
 
         if (resultCode == AppCompatActivity.RESULT_OK) {
             when (requestCode) {
-                REQUEST_ACTION_RECORD -> {
-                    appComponent.inject(this@MainActivity)
-                    update()
-                }
+                REQUEST_ACTION_RECORD -> update()
 
                 REQUEST_BACKUP -> {
                     appComponent.inject(this@MainActivity)
@@ -142,11 +136,10 @@ class MainActivity : BaseDrawerActivity() {
     }
 
     override fun update() {
-        println("Hello update")
         recordList = recordController.getRecordsForPeriod(period)
         recordList = recordList.reversed()
 
-        listView.adapter = RecordAdapter(this@MainActivity, recordList)
+        listView.adapter = RecordAdapter(this, recordList)
 
         val currency = currencyController.readDefaultCurrency()
 
@@ -159,13 +152,13 @@ class MainActivity : BaseDrawerActivity() {
 
     private fun showAppRateDialog() {
         AnswersProxy.get().logEvent("Show App Rate Dialog")
-        val dialog = AppRateDialog(this@MainActivity)
+        val dialog = AppRateDialog(this)
         dialog.setCanceledOnTouchOutside(false)
         dialog.show()
     }
 
     private fun startAddRecordActivity(record: Record?, mode: AddRecordActivity.Mode, type: Int) {
-        val intent = Intent(this@MainActivity, AddRecordActivity::class.java)
+        val intent = Intent(this, AddRecordActivity::class.java)
         intent.putExtra(AddRecordActivity.KEY_RECORD, record)
         intent.putExtra(AddRecordActivity.KEY_MODE, mode)
         intent.putExtra(AddRecordActivity.KEY_TYPE, type)

From c962ba0160122cdb5f92141f109a35cbaf83a04f Mon Sep 17 00:00:00 2001
From: Bogdan Evtushenko <evtushencko.b@gmail.com>
Date: Wed, 17 Jul 2019 16:15:13 +0300
Subject: [PATCH 04/10] #168. Migrate ListView to RecyclerView in MainActivity.

---
 .../e_kanivets/moneytracker/MtApp.java        |   1 -
 .../moneytracker/activity/ReportActivity.java |   2 +-
 .../activity/account/AccountsActivity.java    |  44 +++--
 .../account/edit/EditAccountActivity.kt       |  25 ++-
 .../fragment/AccountOperationsFragment.kt     |   7 +-
 .../exchange_rate/ExchangeRatesActivity.java  |  11 +-
 .../activity/record/MainActivity.kt           |  29 ++-
 .../moneytracker/adapter/AccountAdapter.java  |   2 +-
 .../adapter/CategoryAutoCompleteAdapter.java  |   2 +-
 .../adapter/ExpandableListReportAdapter.java  |   4 +-
 .../adapter/MonthSummaryAdapter.java          |   6 +-
 .../moneytracker/adapter/RecordAdapter.java   | 116 ------------
 .../moneytracker/adapter/RecordAdapter.kt     | 158 ++++++++++++++++
 .../report/record/RecordReportConverter.java  |   4 +-
 .../presenter/AccountsSummaryPresenter.java   |   2 +-
 .../ui/presenter/ShortSummaryPresenter.java   | 109 +++++++++---
 app/src/main/res/layout/content_main.xml      |   7 +-
 .../main/res/layout/dialog_change_date.xml    |  30 ++--
 .../layout/fragment_account_operations.xml    |  14 +-
 app/src/main/res/layout/view_account.xml      |  10 +-
 .../main/res/layout/view_category_item.xml    |   6 +-
 .../main/res/layout/view_month_summary.xml    |  12 +-
 app/src/main/res/layout/view_record.xml       | 168 ++++++++----------
 app/src/main/res/layout/view_report_item.xml  |  10 +-
 .../main/res/layout/view_report_item_exp.xml  |  12 +-
 .../main/res/layout/view_summary_accounts.xml |   8 +-
 .../main/res/layout/view_summary_records.xml  |  12 +-
 27 files changed, 458 insertions(+), 353 deletions(-)
 delete mode 100644 app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java
 create mode 100644 app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java
index 522cc61..c73f3e5 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java
@@ -6,7 +6,6 @@
 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.repo.CachedRepoModule;
-
 import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.crashlytics.android.Crashlytics;
 
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java
index 3332d6a..667806e 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java
@@ -74,7 +74,7 @@ protected void initViews() {
         initSpinnerCurrency();
 
         shortSummaryPresenter = new ShortSummaryPresenter(ReportActivity.this);
-        expandableListView.addHeaderView(shortSummaryPresenter.create(false));
+        expandableListView.addHeaderView(shortSummaryPresenter.create(false, null));
     }
 
     private void update(String currency) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
index e46f78d..fba501b 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
@@ -22,30 +22,36 @@
 import butterknife.OnItemClick;
 
 public class AccountsActivity extends BaseBackActivity {
-    @SuppressWarnings("unused") private static final String TAG = "AccountsActivity";
+    @SuppressWarnings("unused")
+    private static final String TAG = "AccountsActivity";
 
     private static final int REQUEST_ADD_ACCOUNT = 1;
     private static final int REQUEST_TRANSFER = 2;
     private static final int REQUEST_EDIT_ACCOUNT = 3;
 
-    @Inject AccountController accountController;
+    @Inject
+    AccountController accountController;
 
     private AccountsSummaryPresenter summaryPresenter;
 
-    @BindView(R.id.listView) ListView listView;
+    @BindView(R.id.listView)
+    ListView listView;
 
-    @Override protected int getContentViewId() {
+    @Override
+    protected int getContentViewId() {
         return R.layout.activity_accounts;
     }
 
-    @Override protected boolean initData() {
+    @Override
+    protected boolean initData() {
         boolean result = super.initData();
         getAppComponent().inject(AccountsActivity.this);
         summaryPresenter = new AccountsSummaryPresenter(AccountsActivity.this);
         return result;
     }
 
-    @Override protected void initViews() {
+    @Override
+    protected void initViews() {
         super.initViews();
 
         listView.addHeaderView(summaryPresenter.create());
@@ -54,23 +60,23 @@ public class AccountsActivity extends BaseBackActivity {
         update();
     }
 
-    @Override public boolean onCreateOptionsMenu(Menu menu) {
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_accounts, menu);
         return true;
     }
 
-    @Override public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_transfer:
-                makeTransfer();
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_transfer) {
+            makeTransfer();
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
-    @OnItemClick(R.id.listView) public void onAccountClick(int position) {
+    @OnItemClick(R.id.listView)
+    public void onAccountClick(int position) {
         Account account = accountController.readAll().get(position - 1);
         startActivityForResult(EditAccountActivity.Companion.newIntent(this, account), REQUEST_EDIT_ACCOUNT);
     }
@@ -80,13 +86,15 @@ public void makeTransfer() {
         startActivityForResult(new Intent(AccountsActivity.this, TransferActivity.class), REQUEST_TRANSFER);
     }
 
-    @OnClick(R.id.btn_add_account) public void addAccount() {
+    @OnClick(R.id.btn_add_account)
+    public void addAccount() {
         AnswersProxy.get().logButton("Add Account");
         Intent intent = new Intent(AccountsActivity.this, AddAccountActivity.class);
         startActivityForResult(intent, REQUEST_ADD_ACCOUNT);
     }
 
-    @Override public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (resultCode == AppCompatActivity.RESULT_OK) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt
index 3f10199..444a9c1 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.support.v4.view.ViewPager.OnPageChangeListener
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountOperationsFragment
 import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment
@@ -18,6 +19,9 @@ import kotlinx.android.synthetic.main.activity_edit_account.fabDone
 import kotlinx.android.synthetic.main.activity_edit_account.tabLayout
 import kotlinx.android.synthetic.main.activity_edit_account.viewPager
 import javax.inject.Inject
+import android.view.inputmethod.InputMethodManager
+import kotlinx.android.synthetic.main.fragment_edit_account.*
+
 
 class EditAccountActivity : BaseBackActivity() {
 
@@ -55,12 +59,29 @@ class EditAccountActivity : BaseBackActivity() {
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
 
             override fun onPageSelected(position: Int) {
-                if (position == 0) fabDone.show() else fabDone.hide()
+                if (position == 0) {
+                    fabDone.show()
+                    showOrHideKeyboard(true)
+                } else {
+                    fabDone.hide()
+                    showOrHideKeyboard(false)
+                }
             }
-
         })
     }
 
+    private fun showOrHideKeyboard(showKeyboard: Boolean) {
+        val view: View? = currentFocus
+        if (view != null) {
+            val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+            if (showKeyboard)
+                imm.showSoftInput(etTitle, 0)
+            else
+                imm.hideSoftInputFromWindow(view.windowToken, 0)
+        }
+    }
+
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(if (account.isArchived) R.menu.menu_archived_account else R.menu.menu_account, menu)
         return true
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
index 2d189d7..faa21e8 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseFragment
 import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter
+import com.blogspot.e_kanivets.moneytracker.controller.FormatController
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
 import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController
 import com.blogspot.e_kanivets.moneytracker.controller.data.TransferController
@@ -23,6 +24,8 @@ class AccountOperationsFragment : BaseFragment() {
     internal lateinit var recordController: RecordController
     @Inject
     internal lateinit var transferController: TransferController
+    @Inject
+    internal lateinit var formatController: FormatController
 
     private lateinit var account: Account
 
@@ -30,11 +33,11 @@ class AccountOperationsFragment : BaseFragment() {
 
     override fun initData() {
         appComponent.inject(this@AccountOperationsFragment)
-        arguments?.let { arguments -> account = arguments.getParcelable(AccountOperationsFragment.KEY_ACCOUNT) }
+        arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
     }
 
     override fun initViews(view: View) {
-        listView.adapter = RecordAdapter(activity, getRecords())
+        recyclerView.adapter = RecordAdapter(requireContext(), getRecords(), formatController, false)
     }
 
     private fun getRecords(): List<Record> {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
index b5d7233..2fe0853 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
@@ -107,14 +107,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (resultCode == AppCompatActivity.RESULT_OK) {
-            switch (requestCode) {
-                case REQUEST_ADD_EXCHANGE_RATE:
-                    update();
-                    setResult(RESULT_OK);
-                    break;
-
-                default:
-                    break;
+            if (requestCode == REQUEST_ADD_EXCHANGE_RATE) {
+                update();
+                setResult(RESULT_OK);
             }
         }
     }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
index 3668967..39c3257 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
@@ -2,6 +2,7 @@ package com.blogspot.e_kanivets.moneytracker.activity.record
 
 import android.content.Intent
 import android.support.v7.app.AppCompatActivity
+import android.widget.AdapterView
 import android.widget.TextView
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity
@@ -18,7 +19,6 @@ import com.blogspot.e_kanivets.moneytracker.entity.Period
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record
 import com.blogspot.e_kanivets.moneytracker.report.ReportMaker
 import com.blogspot.e_kanivets.moneytracker.ui.AppRateDialog
-import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
 import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.content_main.*
@@ -28,6 +28,7 @@ class MainActivity : BaseDrawerActivity() {
 
     private lateinit var recordList: List<Record>
     private lateinit var period: Period
+    private lateinit var recordAdapter: RecordAdapter
 
     @Inject
     lateinit var recordController: RecordController
@@ -44,8 +45,6 @@ class MainActivity : BaseDrawerActivity() {
     @Inject
     lateinit var formatController: FormatController
 
-    private lateinit var summaryPresenter: ShortSummaryPresenter
-
     private lateinit var tvDefaultAccountTitle: TextView
     private lateinit var tvDefaultAccountSum: TextView
     private lateinit var tvCurrency: TextView
@@ -57,7 +56,6 @@ class MainActivity : BaseDrawerActivity() {
         appComponent.inject(this)
 
         preferenceController.addLaunchCount()
-        summaryPresenter = ShortSummaryPresenter(this)
 
         return super.initData()
     }
@@ -73,9 +71,12 @@ class MainActivity : BaseDrawerActivity() {
         tvDefaultAccountSum = navigationView.getHeaderView(0).findViewById(R.id.tvDefaultAccountSum)
         tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tvCurrency)
 
-        val summaryView = summaryPresenter.create(true)
-        listView.addHeaderView(summaryView)
-        summaryView.setOnClickListener { showReport() }
+        recordAdapter = RecordAdapter(this, listOf(), formatController, true)
+        recordAdapter.setOnItemClickListener(AdapterView.OnItemClickListener { _, _, position, _ ->
+            if (position == 0) showReport()
+            else editRecord(position)
+        })
+        recyclerView.adapter = recordAdapter
 
         spinner.setPeriodSelectedListener { period ->
             this.period = period
@@ -85,17 +86,13 @@ class MainActivity : BaseDrawerActivity() {
 
         spinner.setPeriod(periodController.readLastUsedPeriod())
 
-        listView.setOnItemClickListener { _, _, position, _ ->
-            editRecord(position)
-        }
-
         btnAddExpense.setOnClickListener { addExpense() }
         btnAddIncome.setOnClickListener { addIncome() }
     }
 
     private fun editRecord(position: Int) {
         AnswersProxy.get().logButton("Edit Record")
-        // Minus one because of list view's header view
+
         val record = recordList[position - 1]
         startAddRecordActivity(record, AddRecordActivity.Mode.MODE_EDIT, record.type)
     }
@@ -125,7 +122,7 @@ class MainActivity : BaseDrawerActivity() {
                 REQUEST_ACTION_RECORD -> update()
 
                 REQUEST_BACKUP -> {
-                    appComponent.inject(this@MainActivity)
+                    appComponent.inject(this)
                     update()
                 }
 
@@ -139,13 +136,12 @@ class MainActivity : BaseDrawerActivity() {
         recordList = recordController.getRecordsForPeriod(period)
         recordList = recordList.reversed()
 
-        listView.adapter = RecordAdapter(this, recordList)
-
         val currency = currencyController.readDefaultCurrency()
 
         val reportMaker = ReportMaker(rateController)
         val report = reportMaker.getRecordReport(currency, period, recordList)
-        summaryPresenter.update(report, currency, reportMaker.currencyNeeded(currency, recordList))
+
+        recordAdapter.setRecords(recordList, report, currency, reportMaker.currencyNeeded(currency, recordList))
 
         fillDefaultAccount()
     }
@@ -174,7 +170,6 @@ class MainActivity : BaseDrawerActivity() {
     }
 
     companion object {
-        private const val TAG = "MainActivity"
         private const val REQUEST_ACTION_RECORD = 6
     }
 
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java
index a993a0b..5015d6d 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java
@@ -101,7 +101,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
     }
 
     public static class ViewHolder {
-        @BindView(R.id.tv_title)
+        @BindView(R.id.tvTitle)
         TextView tvTitle;
         @BindView(R.id.tv_cur_sum)
         TextView tvCurSum;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java
index d0b0e11..a7d0673 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java
@@ -98,7 +98,7 @@ protected void publishResults(CharSequence constraint, FilterResults results) {
     }
 
     public static class ViewHolder {
-        @BindView(R.id.tv_category)
+        @BindView(R.id.tvCategory)
         TextView tvCategory;
         @BindView(R.id.iv_cancel)
         View ivCancel;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java
index 2961e15..be2caaf 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java
@@ -95,9 +95,9 @@ private void customizeView(View view, Map<String, String> values, boolean groupV
     }
 
     public static class ViewHolder {
-        @BindView(R.id.tv_category)
+        @BindView(R.id.tvCategory)
         TextView tvCategory;
-        @BindView(R.id.tv_total)
+        @BindView(R.id.tvTotal)
         TextView tvTotal;
 
         public ViewHolder(View view) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java
index a156d05..5a6f740 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java
@@ -99,11 +99,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
     }
 
     public static class ViewHolder {
-        @BindView(R.id.tv_month)
+        @BindView(R.id.tvMonth)
         TextView tvMonth;
-        @BindView(R.id.tv_total_income)
+        @BindView(R.id.tvTotalIncome)
         TextView tvTotalIncome;
-        @BindView(R.id.tv_total_expense)
+        @BindView(R.id.tvTotalExpense)
         TextView tvTotalExpense;
 
         public ViewHolder(View view) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java
deleted file mode 100644
index 57fd78b..0000000
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.blogspot.e_kanivets.moneytracker.adapter;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.blogspot.e_kanivets.moneytracker.MtApp;
-import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.controller.FormatController;
-import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Custom adapter class for {@link Record} entity.
- * Created on 01/09/14.
- *
- * @author Evgenii Kanivets
- */
-public class RecordAdapter extends BaseAdapter {
-    @Inject
-    FormatController formatController;
-
-    private Context context;
-    private List<Record> records;
-
-    private int whiteRed;
-    private int whiteGreen;
-    private int red;
-    private int green;
-
-    @SuppressWarnings("deprecation")
-    public RecordAdapter(Context context, List<Record> records) {
-        MtApp.get().getAppComponent().inject(RecordAdapter.this);
-
-        this.context = context;
-        this.records = records;
-
-        whiteRed = context.getResources().getColor(R.color.white_red);
-        whiteGreen = context.getResources().getColor(R.color.white_green);
-        red = context.getResources().getColor(R.color.red);
-        green = context.getResources().getColor(R.color.green);
-    }
-
-    @Override
-    public int getCount() {
-        return records.size();
-    }
-
-    @Override
-    public Record getItem(int position) {
-        return records.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @SuppressLint("SetTextI18n")
-    @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
-        ViewHolder viewHolder;
-
-        if (convertView == null) {
-            LayoutInflater layoutInflater = LayoutInflater.from(context);
-
-            convertView = layoutInflater.inflate(R.layout.view_record, parent, false);
-            viewHolder = new ViewHolder(convertView);
-
-            convertView.setTag(viewHolder);
-        } else viewHolder = (ViewHolder) convertView.getTag();
-
-        Record record = getItem(position);
-        viewHolder.container.setBackgroundColor(record.isIncome() ? whiteGreen : whiteRed);
-        viewHolder.tvPrice.setTextColor(record.isIncome() ? green : red);
-
-        viewHolder.tvDateAndTime.setText(formatController.formatDateAndTime(record.getTime()));
-        viewHolder.tvPrice.setText(formatController.formatSignedAmount(
-                (record.isIncome() ? 1 : -1) * record.getFullPrice()));
-        viewHolder.tvTitle.setText(record.getTitle());
-        if (record.getCategory() != null)
-            viewHolder.tvCategory.setText(record.getCategory().getName());
-        viewHolder.tvCurrency.setText(record.getCurrency());
-
-        return convertView;
-    }
-
-    public static class ViewHolder {
-        @BindView(R.id.container)
-        View container;
-        @BindView(R.id.tv_date_and_time)
-        TextView tvDateAndTime;
-        @BindView(R.id.tv_price)
-        TextView tvPrice;
-        @BindView(R.id.tv_title)
-        TextView tvTitle;
-        @BindView(R.id.tv_category)
-        TextView tvCategory;
-        @BindView(R.id.tvCurrency)
-        TextView tvCurrency;
-
-        public ViewHolder(View view) {
-            ButterKnife.bind(this, view);
-        }
-    }
-}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
new file mode 100644
index 0000000..de72f05
--- /dev/null
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
@@ -0,0 +1,158 @@
+package com.blogspot.e_kanivets.moneytracker.adapter
+
+import android.content.Context
+import android.support.v4.content.ContextCompat
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.blogspot.e_kanivets.moneytracker.MtApp
+import com.blogspot.e_kanivets.moneytracker.R
+import com.blogspot.e_kanivets.moneytracker.controller.FormatController
+import com.blogspot.e_kanivets.moneytracker.entity.data.Record
+import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport
+import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
+import kotlinx.android.synthetic.main.view_record.view.*
+import kotlinx.android.synthetic.main.view_summary_records.view.*
+
+class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private var formatController: FormatController
+
+    private var itemClickListener: AdapterView.OnItemClickListener? = null
+
+    private var whiteRed: Int
+    private var whiteGreen: Int
+    private var red: Int
+    private var green: Int
+
+    private var records: List<Record>
+    private var context: Context
+
+    private var summaryPresenter: ShortSummaryPresenter
+    private var needHeaderView: Boolean = false
+    private lateinit var headerViewHolder: HeaderViewHolder
+
+    constructor(context: Context, records: List<Record>, formatController: FormatController, needHeaderView: Boolean) {
+        this.context = context
+        this.records = records
+
+        MtApp.get().appComponent.inject(this)
+
+        whiteRed = ContextCompat.getColor(context, R.color.white_red)
+        whiteGreen = ContextCompat.getColor(context, R.color.white_green)
+        red = ContextCompat.getColor(context, R.color.red)
+        green = ContextCompat.getColor(context, R.color.green)
+
+        summaryPresenter = ShortSummaryPresenter(context)
+
+        if (needHeaderView) {
+            val summaryView = summaryPresenter.create(true, HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null)))
+            headerViewHolder = summaryView.tag as HeaderViewHolder
+        }
+
+        this.needHeaderView = needHeaderView
+        this.formatController = formatController
+    }
+
+    override fun getItemCount() = records.size
+
+    override fun getItemViewType(position: Int): Int = if (position == 0 && needHeaderView) {
+        TYPE_HEADER
+    } else {
+        TYPE_ITEM
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =
+            if (viewType == TYPE_HEADER) {
+                headerViewHolder
+            } else {
+                ViewHolder(LayoutInflater.from(context).inflate(R.layout.view_record, parent, false))
+            }
+
+    override fun onBindViewHolder(rvViewHolder: RecyclerView.ViewHolder, position: Int) {
+        if (position == 0 && needHeaderView) {
+            //adapter already bound to view
+            return
+        }
+
+        val viewHolder = rvViewHolder as ViewHolder
+        val record: Record = records[position - if (needHeaderView) 1 else 0]
+        viewHolder.container.setBackgroundColor(if (record.isIncome) whiteGreen else whiteRed)
+        viewHolder.tvPrice.setTextColor(if (record.isIncome) green else red)
+
+        viewHolder.tvDateAndTime.text = formatController.formatDateAndTime(record.time)
+        viewHolder.tvPrice.text = formatController.formatSignedAmount(
+                (if (record.isIncome) 1 else -1) * record.fullPrice)
+        viewHolder.tvTitle.text = record.title
+        viewHolder.tvCategory.text = record.category?.name
+        viewHolder.tvCurrency.text = record.currency
+    }
+
+    fun setRecords(recordsList: List<Record>, report: IRecordReport?, currency: String, ratesNeeded: List<String>) {
+        records = recordsList
+        summaryPresenter.update(report, currency, ratesNeeded)
+        notifyDataSetChanged()
+    }
+
+    fun setOnItemClickListener(itemClickListener: AdapterView.OnItemClickListener) {
+        this.itemClickListener = itemClickListener
+    }
+
+    inner class ViewHolder : RecyclerView.ViewHolder {
+
+        var container: LinearLayout
+        var tvDateAndTime: TextView
+        var tvPrice: TextView
+        var tvTitle: TextView
+        var tvCategory: TextView
+        var tvCurrency: TextView
+
+        constructor(view: View) : super(view) {
+            container = view.container
+            tvDateAndTime = view.tvDateAndTime
+            tvPrice = view.tvPrice
+            tvTitle = view.tvTitle
+            tvCategory = view.tvCategory
+            tvCurrency = view.tvCurrency
+
+            view.setOnClickListener {
+                itemClickListener?.onItemClick(null, null, adapterPosition, 0L)
+            }
+        }
+
+    }
+
+    inner class HeaderViewHolder : RecyclerView.ViewHolder {
+
+        var tvPeriod: TextView
+        var tvTotalIncome: TextView
+        var tvTotalExpense: TextView
+        var tvTotal: TextView
+
+        constructor(view: View) : super(view) {
+
+            tvPeriod = view.tvPeriod
+            tvTotalIncome = view.tvTotalIncome
+            tvTotalExpense = view.tvTotalExpense
+            tvTotal = view.tvTotal
+
+            view.setOnClickListener {
+                itemClickListener?.onItemClick(null, null, 0, 0L)
+            }
+
+        }
+
+    }
+
+    companion object {
+
+        private const val TYPE_HEADER = 0
+        private const val TYPE_ITEM = 1
+
+    }
+
+}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReportConverter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReportConverter.java
index 3f302f7..02acc31 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReportConverter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReportConverter.java
@@ -54,7 +54,7 @@ public String[] getGroupFrom() {
 
     @NonNull
     public int[] getGroupTo() {
-        return new int[]{R.id.tv_category, R.id.tv_total};
+        return new int[]{R.id.tvCategory, R.id.tvTotal};
     }
 
     @NonNull
@@ -89,7 +89,7 @@ public String[] getChildFrom() {
 
     @NonNull
     public int[] getChildTo() {
-        return new int[]{R.id.tv_category, R.id.tv_total};
+        return new int[]{R.id.tvCategory, R.id.tvTotal};
     }
 
     private String getTitle(@NonNull SummaryRecord record) {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java
index a28675f..9417fe5 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java
@@ -118,7 +118,7 @@ public void update() {
     public static class ViewHolder {
         @BindView(R.id.spinner_currency)
         AppCompatSpinner spinnerCurrency;
-        @BindView(R.id.tv_total)
+        @BindView(R.id.tvTotal)
         TextView tvTotal;
         @BindView(R.id.tvCurrency)
         TextView tvCurrency;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
index e93d86d..4ecb323 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
@@ -1,12 +1,14 @@
 package com.blogspot.e_kanivets.moneytracker.ui.presenter;
 
 import android.content.Context;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
 import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.FormatController;
 import com.blogspot.e_kanivets.moneytracker.entity.Period;
 import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport;
@@ -20,6 +22,8 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
+import static android.icu.lang.UCharacter.GraphemeClusterBreak.T;
+
 /**
  * Util class to create and manage summary header view for .
  * Created on 2/26/16.
@@ -45,40 +49,67 @@ public ShortSummaryPresenter(Context context) {
         green = context.getResources().getColor(R.color.green);
     }
 
-    public View create(boolean shortSummary) {
+    public View create(boolean shortSummary, RecordAdapter.HeaderViewHolder mainViewHolder) {
         view = layoutInflater.inflate(R.layout.view_summary_records, null);
         view.findViewById(R.id.iv_more).setVisibility(shortSummary ? View.VISIBLE : View.INVISIBLE);
 
-        ViewHolder viewHolder = new ViewHolder(view);
-        view.setTag(viewHolder);
+        if (mainViewHolder == null)
+            view.setTag(new ViewHolder(view));
+        else
+            view.setTag(mainViewHolder);
 
         return view;
     }
 
     public void update(IRecordReport report, String currency, List<String> ratesNeeded) {
-        ViewHolder viewHolder = (ViewHolder) view.getTag();
-
-        if (report == null) {
-            viewHolder.tvTotalIncome.setText("");
-            viewHolder.tvTotalExpense.setText("");
-
-            viewHolder.tvTotal.setTextColor(red);
-            viewHolder.tvTotal.setText(createRatesNeededList(currency, ratesNeeded));
+        if (view.getTag() instanceof RecordAdapter.HeaderViewHolder) {
+            RecordAdapter.HeaderViewHolder viewHolder = (RecordAdapter.HeaderViewHolder) view.getTag();
+            if (report == null) {
+                viewHolder.getTvTotalIncome().setText("");
+                viewHolder.getTvTotalExpense().setText("");
+
+                viewHolder.getTvTotal().setTextColor(red);
+                viewHolder.getTvTotal().setText(createRatesNeededList(currency, ratesNeeded));
+            } else {
+                viewHolder.getTvPeriod().setText(formatPeriod(report.getPeriod()));
+
+                viewHolder.getTvTotalIncome().setTextColor(report.getTotalIncome() >= 0 ? green : red);
+                viewHolder.getTvTotalIncome().setText(formatController.formatIncome(report.getTotalIncome(),
+                        report.getCurrency()));
+
+                viewHolder.getTvTotalExpense().setTextColor(report.getTotalExpense() > 0 ? green : red);
+                viewHolder.getTvTotalExpense().setText(formatController.formatExpense(report.getTotalExpense(),
+                        report.getCurrency()));
+
+                viewHolder.getTvTotal().setTextColor(report.getTotal() >= 0 ? green : red);
+                viewHolder.getTvTotal().setText(formatController.formatIncome(report.getTotal(),
+                        report.getCurrency()));
+            }
         } else {
-            viewHolder.tvPeriod.setText(formatPeriod(report.getPeriod()));
-
-            viewHolder.tvTotalIncome.setTextColor(report.getTotalIncome() >= 0 ? green : red);
-            viewHolder.tvTotalIncome.setText(formatController.formatIncome(report.getTotalIncome(),
-                    report.getCurrency()));
-
-            viewHolder.tvTotalExpense.setTextColor(report.getTotalExpense() > 0 ? green : red);
-            viewHolder.tvTotalExpense.setText(formatController.formatExpense(report.getTotalExpense(),
-                    report.getCurrency()));
-
-            viewHolder.tvTotal.setTextColor(report.getTotal() >= 0 ? green : red);
-            viewHolder.tvTotal.setText(formatController.formatIncome(report.getTotal(),
-                    report.getCurrency()));
+            ViewHolder viewHolder = (ViewHolder) view.getTag();
+            if (report == null) {
+                viewHolder.getTvTotalIncome().setText("");
+                viewHolder.getTvTotalExpense().setText("");
+
+                viewHolder.getTvTotal().setTextColor(red);
+                viewHolder.getTvTotal().setText(createRatesNeededList(currency, ratesNeeded));
+            } else {
+                viewHolder.getTvPeriod().setText(formatPeriod(report.getPeriod()));
+
+                viewHolder.getTvTotalIncome().setTextColor(report.getTotalIncome() >= 0 ? green : red);
+                viewHolder.getTvTotalIncome().setText(formatController.formatIncome(report.getTotalIncome(),
+                        report.getCurrency()));
+
+                viewHolder.getTvTotalExpense().setTextColor(report.getTotalExpense() > 0 ? green : red);
+                viewHolder.getTvTotalExpense().setText(formatController.formatExpense(report.getTotalExpense(),
+                        report.getCurrency()));
+
+                viewHolder.getTvTotal().setTextColor(report.getTotal() >= 0 ? green : red);
+                viewHolder.getTvTotal().setText(formatController.formatIncome(report.getTotal(),
+                        report.getCurrency()));
+            }
         }
+
     }
 
     private String formatPeriod(Period period) {
@@ -102,17 +133,37 @@ private String formatPeriod(Period period) {
     }
 
     public static class ViewHolder {
-        @BindView(R.id.tv_period)
+
+        @BindView(R.id.tvPeriod)
         TextView tvPeriod;
-        @BindView(R.id.tv_total_income)
+
+        public TextView getTvPeriod() {
+            return tvPeriod;
+        }
+
+        @BindView(R.id.tvTotalIncome)
         TextView tvTotalIncome;
-        @BindView(R.id.tv_total_expense)
+
+        public TextView getTvTotalIncome() {
+            return tvTotalIncome;
+        }
+
+        @BindView(R.id.tvTotalExpense)
         TextView tvTotalExpense;
-        @BindView(R.id.tv_total)
+
+        public TextView getTvTotalExpense() {
+            return tvTotalExpense;
+        }
+
+        @BindView(R.id.tvTotal)
         TextView tvTotal;
 
+        public TextView getTvTotal() {
+            return tvTotal;
+        }
+
         public ViewHolder(View view) {
             ButterKnife.bind(this, view);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index a84fb9e..337223d 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -7,14 +7,15 @@
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/activity_main">
 
-    <ListView
-        android:id="@+id/listView"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
         android:layout_weight="1"
         android:background="@android:color/transparent"
-        android:drawSelectorOnTop="true" />
+        android:drawSelectorOnTop="true"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_change_date.xml b/app/src/main/res/layout/dialog_change_date.xml
index abefb54..55c7cbc 100644
--- a/app/src/main/res/layout/dialog_change_date.xml
+++ b/app/src/main/res/layout/dialog_change_date.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_gravity="center"
     android:background="@color/white"
-    android:layout_gravity="center">
+    android:orientation="vertical">
 
     <TextView
+        android:id="@+id/tvTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/change_date"
         android:background="@color/yellow_light"
-        android:textColor="@color/white"
         android:gravity="center"
-        android:id="@+id/tv_title" />
+        android:text="@string/change_date"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/white" />
 
     <DatePicker
+        android:id="@+id/datePicker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/datePicker"
         android:layout_gravity="center_horizontal" />
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_height="fill_parent"
+        android:orientation="horizontal">
 
         <Button
+            android:id="@+id/b_ok"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@android:string/ok"
-            android:id="@+id/b_ok"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:text="@android:string/ok" />
 
         <Button
+            android:id="@+id/b_cancel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@android:string/cancel"
-            android:id="@+id/b_cancel"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:text="@android:string/cancel" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_account_operations.xml b/app/src/main/res/layout/fragment_account_operations.xml
index f4e5e9d..f56a485 100644
--- a/app/src/main/res/layout/fragment_account_operations.xml
+++ b/app/src/main/res/layout/fragment_account_operations.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
-  <ListView
-      android:id="@+id/listView"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      />
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_account.xml b/app/src/main/res/layout/view_account.xml
index dc91891..a9446fd 100644
--- a/app/src/main/res/layout/view_account.xml
+++ b/app/src/main/res/layout/view_account.xml
@@ -3,13 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/half_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/half_margin">
+    android:paddingTop="@dimen/half_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/half_margin">
 
     <TextView
-        android:id="@+id/tv_title"
+        android:id="@+id/tvTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|top"
@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
         android:gravity="end"
-        android:paddingEnd="@dimen/zero_margin"
         android:paddingStart="5dp"
+        android:paddingEnd="@dimen/zero_margin"
         android:text="New Text"
         android:theme="@style/Text_Body1" />
 
diff --git a/app/src/main/res/layout/view_category_item.xml b/app/src/main/res/layout/view_category_item.xml
index cb6c6b2..9f3ae20 100644
--- a/app/src/main/res/layout/view_category_item.xml
+++ b/app/src/main/res/layout/view_category_item.xml
@@ -5,17 +5,17 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingEnd="@dimen/half_margin"
     android:paddingStart="@dimen/normal_margin"
+    android:paddingEnd="@dimen/half_margin"
     tools:ignore="UseCompoundDrawables">
 
     <TextView
-        android:id="@+id/tv_category"
+        android:id="@+id/tvCategory"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="@dimen/half_margin"
         android:paddingTop="@dimen/half_margin"
+        android:paddingBottom="@dimen/half_margin"
         android:theme="@style/Text_Body1" />
 
     <ImageView
diff --git a/app/src/main/res/layout/view_month_summary.xml b/app/src/main/res/layout/view_month_summary.xml
index d42da18..f40081e 100644
--- a/app/src/main/res/layout/view_month_summary.xml
+++ b/app/src/main/res/layout/view_month_summary.xml
@@ -4,13 +4,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/half_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/half_margin">
+    android:paddingTop="@dimen/half_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/half_margin">
 
     <TextView
-        android:id="@+id/tv_month"
+        android:id="@+id/tvMonth"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|top"
@@ -20,7 +20,7 @@
         tools:text="Dec, 2016" />
 
     <TextView
-        android:id="@+id/tv_total_income"
+        android:id="@+id/tvTotalIncome"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -29,7 +29,7 @@
         tools:text="1000" />
 
     <TextView
-        android:id="@+id/tv_total_expense"
+        android:id="@+id/tvTotalExpense"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/app/src/main/res/layout/view_record.xml b/app/src/main/res/layout/view_record.xml
index 1ff6aa9..f1f663c 100644
--- a/app/src/main/res/layout/view_record.xml
+++ b/app/src/main/res/layout/view_record.xml
@@ -1,108 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    >
-
-  <LinearLayout
-      android:id="@+id/container"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:baselineAligned="false"
-      android:gravity="center_vertical"
-      android:orientation="horizontal"
-      android:paddingBottom="@dimen/half_margin"
-      android:paddingTop="@dimen/half_margin"
-      android:paddingEnd="@dimen/activity_horizontal_margin"
-      android:paddingStart="@dimen/activity_horizontal_margin"
-      >
+    android:layout_height="wrap_content"
+    android:background="@color/white">
 
     <LinearLayout
+        android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        >
-
-      <TextView
-          android:id="@+id/tv_date_and_time"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_gravity="start"
-          android:background="@android:color/transparent"
-          android:text="Small Text"
-          android:textAppearance="?android:attr/textAppearanceSmall"
-          android:theme="@style/Text_Caption"
-          />
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/half_margin"
+        android:paddingEnd="@dimen/activity_horizontal_margin"
+        android:paddingBottom="@dimen/half_margin">
 
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center"
-          android:background="@android:color/transparent"
-          android:orientation="horizontal"
-          >
-
-        <TextView
-            android:id="@+id/tv_title"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|top"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:gravity="start"
-            android:paddingBottom="5dp"
-            android:text="New Text"
-            android:theme="@style/Text_Body2"
-            />
+            android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_category"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|top"
-            android:layout_marginStart="2dp"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:gravity="start"
-            android:paddingBottom="5dp"
-            android:text="New Text"
-            android:theme="@style/Text_Body1"
-            />
+            <TextView
+                android:id="@+id/tvDateAndTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:background="@android:color/transparent"
+                android:text="Small Text"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:theme="@style/Text_Caption" />
 
-      </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@android:color/transparent"
+                android:orientation="horizontal">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/tvTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|top"
+                    android:layout_weight="1"
+                    android:background="@android:color/transparent"
+                    android:gravity="start"
+                    android:paddingBottom="5dp"
+                    android:text="New Text"
+                    android:theme="@style/Text_Body2" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:orientation="vertical"
-        >
+                <TextView
+                    android:id="@+id/tvCategory"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|top"
+                    android:layout_marginStart="2dp"
+                    android:layout_weight="1"
+                    android:background="@android:color/transparent"
+                    android:gravity="start"
+                    android:paddingBottom="5dp"
+                    android:text="New Text"
+                    android:theme="@style/Text_Body1" />
 
-      <TextView
-          android:id="@+id/tv_price"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="@android:color/transparent"
-          android:gravity="end"
-          android:text="New Text"
-          android:theme="@style/Text_Body2"
-          />
+            </LinearLayout>
 
-      <TextView
-          android:id="@+id/tvCurrency"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="@android:color/transparent"
-          android:gravity="end"
-          android:text="New Text"
-          android:theme="@style/Text_Body1"
-          />
+        </LinearLayout>
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:orientation="vertical">
 
-  </LinearLayout>
+            <TextView
+                android:id="@+id/tvPrice"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/transparent"
+                android:gravity="end"
+                android:text="New Text"
+                android:theme="@style/Text_Body2" />
+
+            <TextView
+                android:id="@+id/tvCurrency"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/transparent"
+                android:gravity="end"
+                android:text="New Text"
+                android:theme="@style/Text_Body1" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_report_item.xml b/app/src/main/res/layout/view_report_item.xml
index 330c033..3d75b26 100644
--- a/app/src/main/res/layout/view_report_item.xml
+++ b/app/src/main/res/layout/view_report_item.xml
@@ -5,13 +5,13 @@
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/half_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/half_margin">
+    android:paddingTop="@dimen/half_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/half_margin">
 
     <TextView
-        android:id="@+id/tv_category"
+        android:id="@+id/tvCategory"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -20,7 +20,7 @@
         android:theme="@style/Text_Body1" />
 
     <TextView
-        android:id="@+id/tv_total"
+        android:id="@+id/tvTotal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/view_report_item_exp.xml b/app/src/main/res/layout/view_report_item_exp.xml
index 2d18570..cc8d50c 100644
--- a/app/src/main/res/layout/view_report_item_exp.xml
+++ b/app/src/main/res/layout/view_report_item_exp.xml
@@ -5,13 +5,13 @@
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/half_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/zero_margin"
-    android:paddingTop="@dimen/half_margin">
+    android:paddingTop="@dimen/half_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/half_margin">
 
     <TextView
-        android:id="@+id/tv_category"
+        android:id="@+id/tvCategory"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -19,12 +19,12 @@
         android:background="@android:color/transparent"
         android:gravity="start"
         android:minWidth="5dp"
-        android:paddingEnd="@dimen/zero_margin"
         android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft"
+        android:paddingEnd="@dimen/zero_margin"
         android:theme="@style/Text_Body2" />
 
     <TextView
-        android:id="@+id/tv_total"
+        android:id="@+id/tvTotal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/view_summary_accounts.xml b/app/src/main/res/layout/view_summary_accounts.xml
index 9970f1c..098d14f 100644
--- a/app/src/main/res/layout/view_summary_accounts.xml
+++ b/app/src/main/res/layout/view_summary_accounts.xml
@@ -22,9 +22,9 @@
             style="@style/Text_Body1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
-            android:text="@string/currency"
-            android:layout_gravity="center_vertical" />
+            android:text="@string/currency" />
 
         <android.support.v7.widget.AppCompatSpinner
             android:id="@+id/spinner_currency"
@@ -48,7 +48,7 @@
             android:text="@string/total" />
 
         <TextView
-            android:id="@+id/tv_total"
+            android:id="@+id/tvTotal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="end"
@@ -61,8 +61,8 @@
             android:layout_height="wrap_content"
             android:fontFamily="monospace"
             android:gravity="end"
-            android:paddingEnd="@dimen/zero_margin"
             android:paddingStart="5dp"
+            android:paddingEnd="@dimen/zero_margin"
             android:text="New Text"
             android:theme="@style/Text_Body1" />
 
diff --git a/app/src/main/res/layout/view_summary_records.xml b/app/src/main/res/layout/view_summary_records.xml
index 8f51f6a..a7ee8cb 100644
--- a/app/src/main/res/layout/view_summary_records.xml
+++ b/app/src/main/res/layout/view_summary_records.xml
@@ -25,7 +25,7 @@
                 android:text="@string/short_summary" />
 
             <TextView
-                android:id="@+id/tv_period"
+                android:id="@+id/tvPeriod"
                 style="@style/Text_Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
@@ -33,11 +33,11 @@
         </LinearLayout>
 
         <ImageView
+            android:id="@+id/iv_more"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/ic_more"
-            android:id="@+id/iv_more"/>
+            android:src="@drawable/ic_more" />
 
     </LinearLayout>
 
@@ -56,7 +56,7 @@
             android:text="@string/total_incomes" />
 
         <TextView
-            android:id="@+id/tv_total_income"
+            android:id="@+id/tvTotalIncome"
             style="@style/Text_Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
@@ -77,7 +77,7 @@
             android:text="@string/total_expenses" />
 
         <TextView
-            android:id="@+id/tv_total_expense"
+            android:id="@+id/tvTotalExpense"
             style="@style/Text_Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
@@ -87,7 +87,7 @@
     <include layout="@layout/view_divider" />
 
     <TextView
-        android:id="@+id/tv_total"
+        android:id="@+id/tvTotal"
         style="@style/Text_Body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 0e7a980bd1cb5b03383ebf2fff6bd6e61b4d2a06 Mon Sep 17 00:00:00 2001
From: Bogdan Yevtushenko <evtushencko.b@gmail.com>
Date: Thu, 18 Jul 2019 15:41:25 +0300
Subject: [PATCH 05/10] #168. Add review fixes.

---
 .../account/edit/EditAccountActivity.kt       | 16 +++---
 .../exchange_rate/ExchangeRatesActivity.java  | 11 ++--
 .../activity/record/MainActivity.kt           | 10 ++--
 .../moneytracker/adapter/RecordAdapter.kt     | 51 ++++++++++---------
 .../ui/presenter/ShortSummaryPresenter.java   |  6 +--
 5 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt
index 444a9c1..d3cd883 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt
@@ -22,7 +22,6 @@ import javax.inject.Inject
 import android.view.inputmethod.InputMethodManager
 import kotlinx.android.synthetic.main.fragment_edit_account.*
 
-
 class EditAccountActivity : BaseBackActivity() {
 
     @Inject
@@ -61,26 +60,27 @@ class EditAccountActivity : BaseBackActivity() {
             override fun onPageSelected(position: Int) {
                 if (position == 0) {
                     fabDone.show()
-                    showOrHideKeyboard(true)
+                    showKeyboard()
                 } else {
                     fabDone.hide()
-                    showOrHideKeyboard(false)
+                    hideKeyboard()
                 }
             }
         })
     }
 
-    private fun showOrHideKeyboard(showKeyboard: Boolean) {
+    private fun hideKeyboard() {
         val view: View? = currentFocus
         if (view != null) {
             val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-            if (showKeyboard)
-                imm.showSoftInput(etTitle, 0)
-            else
-                imm.hideSoftInputFromWindow(view.windowToken, 0)
+            imm.hideSoftInputFromWindow(view.windowToken, 0)
         }
     }
 
+    private fun showKeyboard() {
+        val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.showSoftInput(etTitle, 0)
+    }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(if (account.isArchived) R.menu.menu_archived_account else R.menu.menu_account, menu)
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
index 2fe0853..b5d7233 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java
@@ -107,9 +107,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (resultCode == AppCompatActivity.RESULT_OK) {
-            if (requestCode == REQUEST_ADD_EXCHANGE_RATE) {
-                update();
-                setResult(RESULT_OK);
+            switch (requestCode) {
+                case REQUEST_ADD_EXCHANGE_RATE:
+                    update();
+                    setResult(RESULT_OK);
+                    break;
+
+                default:
+                    break;
             }
         }
     }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
index 39c3257..f95d098 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
@@ -2,7 +2,6 @@ package com.blogspot.e_kanivets.moneytracker.activity.record
 
 import android.content.Intent
 import android.support.v7.app.AppCompatActivity
-import android.widget.AdapterView
 import android.widget.TextView
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity
@@ -72,9 +71,11 @@ class MainActivity : BaseDrawerActivity() {
         tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tvCurrency)
 
         recordAdapter = RecordAdapter(this, listOf(), formatController, true)
-        recordAdapter.setOnItemClickListener(AdapterView.OnItemClickListener { _, _, position, _ ->
-            if (position == 0) showReport()
-            else editRecord(position)
+        recordAdapter.setOnItemClickListener(object : RecordAdapter.OnItemClickListener {
+            override fun onItemClick(position: Int) {
+                if (position == 0) showReport()
+                else editRecord(position)
+            }
         })
         recyclerView.adapter = recordAdapter
 
@@ -93,6 +94,7 @@ class MainActivity : BaseDrawerActivity() {
     private fun editRecord(position: Int) {
         AnswersProxy.get().logButton("Edit Record")
 
+        // Minus one because of list view's header view
         val record = recordList[position - 1]
         startAddRecordActivity(record, AddRecordActivity.Mode.MODE_EDIT, record.type)
     }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
index de72f05..b9add6e 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
@@ -6,7 +6,6 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.blogspot.e_kanivets.moneytracker.MtApp
@@ -22,7 +21,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private var formatController: FormatController
 
-    private var itemClickListener: AdapterView.OnItemClickListener? = null
+    private var itemClickListener: OnItemClickListener? = null
 
     private var whiteRed: Int
     private var whiteGreen: Int
@@ -33,10 +32,10 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private var context: Context
 
     private var summaryPresenter: ShortSummaryPresenter
-    private var needHeaderView: Boolean = false
+    private var isHeaderViewNeeded: Boolean = false
     private lateinit var headerViewHolder: HeaderViewHolder
 
-    constructor(context: Context, records: List<Record>, formatController: FormatController, needHeaderView: Boolean) {
+    constructor(context: Context, records: List<Record>, formatController: FormatController, isHeaderViewNeeded: Boolean) {
         this.context = context
         this.records = records
 
@@ -49,18 +48,18 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         summaryPresenter = ShortSummaryPresenter(context)
 
-        if (needHeaderView) {
-            val summaryView = summaryPresenter.create(true, HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null)))
-            headerViewHolder = summaryView.tag as HeaderViewHolder
+        if (isHeaderViewNeeded) {
+            headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
+            summaryPresenter.create(true, headerViewHolder)
         }
 
-        this.needHeaderView = needHeaderView
+        this.isHeaderViewNeeded = isHeaderViewNeeded
         this.formatController = formatController
     }
 
     override fun getItemCount() = records.size
 
-    override fun getItemViewType(position: Int): Int = if (position == 0 && needHeaderView) {
+    override fun getItemViewType(position: Int): Int = if (position == 0 && isHeaderViewNeeded) {
         TYPE_HEADER
     } else {
         TYPE_ITEM
@@ -70,39 +69,43 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
             if (viewType == TYPE_HEADER) {
                 headerViewHolder
             } else {
-                ViewHolder(LayoutInflater.from(context).inflate(R.layout.view_record, parent, false))
+                ViewHolder(LayoutInflater.from(context).inflate(R.layout.view_record, parent, false), itemClickListener)
             }
 
     override fun onBindViewHolder(rvViewHolder: RecyclerView.ViewHolder, position: Int) {
-        if (position == 0 && needHeaderView) {
+        if (position == 0 && isHeaderViewNeeded) {
             //adapter already bound to view
             return
         }
 
         val viewHolder = rvViewHolder as ViewHolder
-        val record: Record = records[position - if (needHeaderView) 1 else 0]
+        val record: Record = records[position - if (isHeaderViewNeeded) 1 else 0]
         viewHolder.container.setBackgroundColor(if (record.isIncome) whiteGreen else whiteRed)
         viewHolder.tvPrice.setTextColor(if (record.isIncome) green else red)
 
         viewHolder.tvDateAndTime.text = formatController.formatDateAndTime(record.time)
-        viewHolder.tvPrice.text = formatController.formatSignedAmount(
-                (if (record.isIncome) 1 else -1) * record.fullPrice)
+        val price = (if (record.isIncome) record.fullPrice else getNegative(record.fullPrice))
+        viewHolder.tvPrice.text = formatController.formatSignedAmount(price)
         viewHolder.tvTitle.text = record.title
         viewHolder.tvCategory.text = record.category?.name
         viewHolder.tvCurrency.text = record.currency
     }
 
+    private fun getNegative(number: Double): Double {
+        return -1 * number
+    }
+
     fun setRecords(recordsList: List<Record>, report: IRecordReport?, currency: String, ratesNeeded: List<String>) {
         records = recordsList
         summaryPresenter.update(report, currency, ratesNeeded)
         notifyDataSetChanged()
     }
 
-    fun setOnItemClickListener(itemClickListener: AdapterView.OnItemClickListener) {
+    fun setOnItemClickListener(itemClickListener: OnItemClickListener) {
         this.itemClickListener = itemClickListener
     }
 
-    inner class ViewHolder : RecyclerView.ViewHolder {
+    class ViewHolder : RecyclerView.ViewHolder {
 
         var container: LinearLayout
         var tvDateAndTime: TextView
@@ -111,7 +114,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         var tvCategory: TextView
         var tvCurrency: TextView
 
-        constructor(view: View) : super(view) {
+        constructor(view: View, itemClickListener: OnItemClickListener?) : super(view) {
             container = view.container
             tvDateAndTime = view.tvDateAndTime
             tvPrice = view.tvPrice
@@ -120,34 +123,36 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
             tvCurrency = view.tvCurrency
 
             view.setOnClickListener {
-                itemClickListener?.onItemClick(null, null, adapterPosition, 0L)
+                itemClickListener?.onItemClick(adapterPosition)
             }
         }
 
     }
 
-    inner class HeaderViewHolder : RecyclerView.ViewHolder {
+    class HeaderViewHolder : RecyclerView.ViewHolder {
 
         var tvPeriod: TextView
         var tvTotalIncome: TextView
         var tvTotalExpense: TextView
         var tvTotal: TextView
 
-        constructor(view: View) : super(view) {
-
+        constructor(view: View, itemClickListener: OnItemClickListener?) : super(view) {
             tvPeriod = view.tvPeriod
             tvTotalIncome = view.tvTotalIncome
             tvTotalExpense = view.tvTotalExpense
             tvTotal = view.tvTotal
 
             view.setOnClickListener {
-                itemClickListener?.onItemClick(null, null, 0, 0L)
+                itemClickListener?.onItemClick(0)
             }
-
         }
 
     }
 
+    interface OnItemClickListener {
+        fun onItemClick(position: Int)
+    }
+
     companion object {
 
         private const val TYPE_HEADER = 0
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
index 4ecb323..fc2351d 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
@@ -1,7 +1,6 @@
 package com.blogspot.e_kanivets.moneytracker.ui.presenter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -22,8 +21,6 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-import static android.icu.lang.UCharacter.GraphemeClusterBreak.T;
-
 /**
  * Util class to create and manage summary header view for .
  * Created on 2/26/16.
@@ -135,7 +132,7 @@ private String formatPeriod(Period period) {
     public static class ViewHolder {
 
         @BindView(R.id.tvPeriod)
-        TextView tvPeriod;
+        public TextView tvPeriod;
 
         public TextView getTvPeriod() {
             return tvPeriod;
@@ -165,5 +162,6 @@ public TextView getTvTotal() {
         public ViewHolder(View view) {
             ButterKnife.bind(this, view);
         }
+
     }
 }
\ No newline at end of file

From 4072e277ec4cb6baf665422e96b68b1aaa9ac8a2 Mon Sep 17 00:00:00 2001
From: Bogdan Yevtushenko <evtushencko.b@gmail.com>
Date: Thu, 18 Jul 2019 16:26:06 +0300
Subject: [PATCH 06/10] #168. Add SummaryViewInterface.

---
 .../moneytracker/adapter/RecordAdapter.kt     | 30 +++++--
 .../ui/presenter/ShortSummaryPresenter.java   | 83 +++++++++----------
 2 files changed, 62 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
index b9add6e..9fab744 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
@@ -103,6 +103,10 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     fun setOnItemClickListener(itemClickListener: OnItemClickListener) {
         this.itemClickListener = itemClickListener
+        if (isHeaderViewNeeded) {
+            headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
+            summaryPresenter.create(true, headerViewHolder)
+        }
     }
 
     class ViewHolder : RecyclerView.ViewHolder {
@@ -129,12 +133,28 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     }
 
-    class HeaderViewHolder : RecyclerView.ViewHolder {
+    class HeaderViewHolder : RecyclerView.ViewHolder, ShortSummaryPresenter.SummaryViewInterface {
+
+        private var tvPeriod: TextView
+        private var tvTotalIncome: TextView
+        private var tvTotalExpense: TextView
+        private var tvTotal: TextView
+
+        override fun getTvPeriod(): TextView {
+            return tvPeriod
+        }
+
+        override fun getTvTotalIncome(): TextView {
+            return tvTotalIncome
+        }
 
-        var tvPeriod: TextView
-        var tvTotalIncome: TextView
-        var tvTotalExpense: TextView
-        var tvTotal: TextView
+        override fun getTvTotalExpense(): TextView {
+            return tvTotalExpense
+        }
+
+        override fun getTvTotal(): TextView {
+            return tvTotal
+        }
 
         constructor(view: View, itemClickListener: OnItemClickListener?) : super(view) {
             tvPeriod = view.tvPeriod
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
index fc2351d..b9bb468 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
@@ -59,52 +59,27 @@ public View create(boolean shortSummary, RecordAdapter.HeaderViewHolder mainView
     }
 
     public void update(IRecordReport report, String currency, List<String> ratesNeeded) {
-        if (view.getTag() instanceof RecordAdapter.HeaderViewHolder) {
-            RecordAdapter.HeaderViewHolder viewHolder = (RecordAdapter.HeaderViewHolder) view.getTag();
-            if (report == null) {
-                viewHolder.getTvTotalIncome().setText("");
-                viewHolder.getTvTotalExpense().setText("");
-
-                viewHolder.getTvTotal().setTextColor(red);
-                viewHolder.getTvTotal().setText(createRatesNeededList(currency, ratesNeeded));
-            } else {
-                viewHolder.getTvPeriod().setText(formatPeriod(report.getPeriod()));
-
-                viewHolder.getTvTotalIncome().setTextColor(report.getTotalIncome() >= 0 ? green : red);
-                viewHolder.getTvTotalIncome().setText(formatController.formatIncome(report.getTotalIncome(),
-                        report.getCurrency()));
-
-                viewHolder.getTvTotalExpense().setTextColor(report.getTotalExpense() > 0 ? green : red);
-                viewHolder.getTvTotalExpense().setText(formatController.formatExpense(report.getTotalExpense(),
-                        report.getCurrency()));
-
-                viewHolder.getTvTotal().setTextColor(report.getTotal() >= 0 ? green : red);
-                viewHolder.getTvTotal().setText(formatController.formatIncome(report.getTotal(),
-                        report.getCurrency()));
-            }
+        SummaryViewInterface viewHolder = (SummaryViewInterface) view.getTag();
+        if (report == null) {
+            viewHolder.getTvTotalIncome().setText("");
+            viewHolder.getTvTotalExpense().setText("");
+
+            viewHolder.getTvTotal().setTextColor(red);
+            viewHolder.getTvTotal().setText(createRatesNeededList(currency, ratesNeeded));
         } else {
-            ViewHolder viewHolder = (ViewHolder) view.getTag();
-            if (report == null) {
-                viewHolder.getTvTotalIncome().setText("");
-                viewHolder.getTvTotalExpense().setText("");
-
-                viewHolder.getTvTotal().setTextColor(red);
-                viewHolder.getTvTotal().setText(createRatesNeededList(currency, ratesNeeded));
-            } else {
-                viewHolder.getTvPeriod().setText(formatPeriod(report.getPeriod()));
-
-                viewHolder.getTvTotalIncome().setTextColor(report.getTotalIncome() >= 0 ? green : red);
-                viewHolder.getTvTotalIncome().setText(formatController.formatIncome(report.getTotalIncome(),
-                        report.getCurrency()));
-
-                viewHolder.getTvTotalExpense().setTextColor(report.getTotalExpense() > 0 ? green : red);
-                viewHolder.getTvTotalExpense().setText(formatController.formatExpense(report.getTotalExpense(),
-                        report.getCurrency()));
-
-                viewHolder.getTvTotal().setTextColor(report.getTotal() >= 0 ? green : red);
-                viewHolder.getTvTotal().setText(formatController.formatIncome(report.getTotal(),
-                        report.getCurrency()));
-            }
+            viewHolder.getTvPeriod().setText(formatPeriod(report.getPeriod()));
+
+            viewHolder.getTvTotalIncome().setTextColor(report.getTotalIncome() >= 0 ? green : red);
+            viewHolder.getTvTotalIncome().setText(formatController.formatIncome(report.getTotalIncome(),
+                    report.getCurrency()));
+
+            viewHolder.getTvTotalExpense().setTextColor(report.getTotalExpense() > 0 ? green : red);
+            viewHolder.getTvTotalExpense().setText(formatController.formatExpense(report.getTotalExpense(),
+                    report.getCurrency()));
+
+            viewHolder.getTvTotal().setTextColor(report.getTotal() >= 0 ? green : red);
+            viewHolder.getTvTotal().setText(formatController.formatIncome(report.getTotal(),
+                    report.getCurrency()));
         }
 
     }
@@ -129,11 +104,12 @@ private String formatPeriod(Period period) {
         }
     }
 
-    public static class ViewHolder {
+    public static class ViewHolder implements SummaryViewInterface {
 
         @BindView(R.id.tvPeriod)
         public TextView tvPeriod;
 
+        @Override
         public TextView getTvPeriod() {
             return tvPeriod;
         }
@@ -141,6 +117,7 @@ public TextView getTvPeriod() {
         @BindView(R.id.tvTotalIncome)
         TextView tvTotalIncome;
 
+        @Override
         public TextView getTvTotalIncome() {
             return tvTotalIncome;
         }
@@ -148,6 +125,7 @@ public TextView getTvTotalIncome() {
         @BindView(R.id.tvTotalExpense)
         TextView tvTotalExpense;
 
+        @Override
         public TextView getTvTotalExpense() {
             return tvTotalExpense;
         }
@@ -155,6 +133,7 @@ public TextView getTvTotalExpense() {
         @BindView(R.id.tvTotal)
         TextView tvTotal;
 
+        @Override
         public TextView getTvTotal() {
             return tvTotal;
         }
@@ -164,4 +143,16 @@ public ViewHolder(View view) {
         }
 
     }
+
+    public interface SummaryViewInterface {
+        public TextView getTvPeriod();
+
+        public TextView getTvTotalIncome();
+
+        public TextView getTvTotalExpense();
+
+        public TextView getTvTotal();
+    }
+
+
 }
\ No newline at end of file

From f207de6ae8b23c9fa45b57b9c87af72ef3adc44f Mon Sep 17 00:00:00 2001
From: Bogdan Yevtushenko <evtushencko.b@gmail.com>
Date: Thu, 18 Jul 2019 16:28:44 +0300
Subject: [PATCH 07/10] #168. Add some fixes.

---
 .../moneytracker/ui/presenter/ShortSummaryPresenter.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
index b9bb468..f18952e 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
@@ -145,14 +145,13 @@ public ViewHolder(View view) {
     }
 
     public interface SummaryViewInterface {
-        public TextView getTvPeriod();
+        TextView getTvPeriod();
 
-        public TextView getTvTotalIncome();
+        TextView getTvTotalIncome();
 
-        public TextView getTvTotalExpense();
+        TextView getTvTotalExpense();
 
-        public TextView getTvTotal();
+        TextView getTvTotal();
     }
 
-
 }
\ No newline at end of file

From 282f8b54fd16acbc81632374fa6b33d3fe1b6956 Mon Sep 17 00:00:00 2001
From: Bogdan Yevtushenko <evtushencko.b@gmail.com>
Date: Fri, 19 Jul 2019 13:17:23 +0300
Subject: [PATCH 08/10] #168. Add review fixes.

---
 .../moneytracker/adapter/RecordAdapter.kt     | 34 +++++--------------
 .../ui/presenter/ShortSummaryPresenter.java   |  8 ++---
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
index 9fab744..043ea2c 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
@@ -48,16 +48,11 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         summaryPresenter = ShortSummaryPresenter(context)
 
-        if (isHeaderViewNeeded) {
-            headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
-            summaryPresenter.create(true, headerViewHolder)
-        }
-
         this.isHeaderViewNeeded = isHeaderViewNeeded
         this.formatController = formatController
     }
 
-    override fun getItemCount() = records.size
+    override fun getItemCount() = records.size + if (isHeaderViewNeeded) 1 else 0
 
     override fun getItemViewType(position: Int): Int = if (position == 0 && isHeaderViewNeeded) {
         TYPE_HEADER
@@ -96,6 +91,10 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     }
 
     fun setRecords(recordsList: List<Record>, report: IRecordReport?, currency: String, ratesNeeded: List<String>) {
+        if (isHeaderViewNeeded && records.isEmpty()) {
+            headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
+            summaryPresenter.create(true, headerViewHolder)
+        }
         records = recordsList
         summaryPresenter.update(report, currency, ratesNeeded)
         notifyDataSetChanged()
@@ -103,10 +102,6 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     fun setOnItemClickListener(itemClickListener: OnItemClickListener) {
         this.itemClickListener = itemClickListener
-        if (isHeaderViewNeeded) {
-            headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
-            summaryPresenter.create(true, headerViewHolder)
-        }
     }
 
     class ViewHolder : RecyclerView.ViewHolder {
@@ -130,7 +125,6 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 itemClickListener?.onItemClick(adapterPosition)
             }
         }
-
     }
 
     class HeaderViewHolder : RecyclerView.ViewHolder, ShortSummaryPresenter.SummaryViewInterface {
@@ -140,21 +134,13 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         private var tvTotalExpense: TextView
         private var tvTotal: TextView
 
-        override fun getTvPeriod(): TextView {
-            return tvPeriod
-        }
+        override fun getTvPeriod(): TextView = tvPeriod
 
-        override fun getTvTotalIncome(): TextView {
-            return tvTotalIncome
-        }
+        override fun getTvTotalIncome(): TextView = tvTotalIncome
 
-        override fun getTvTotalExpense(): TextView {
-            return tvTotalExpense
-        }
+        override fun getTvTotalExpense(): TextView = tvTotalExpense
 
-        override fun getTvTotal(): TextView {
-            return tvTotal
-        }
+        override fun getTvTotal(): TextView = tvTotal
 
         constructor(view: View, itemClickListener: OnItemClickListener?) : super(view) {
             tvPeriod = view.tvPeriod
@@ -166,7 +152,6 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 itemClickListener?.onItemClick(0)
             }
         }
-
     }
 
     interface OnItemClickListener {
@@ -177,7 +162,6 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         private const val TYPE_HEADER = 0
         private const val TYPE_ITEM = 1
-
     }
 
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
index f18952e..65e9893 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java
@@ -50,10 +50,7 @@ public View create(boolean shortSummary, RecordAdapter.HeaderViewHolder mainView
         view = layoutInflater.inflate(R.layout.view_summary_records, null);
         view.findViewById(R.id.iv_more).setVisibility(shortSummary ? View.VISIBLE : View.INVISIBLE);
 
-        if (mainViewHolder == null)
-            view.setTag(new ViewHolder(view));
-        else
-            view.setTag(mainViewHolder);
+        view.setTag(mainViewHolder != null ? mainViewHolder : new ViewHolder(view));
 
         return view;
     }
@@ -107,7 +104,7 @@ private String formatPeriod(Period period) {
     public static class ViewHolder implements SummaryViewInterface {
 
         @BindView(R.id.tvPeriod)
-        public TextView tvPeriod;
+        TextView tvPeriod;
 
         @Override
         public TextView getTvPeriod() {
@@ -141,7 +138,6 @@ public TextView getTvTotal() {
         public ViewHolder(View view) {
             ButterKnife.bind(this, view);
         }
-
     }
 
     public interface SummaryViewInterface {

From 285c58c23e4d9c3ddacedc35bff5c2c45699b0d7 Mon Sep 17 00:00:00 2001
From: Bogdan Yevtushenko <evtushencko.b@gmail.com>
Date: Fri, 19 Jul 2019 14:36:19 +0300
Subject: [PATCH 09/10] #168. Add @Inject in RecordAdapter. Change anonymous
 class into lambda in rvOnClickListener.

---
 .../fragment/AccountOperationsFragment.kt     |  5 ++--
 .../charts/fragment/GraphFragment.java        |  1 -
 .../charts/fragment/SummaryFragment.java      |  1 -
 .../activity/record/MainActivity.kt           | 13 +++++-----
 .../moneytracker/adapter/RecordAdapter.kt     | 24 ++++++++-----------
 5 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
index faa21e8..8677212 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
@@ -24,8 +24,6 @@ class AccountOperationsFragment : BaseFragment() {
     internal lateinit var recordController: RecordController
     @Inject
     internal lateinit var transferController: TransferController
-    @Inject
-    internal lateinit var formatController: FormatController
 
     private lateinit var account: Account
 
@@ -37,7 +35,7 @@ class AccountOperationsFragment : BaseFragment() {
     }
 
     override fun initViews(view: View) {
-        recyclerView.adapter = RecordAdapter(requireContext(), getRecords(), formatController, false)
+        recyclerView.adapter = RecordAdapter(requireContext(), getRecords(), false)
     }
 
     private fun getRecords(): List<Record> {
@@ -86,4 +84,5 @@ class AccountOperationsFragment : BaseFragment() {
         }
 
     }
+
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java
index b8ef013..f9222ec 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java
@@ -107,5 +107,4 @@ private void initViews(@Nullable View rootView) {
             barChart.setHighlightPerTapEnabled(false);
         }
     }
-
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java
index 6d30b1d..d71f919 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java
@@ -72,5 +72,4 @@ private void initViews(@Nullable View rootView) {
             listView.setAdapter(new MonthSummaryAdapter(getActivity(), monthReport));
         }
     }
-
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
index f95d098..2dc4a7a 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
@@ -70,13 +70,12 @@ class MainActivity : BaseDrawerActivity() {
         tvDefaultAccountSum = navigationView.getHeaderView(0).findViewById(R.id.tvDefaultAccountSum)
         tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tvCurrency)
 
-        recordAdapter = RecordAdapter(this, listOf(), formatController, true)
-        recordAdapter.setOnItemClickListener(object : RecordAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                if (position == 0) showReport()
-                else editRecord(position)
-            }
-        })
+        recordAdapter = RecordAdapter(this, listOf(), true)
+
+        recordAdapter.setOnItemClickListener { position ->
+            if (position == 0) showReport()
+            else editRecord(position)
+        }
         recyclerView.adapter = recordAdapter
 
         spinner.setPeriodSelectedListener { period ->
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
index 043ea2c..b6df79e 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
@@ -16,12 +16,14 @@ import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
 import kotlinx.android.synthetic.main.view_record.view.*
 import kotlinx.android.synthetic.main.view_summary_records.view.*
+import javax.inject.Inject
 
 class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private var formatController: FormatController
+    @Inject
+    lateinit var formatController: FormatController
 
-    private var itemClickListener: OnItemClickListener? = null
+    private var itemClickListener: ((Int) -> Unit)? = null
 
     private var whiteRed: Int
     private var whiteGreen: Int
@@ -35,7 +37,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private var isHeaderViewNeeded: Boolean = false
     private lateinit var headerViewHolder: HeaderViewHolder
 
-    constructor(context: Context, records: List<Record>, formatController: FormatController, isHeaderViewNeeded: Boolean) {
+    constructor(context: Context, records: List<Record>, isHeaderViewNeeded: Boolean) {
         this.context = context
         this.records = records
 
@@ -49,7 +51,6 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         summaryPresenter = ShortSummaryPresenter(context)
 
         this.isHeaderViewNeeded = isHeaderViewNeeded
-        this.formatController = formatController
     }
 
     override fun getItemCount() = records.size + if (isHeaderViewNeeded) 1 else 0
@@ -100,7 +101,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         notifyDataSetChanged()
     }
 
-    fun setOnItemClickListener(itemClickListener: OnItemClickListener) {
+    fun setOnItemClickListener(itemClickListener: (Int) -> Unit) {
         this.itemClickListener = itemClickListener
     }
 
@@ -113,7 +114,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         var tvCategory: TextView
         var tvCurrency: TextView
 
-        constructor(view: View, itemClickListener: OnItemClickListener?) : super(view) {
+        constructor(view: View, itemClickListener: ((Int) -> Unit)?) : super(view) {
             container = view.container
             tvDateAndTime = view.tvDateAndTime
             tvPrice = view.tvPrice
@@ -122,7 +123,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
             tvCurrency = view.tvCurrency
 
             view.setOnClickListener {
-                itemClickListener?.onItemClick(adapterPosition)
+                itemClickListener?.invoke(adapterPosition)
             }
         }
     }
@@ -142,26 +143,21 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         override fun getTvTotal(): TextView = tvTotal
 
-        constructor(view: View, itemClickListener: OnItemClickListener?) : super(view) {
+        constructor(view: View, itemClickListener: ((Int) -> Unit)?) : super(view) {
             tvPeriod = view.tvPeriod
             tvTotalIncome = view.tvTotalIncome
             tvTotalExpense = view.tvTotalExpense
             tvTotal = view.tvTotal
 
             view.setOnClickListener {
-                itemClickListener?.onItemClick(0)
+                itemClickListener?.invoke(0)
             }
         }
     }
 
-    interface OnItemClickListener {
-        fun onItemClick(position: Int)
-    }
-
     companion object {
 
         private const val TYPE_HEADER = 0
         private const val TYPE_ITEM = 1
     }
-
 }

From ba92df5c5943deca051bc8055a4647cc1b3aa45d Mon Sep 17 00:00:00 2001
From: Bogdan Yevtushenko <evtushencko.b@gmail.com>
Date: Mon, 22 Jul 2019 12:49:14 +0300
Subject: [PATCH 10/10] #168. Fix bug connected to shortSummary update in first
 launch.

---
 .../edit/fragment/AccountOperationsFragment.kt   |  3 +--
 .../moneytracker/activity/record/MainActivity.kt |  4 +---
 .../moneytracker/adapter/RecordAdapter.kt        | 16 ++++++----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
index 8677212..93d7726 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseFragment
 import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter
-import com.blogspot.e_kanivets.moneytracker.controller.FormatController
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
 import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController
 import com.blogspot.e_kanivets.moneytracker.controller.data.TransferController
@@ -35,7 +34,7 @@ class AccountOperationsFragment : BaseFragment() {
     }
 
     override fun initViews(view: View) {
-        recyclerView.adapter = RecordAdapter(requireContext(), getRecords(), false)
+        recyclerView.adapter = RecordAdapter(requireContext(), getRecords(), false, null)
     }
 
     private fun getRecords(): List<Record> {
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
index 2dc4a7a..e93e158 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
@@ -70,9 +70,7 @@ class MainActivity : BaseDrawerActivity() {
         tvDefaultAccountSum = navigationView.getHeaderView(0).findViewById(R.id.tvDefaultAccountSum)
         tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tvCurrency)
 
-        recordAdapter = RecordAdapter(this, listOf(), true)
-
-        recordAdapter.setOnItemClickListener { position ->
+        recordAdapter = RecordAdapter(this, listOf(), true) { position ->
             if (position == 0) showReport()
             else editRecord(position)
         }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
index b6df79e..f07066d 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.kt
@@ -35,9 +35,9 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private var summaryPresenter: ShortSummaryPresenter
     private var isHeaderViewNeeded: Boolean = false
-    private lateinit var headerViewHolder: HeaderViewHolder
+    private var headerViewHolder: HeaderViewHolder
 
-    constructor(context: Context, records: List<Record>, isHeaderViewNeeded: Boolean) {
+    constructor(context: Context, records: List<Record>, isHeaderViewNeeded: Boolean, itemClickListener: ((Int) -> Unit)?) {
         this.context = context
         this.records = records
 
@@ -50,7 +50,11 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         summaryPresenter = ShortSummaryPresenter(context)
 
+        this.itemClickListener = itemClickListener
         this.isHeaderViewNeeded = isHeaderViewNeeded
+
+        headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
+        summaryPresenter.create(true, headerViewHolder)
     }
 
     override fun getItemCount() = records.size + if (isHeaderViewNeeded) 1 else 0
@@ -92,19 +96,11 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     }
 
     fun setRecords(recordsList: List<Record>, report: IRecordReport?, currency: String, ratesNeeded: List<String>) {
-        if (isHeaderViewNeeded && records.isEmpty()) {
-            headerViewHolder = HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.view_summary_records, null), itemClickListener)
-            summaryPresenter.create(true, headerViewHolder)
-        }
         records = recordsList
         summaryPresenter.update(report, currency, ratesNeeded)
         notifyDataSetChanged()
     }
 
-    fun setOnItemClickListener(itemClickListener: (Int) -> Unit) {
-        this.itemClickListener = itemClickListener
-    }
-
     class ViewHolder : RecyclerView.ViewHolder {
 
         var container: LinearLayout