#172. Add review fixes, update build gradle.

Author: bogdan-evtushenko

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt

@@ -9,13 +9,12 @@ 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
-import com.blogspot.e_kanivets.moneytracker.entity.HeaderItem
-import com.blogspot.e_kanivets.moneytracker.entity.RecordAdapterData
 import com.blogspot.e_kanivets.moneytracker.entity.RecordItem
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account
 import com.blogspot.e_kanivets.moneytracker.entity.data.Category
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record
 import com.blogspot.e_kanivets.moneytracker.entity.data.Transfer
+import com.blogspot.e_kanivets.moneytracker.util.RecordItemsBuilder
 import kotlinx.android.synthetic.main.fragment_account_operations.*
 import javax.inject.Inject
 
@@ -40,30 +39,17 @@ class AccountOperationsFragment : BaseFragment() {
     }
 
     override fun initViews(view: View) {
-        recyclerView.adapter = RecordAdapter(requireContext(), getRecordAdapterDataList(), false, null)
+        recyclerView.adapter = RecordAdapter(requireContext(), getRecordItems(), false, null)
     }
 
-    private fun getRecordAdapterDataList(): List<RecordAdapterData> {
+    private fun getRecordItems(): List<RecordItem> {
         val accountRecords = recordController.getRecordsForAccount(account)
         val accountTransfers = transferController.getTransfersForAccount(account)
 
         accountRecords += obtainRecordsFromTransfers(accountTransfers)
         accountRecords.sortByDescending { it.time }
 
-        val recordAdapterData: MutableList<RecordAdapterData> = mutableListOf()
-
-        var lastDate = EMPTY_DATE
-
-        for (record in accountRecords) {
-            if (formatController.formatDateToString(record.time) != lastDate) {
-                lastDate = formatController.formatDateToString(record.time)
-                recordAdapterData.add(HeaderItem(lastDate))
-            }
-
-            recordAdapterData.add(RecordItem(record))
-        }
-
-        return recordAdapterData
+        return RecordItemsBuilder().getRecordItems(accountRecords)
     }
 
     private fun obtainRecordsFromTransfers(transfers: List<Transfer>): List<Record> {
@@ -92,7 +78,6 @@ class AccountOperationsFragment : BaseFragment() {
     companion object {
 
         private const val KEY_ACCOUNT = "key_account"
-        private const val EMPTY_DATE = "empty_date"
 
         fun newInstance(account: Account): AccountOperationsFragment {
             val fragment = AccountOperationsFragment()

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

@@ -14,22 +14,21 @@ 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.RecordAdapterData
-import com.blogspot.e_kanivets.moneytracker.entity.HeaderItem
 import com.blogspot.e_kanivets.moneytracker.entity.Period
 import com.blogspot.e_kanivets.moneytracker.entity.RecordItem
 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.util.AnswersProxy
+import com.blogspot.e_kanivets.moneytracker.util.RecordItemsBuilder
 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 val recordAdapterDataList: MutableList<RecordAdapterData> = mutableListOf()
+    private var recordItems: List<RecordItem> = listOf()
     private lateinit var period: Period
     private lateinit var recordAdapter: RecordAdapter
 
@@ -137,43 +136,28 @@ class MainActivity : BaseDrawerActivity() {
     override fun update() {
         recordList = recordController.getRecordsForPeriod(period)
         recordList = recordList.reversed()
-        updateRecordAdapterDataList()
+        recordItems = RecordItemsBuilder().getRecordItems(recordList)
 
         val currency = currencyController.readDefaultCurrency()
 
         val reportMaker = ReportMaker(rateController)
         val report = reportMaker.getRecordReport(currency, period, recordList)
 
-        recordAdapter.setRecords(recordAdapterDataList, report, currency, reportMaker.currencyNeeded(currency, recordList))
+        recordAdapter.setRecords(recordItems, report, currency, reportMaker.currencyNeeded(currency, recordList))
 
         fillDefaultAccount()
     }
 
     private fun getCountHeadersItems(position: Int): Int {
         var countHeadersItems = 0
         for (inOfData in 0 until position) {
-            if (recordAdapterDataList[inOfData] is HeaderItem) {
+            if (recordItems[inOfData] is RecordItem.Header) {
                 countHeadersItems++
             }
         }
         return countHeadersItems
     }
 
-    private fun updateRecordAdapterDataList() {
-        recordAdapterDataList.clear()
-
-        var lastDate = EMPTY_DATE
-        for (record in recordList) {
-            if (formatController.formatDateToString(record.time) != lastDate) {
-                lastDate = formatController.formatDateToString(record.time)
-                recordAdapterDataList.add(HeaderItem(lastDate))
-            }
-
-            recordAdapterDataList.add(RecordItem(record))
-        }
-    }
-
-
     private fun showAppRateDialog() {
         AnswersProxy.get().logEvent("Show App Rate Dialog")
         val dialog = AppRateDialog(this)
@@ -199,7 +183,6 @@ class MainActivity : BaseDrawerActivity() {
 
     companion object {
         private const val REQUEST_ACTION_RECORD = 6
-        private const val EMPTY_DATE = "empty_date"
     }
 
 }

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

@@ -11,8 +11,6 @@ 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.RecordAdapterData
-import com.blogspot.e_kanivets.moneytracker.entity.HeaderItem
 import com.blogspot.e_kanivets.moneytracker.entity.RecordItem
 import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
@@ -34,14 +32,14 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private var red: Int
     private var green: Int
 
-    private var items: List<RecordAdapterData>
+    private var items: List<RecordItem>
     private var context: Context
 
     private var summaryPresenter: ShortSummaryPresenter
     private var isSummaryViewNeeded: Boolean = false
     private var summaryViewHolder: SummaryViewHolder
 
-    constructor(context: Context, items: List<RecordAdapterData>, isSummaryViewNeeded: Boolean, itemClickListener: ((Int) -> Unit)?) {
+    constructor(context: Context, items: List<RecordItem>, isSummaryViewNeeded: Boolean, itemClickListener: ((Int) -> Unit)?) {
         this.context = context
         this.items = items
 
@@ -65,7 +63,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     override fun getItemViewType(position: Int): Int = if (position == 0 && isSummaryViewNeeded) {
         TYPE_SUMMARY
-    } else if (items[position - if (isSummaryViewNeeded) 1 else 0] is HeaderItem) {
+    } else if (items[position - if (isSummaryViewNeeded) 1 else 0] is RecordItem.Header) {
         TYPE_HEADER
     } else {
         TYPE_RECORD
@@ -78,24 +76,24 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 else -> summaryViewHolder
             }
 
-    override fun onBindViewHolder(rvViewHolder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
         if (position == 0 && isSummaryViewNeeded) {
             //adapter already bound to view
             return
         }
 
-        if (rvViewHolder is RecordViewHolder) {
-            val record = items[position - if (isSummaryViewNeeded) 1 else 0] as RecordItem
-            rvViewHolder.tvPrice.setTextColor(if (record.isIncome) green else red)
+        if (viewHolder is RecordViewHolder) {
+            val record = items[position - if (isSummaryViewNeeded) 1 else 0] as RecordItem.Record
+            viewHolder.tvPrice.setTextColor(if (record.isIncome) green else red)
 
             val price = (if (record.isIncome) record.fullPrice else getNegative(record.fullPrice))
-            rvViewHolder.tvPrice.text = formatController.formatSignedAmount(price)
-            rvViewHolder.tvTitle.text = record.title
-            rvViewHolder.tvCategory.text = record.categoryName
-            rvViewHolder.tvCurrency.text = record.currency
+            viewHolder.tvPrice.text = formatController.formatSignedAmount(price)
+            viewHolder.tvTitle.text = record.title
+            viewHolder.tvCategory.text = record.categoryName
+            viewHolder.tvCurrency.text = record.currency
         } else {
-            val headerViewHolder = rvViewHolder as HeaderViewHolder
-            val header = items[position - if (isSummaryViewNeeded) 1 else 0] as HeaderItem
+            val headerViewHolder = viewHolder as HeaderViewHolder
+            val header = items[position - if (isSummaryViewNeeded) 1 else 0] as RecordItem.Header
             headerViewHolder.tvDate.text = header.date
         }
     }
@@ -104,7 +102,7 @@ class RecordAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
         return -1 * number
     }
 
-    fun setRecords(itemsList: List<RecordAdapterData>, report: IRecordReport?, currency: String, ratesNeeded: List<String>) {
+    fun setRecords(itemsList: List<RecordItem>, report: IRecordReport?, currency: String, ratesNeeded: List<String>) {
         items = itemsList
         summaryPresenter.update(report, currency, ratesNeeded)
         notifyDataSetChanged()

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/FormatController.java

@@ -20,9 +20,9 @@ public class FormatController {
     public static final String PRECISION_NONE = "precision_none";
 
     @SuppressLint("SimpleDateFormat")
-    private static final SimpleDateFormat dateInNumberFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat shortDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     @SuppressLint("SimpleDateFormat")
-    private static final SimpleDateFormat dateInStringFormat = new SimpleDateFormat("d MMMM yyyy");
+    private static final SimpleDateFormat fullDateFormat = new SimpleDateFormat("d MMMM yyyy");
     @SuppressLint("SimpleDateFormat")
     private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
     @SuppressLint("SimpleDateFormat")
@@ -75,11 +75,11 @@ public String formatExpense(double amount, String currency) {
     }
 
     public String formatDateToNumber(long timestamp) {
-        return dateInNumberFormat.format(new Date(timestamp));
+        return shortDateFormat.format(new Date(timestamp));
     }
 
     public String formatDateToString(long timestamp) {
-        return dateInStringFormat.format(new Date(timestamp));
+        return fullDateFormat.format(new Date(timestamp));
     }
 
     public String formatTime(long timestamp) {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/PeriodController.java

@@ -133,15 +133,15 @@ public Period yearPeriod() {
     public Period allTimePeriod() {
         Calendar cal = Calendar.getInstance();
 
-        // set start of date by Jesus
+        // set start of time by Jesus
         cal.set(Calendar.YEAR, 2000);
         cal.set(Calendar.MONTH, Calendar.JANUARY);
         cal.set(Calendar.DAY_OF_MONTH, 1);
         setDayStart(cal);
 
         Date first = cal.getTime();
 
-        // set possible end of date
+        // set possible end of time
         cal.set(Calendar.YEAR, 3000);
         cal.set(Calendar.MONTH, Calendar.DECEMBER);
         cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordController.java

@@ -92,7 +92,7 @@ record = validateRecord(record);
     @NonNull @Override public List<Record> readWithCondition(String condition, String[] args) {
         List<Record> recordList = super.readWithCondition(condition, args);
 
-        // Sort record list by date field from smallest to biggest
+        // Sort record list by time field from smallest to biggest
         Collections.sort(recordList, new Comparator<Record>() {
             @Override public int compare(Record lhs, Record rhs) {
                 return lhs.getTime() < rhs.getTime() ? -1 : (lhs.getTime() == rhs.getTime() ? 0 : 1);

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java

@@ -7,7 +7,7 @@
  * @author Evgenii Kanivets
  */
 public interface Head {
-    String TIME = "date";
+    String TIME = "time";
     String TITLE = "title";
     String CATEGORY = "category";
     String PRICE = "price";

app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/AppComponent.java

@@ -26,6 +26,7 @@
 import com.blogspot.e_kanivets.moneytracker.ui.PeriodSpinner;
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.AccountsSummaryPresenter;
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter;
+import com.blogspot.e_kanivets.moneytracker.util.RecordItemsBuilder;
 
 import javax.inject.Singleton;
 
@@ -87,4 +88,6 @@ public interface AppComponent {
     void inject(EditAccountFragment editAccountFragment);
 
     void inject(AccountOperationsFragment accountRecordsFragment);
+
+    void inject(RecordItemsBuilder recordItemsBuilder);
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/Record.kt

@@ -0,0 +1,10 @@
+package com.blogspot.e_kanivets.moneytracker.entity
+
+sealed class RecordItem {
+
+    data class Header(val date: String) : RecordItem()
+
+    data class Record(val title: String, val categoryName: String, val fullPrice: Double, val currency: String, val isIncome: Boolean) : RecordItem() {
+        constructor(record: com.blogspot.e_kanivets.moneytracker.entity.data.Record) : this(record.title, record.category?.name?.toString().orEmpty(), record.fullPrice, record.currency, record.isIncome)
+    }
+}