#179. Add review fixes.

Author: bogdan-evtushenko

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

@@ -3,6 +3,7 @@ package com.blogspot.e_kanivets.moneytracker.activity
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import com.blogspot.e_kanivets.moneytracker.MtApp
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity
 import com.blogspot.e_kanivets.moneytracker.adapter.RecordReportAdapter
@@ -14,6 +15,7 @@ import com.blogspot.e_kanivets.moneytracker.entity.Period
 import com.blogspot.e_kanivets.moneytracker.entity.RecordReportItem
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record
 import com.blogspot.e_kanivets.moneytracker.report.ReportMaker
+import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
 import kotlinx.android.synthetic.main.activity_report.*
 import java.util.*
@@ -27,12 +29,11 @@ class ReportActivity : BaseBackActivity() {
     lateinit var rateController: ExchangeRateController
     @Inject
     lateinit var currencyController: CurrencyController
-    @Inject
-    lateinit var formatController: FormatController
 
     private var recordList: List<Record> = listOf()
     private var period: Period? = null
     private lateinit var adapter: RecordReportAdapter
+    private lateinit var recordReportConverter: RecordReportConverter
 
     private lateinit var shortSummaryPresenter: ShortSummaryPresenter
 
@@ -48,6 +49,7 @@ class ReportActivity : BaseBackActivity() {
         recordList = recordController.getRecordsForPeriod(period)
         shortSummaryPresenter = ShortSummaryPresenter(this)
         adapter = RecordReportAdapter(mutableListOf(), hashMapOf(), this)
+        recordReportConverter = RecordReportConverter()
 
         return true
     }
@@ -57,35 +59,15 @@ class ReportActivity : BaseBackActivity() {
 
         initSpinnerCurrency()
 
-        adapter.addSummaryView(shortSummaryPresenter.create(false, null))
+        adapter.setSummaryView(shortSummaryPresenter.create(false, null))
         recyclerView.adapter = adapter
     }
 
     private fun update(currency: String) {
         val reportMaker = ReportMaker(rateController)
         val report = reportMaker.getRecordReport(currency, period, recordList)
 
-        val data: HashMap<RecordReportItem.ParentRow, List<RecordReportItem.ChildRow>> = hashMapOf()
-        val items: MutableList<RecordReportItem> = mutableListOf()
-
-        if (report != null) {
-            for (categoryRecord in report.summary) {
-
-                val parentRow = RecordReportItem.ParentRow(categoryRecord.title, formatController.formatSignedAmount(categoryRecord.amount), false)
-                items.add(parentRow)
-
-                val childRows: MutableList<RecordReportItem.ChildRow> = mutableListOf()
-
-                for (summaryRecord in categoryRecord.summaryRecordList) {
-                    val childRow = RecordReportItem.ChildRow(summaryRecord.title, formatController.formatSignedAmount(summaryRecord.amount))
-                    childRows.add(childRow)
-                }
-
-                data[parentRow] = childRows
-            }
-        }
-
-        adapter.setData(items, data)
+        adapter.setData(recordReportConverter.getItemsFromReport(report), recordReportConverter.getDataFromReport(report))
         shortSummaryPresenter.update(report, currency, reportMaker.currencyNeeded(currency, recordList))
     }
 
@@ -105,6 +87,48 @@ class ReportActivity : BaseBackActivity() {
         spinnerCurrency.setSelection(currencyList.indexOf(currency))
     }
 
+    class RecordReportConverter {
+
+        @Inject
+        lateinit var formatController: FormatController
+
+        init {
+            MtApp.get().appComponent.inject(this)
+        }
+
+        fun getItemsFromReport(report: IRecordReport?): MutableList<RecordReportItem> {
+            val items: MutableList<RecordReportItem> = mutableListOf()
+
+            if (report == null) return items
+
+            for (categoryRecord in report.summary) {
+                val parentRow = RecordReportItem.ParentRow(categoryRecord.title, formatController.formatSignedAmount(categoryRecord.amount), false)
+                items.add(parentRow)
+            }
+            return items
+        }
+
+        fun getDataFromReport(report: IRecordReport?): HashMap<RecordReportItem.ParentRow, List<RecordReportItem.ChildRow>> {
+            val data: HashMap<RecordReportItem.ParentRow, List<RecordReportItem.ChildRow>> = hashMapOf()
+
+            if (report == null) return data
+
+            for (categoryRecord in report.summary) {
+                val parentRow = RecordReportItem.ParentRow(categoryRecord.title, formatController.formatSignedAmount(categoryRecord.amount), false)
+                val childRows: MutableList<RecordReportItem.ChildRow> = mutableListOf()
+
+                for (summaryRecord in categoryRecord.summaryRecordList) {
+                    val childRow = RecordReportItem.ChildRow(summaryRecord.title, formatController.formatSignedAmount(summaryRecord.amount))
+                    childRows.add(childRow)
+                }
+
+                data[parentRow] = childRows
+            }
+            return data
+        }
+
+    }
+
     companion object {
 
         const val KEY_PERIOD = "key_period"

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.support.v7.widget.RecyclerView
 import android.widget.TextView
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity
@@ -26,7 +27,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>
@@ -77,13 +77,11 @@ class MainActivity : BaseDrawerActivity() {
         tvCurrency = navigationView.getHeaderView(0).findViewById(R.id.tvCurrency)
 
         recordAdapter = RecordAdapter(this, listOf(), true)
-        recordAdapter.setOnItemClickListener { position -> editRecord(position) }
+        recordAdapter.itemClickListener = { position -> editRecord(getPositionWithoutSummary(position)) }
 
         summaryPresenter = ShortSummaryPresenter(this)
-        val summaryView = summaryPresenter.create(true) {
-            showReport()
-        }
-        recordAdapter.addSummaryView(summaryView)
+        val summaryViewHolder = summaryPresenter.create(true) { showReport() }.tag as RecyclerView.ViewHolder
+        recordAdapter.summaryViewHolder = summaryViewHolder
 
         recyclerView.adapter = recordAdapter
 
@@ -99,10 +97,14 @@ class MainActivity : BaseDrawerActivity() {
         btnAddIncome.setOnClickListener { addIncome() }
     }
 
+    private fun getPositionWithoutSummary(position: Int): Int {
+        return position - 1
+    }
+
     private fun editRecord(position: Int) {
         AnswersProxy.get().logButton("Edit Record")
         // -1 because SummaryView
-        val record = recordList[getRecordPosition(position - 1)]
+        val record = recordList[getRecordPosition(position)]
         startAddRecordActivity(record, AddRecordActivity.Mode.MODE_EDIT, record.type)
     }
 
@@ -160,8 +162,8 @@ class MainActivity : BaseDrawerActivity() {
     private fun getRecordPosition(position: Int): Int {
         var recordPosition = 0
 
-        for (inOfData in 0 until position) {
-            if (recordItems[inOfData] is RecordItem.Record) {
+        for (indexOfItem in 0 until position) {
+            if (recordItems[indexOfItem] is RecordItem.Record) {
                 recordPosition++
             }
         }

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

@@ -20,7 +20,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     @Inject
     lateinit var formatController: FormatController
 
-    private var itemClickListener: ((Int) -> Unit)? = null
+    var itemClickListener: ((Int) -> Unit)? = null
 
     private var whiteRed: Int
     private var whiteGreen: Int
@@ -31,7 +31,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private var context: Context
 
     private var isSummaryViewNeeded: Boolean = false
-    private lateinit var summaryViewHolder: RecyclerView.ViewHolder
+    lateinit var summaryViewHolder: RecyclerView.ViewHolder
 
     constructor(context: Context, items: List<RecordItem>, isSummaryViewNeeded: Boolean) {
         this.context = context
@@ -47,14 +47,6 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         this.isSummaryViewNeeded = isSummaryViewNeeded
     }
 
-    fun addSummaryView(summaryView: View) {
-        this.summaryViewHolder = summaryView.tag as RecyclerView.ViewHolder
-    }
-
-    fun setOnItemClickListener(itemClickListener: ((Int) -> Unit)) {
-        this.itemClickListener = itemClickListener
-    }
-
     override fun getItemCount() = items.size + if (isSummaryViewNeeded) 1 else 0
 
     override fun getItemViewType(position: Int): Int = if (position == 0 && isSummaryViewNeeded) {