#168. Add review fixes.

Author: bogdan-evtushenko

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,17 +91,17 @@ 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: 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
-
     }
 
 }

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 {