Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 89e732b

Browse files
#178. Add review fixes.
1 parent 3312f9f commit 89e732b

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@ class ReportActivity : BaseBackActivity() {
2626
@Inject
2727
lateinit var currencyController: CurrencyController
2828

29-
private lateinit var recordList: List<Record>
29+
private var recordList: List<Record> = listOf()
3030
private var period: Period? = null
3131

32-
private lateinit var shortSummaryPresenter: ShortSummaryPresenter
32+
private val shortSummaryPresenter: ShortSummaryPresenter = ShortSummaryPresenter(this)
3333

34-
override fun getContentViewId(): Int {
35-
return R.layout.activity_report
36-
}
34+
override fun getContentViewId() = R.layout.activity_report
3735

3836
override fun initData(): Boolean {
3937
super.initData()
@@ -52,7 +50,6 @@ class ReportActivity : BaseBackActivity() {
5250

5351
initSpinnerCurrency()
5452

55-
shortSummaryPresenter = ShortSummaryPresenter(this)
5653
expListView.addHeaderView(shortSummaryPresenter.create(false, null))
5754
}
5855

@@ -74,15 +71,12 @@ class ReportActivity : BaseBackActivity() {
7471
private fun initSpinnerCurrency() {
7572
val currencyList = currencyController.readAll()
7673

77-
spinnerCurrency.adapter = ArrayAdapter(this,
78-
R.layout.view_spinner_item, currencyList)
74+
spinnerCurrency.adapter = ArrayAdapter(this, R.layout.view_spinner_item, currencyList)
7975
spinnerCurrency.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
80-
override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
81-
update(spinnerCurrency.selectedItem.toString())
82-
}
76+
override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) =
77+
update(spinnerCurrency.selectedItem.toString())
8378

84-
override fun onNothingSelected(p0: AdapterView<*>?) {
85-
}
79+
override fun onNothingSelected(p0: AdapterView<*>?) {}
8680
}
8781

8882
val currency = currencyController.readDefaultCurrency()

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public ShortSummaryPresenter(Context context) {
4646
green = context.getResources().getColor(R.color.green);
4747
}
4848

49-
public View create(boolean shortSummary, RecordAdapter.SummaryViewHolder mainViewHolder) {
49+
public View create(boolean shortSummary, RecordAdapter.SummaryViewHolder viewHolder) {
5050
view = layoutInflater.inflate(R.layout.view_summary_records, null);
5151
view.findViewById(R.id.iv_more).setVisibility(shortSummary ? View.VISIBLE : View.INVISIBLE);
5252
view.setEnabled(false);
5353
view.findViewById(R.id.lvSummary).setClickable(false);
5454
view.findViewById(R.id.cvSummary).setClickable(true);
55-
view.setTag(mainViewHolder != null ? mainViewHolder : new ViewHolder(view));
55+
view.setTag(viewHolder != null ? viewHolder : new ViewHolder(view));
5656

5757
return view;
5858
}

0 commit comments

Comments
 (0)