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

Commit ee589da

Browse files
author
Evgenii Kanivets
committed
#82[30m]. Cast periods to month, year, day, etc.
1 parent 960e742 commit ee589da

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/PeriodSpinner.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ public void setPeriod(Period period) {
7070
case Period.TYPE_YEAR:
7171
setSelection(3);
7272
break;
73+
74+
case Period.TYPE_ALL_TIME:
75+
setSelection(4);
76+
break;
7377
}
7478
}
7579

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

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import com.blogspot.e_kanivets.moneytracker.MtApp;
99
import com.blogspot.e_kanivets.moneytracker.R;
1010
import com.blogspot.e_kanivets.moneytracker.controller.FormatController;
11+
import com.blogspot.e_kanivets.moneytracker.entity.Period;
1112
import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport;
1213
import com.blogspot.e_kanivets.moneytracker.ui.presenter.base.BaseSummaryPresenter;
1314

15+
import java.text.SimpleDateFormat;
1416
import java.util.List;
1517

1618
import javax.inject.Inject;
@@ -63,8 +65,7 @@ public void update(IRecordReport report, String currency, List<String> ratesNeed
6365
viewHolder.tvTotal.setTextColor(red);
6466
viewHolder.tvTotal.setText(createRatesNeededList(currency, ratesNeeded));
6567
} else {
66-
viewHolder.tvPeriod.setText(context.getString(R.string.period_from_to,
67-
report.getPeriod().getFirstDay(), report.getPeriod().getLastDay()));
68+
viewHolder.tvPeriod.setText(formatPeriod(report.getPeriod()));
6869

6970
viewHolder.tvTotalIncome.setTextColor(report.getTotalIncome() >= 0 ? green : red);
7071
viewHolder.tvTotalIncome.setText(formatController.formatIncome(report.getTotalIncome(),
@@ -80,6 +81,26 @@ public void update(IRecordReport report, String currency, List<String> ratesNeed
8081
}
8182
}
8283

84+
private String formatPeriod(Period period) {
85+
switch (period.getType()) {
86+
case Period.TYPE_DAY:
87+
return period.getFirstDay();
88+
89+
case Period.TYPE_MONTH:
90+
return new SimpleDateFormat("MMMM, yyyy").format(period.getFirst());
91+
92+
case Period.TYPE_YEAR:
93+
return new SimpleDateFormat("yyyy").format(period.getFirst());
94+
95+
case Period.TYPE_ALL_TIME:
96+
return context.getString(R.string.all_time);
97+
98+
default:
99+
return context.getString(R.string.period_from_to, period.getFirstDay(),
100+
period.getLastDay());
101+
}
102+
}
103+
83104
public static class ViewHolder {
84105
@BindView(R.id.tv_period)
85106
TextView tvPeriod;

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<string name="record_in_future">Can\'t create a record in future.</string>
125125
<string name="one_account_needed">At least one account is needed.</string>
126126

127-
<!-- Not translated strings -->
128127
<string name="title_activity_edit_account">Edit Account</string>
129128
<string name="color">Color</string>
130129
<string name="goal">Goal</string>
@@ -133,4 +132,6 @@
133132
<string name="cant_archive_default_account">You can\'t archive a default account.</string>
134133
<string name="delete_account_title">Delete account</string>
135134
<string name="delete_account_message">Are you sure about deleting this account? It can\'t be restored after.</string>
135+
136+
<!-- Not translated strings -->
136137
</resources>

0 commit comments

Comments
 (0)