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

Commit ec24d02

Browse files
author
Evgenii Kanivets
committed
#147[1h]. Add the period 'All time'.
1 parent 7b4fabf commit ec24d02

File tree

8 files changed

+35
-0
lines changed

8 files changed

+35
-0
lines changed

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public Period readLastUsedPeriod() {
3939
case Period.TYPE_YEAR:
4040
return yearPeriod();
4141

42+
case Period.TYPE_ALL_TIME:
43+
return allTimePeriod();
44+
4245
case Period.TYPE_CUSTOM:
4346
return weekPeriod();
4447

@@ -127,6 +130,28 @@ public Period yearPeriod() {
127130
return new Period(first, last, Period.TYPE_YEAR);
128131
}
129132

133+
public Period allTimePeriod() {
134+
Calendar cal = Calendar.getInstance();
135+
136+
// set start of time by Jesus
137+
cal.set(Calendar.YEAR, 2000);
138+
cal.set(Calendar.MONTH, Calendar.JANUARY);
139+
cal.set(Calendar.DAY_OF_MONTH, 1);
140+
setDayStart(cal);
141+
142+
Date first = cal.getTime();
143+
144+
// set possible end of time
145+
cal.set(Calendar.YEAR, 3000);
146+
cal.set(Calendar.MONTH, Calendar.DECEMBER);
147+
cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
148+
setDayEnd(cal);
149+
150+
Date last = cal.getTime();
151+
152+
return new Period(first, last, Period.TYPE_ALL_TIME);
153+
}
154+
130155
private void setDayStart(Calendar cal) {
131156
cal.set(Calendar.HOUR_OF_DAY, 0);
132157
cal.set(Calendar.MINUTE, 0);

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/Period.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class Period implements Parcelable {
1919
public static final String TYPE_WEEK = "week";
2020
public static final String TYPE_MONTH = "month";
2121
public static final String TYPE_YEAR = "year";
22+
public static final String TYPE_ALL_TIME = "all_time";
2223
public static final String TYPE_CUSTOM = "custom";
2324

2425
@SuppressLint("SimpleDateFormat")

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
@@ -119,6 +119,10 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
119119
break;
120120

121121
case 4:
122+
setPeriod(periodController.allTimePeriod());
123+
break;
124+
125+
case 5:
122126
// Custom period selection
123127
showFromDateDialog();
124128
break;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<string name="week">Неделя</string>
2222
<string name="month">Месяц</string>
2323
<string name="year">Год</string>
24+
<string name="all_time">За все время</string>
2425

2526
<string name="like_money_tracker">Вам нравится MoneyTracker?</string>
2627
<string name="rate_it_on_gp">Оцените его на Google Play!</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<string name="week">Тиждень</string>
2222
<string name="month">Місяць</string>
2323
<string name="year">Рік</string>
24+
<string name="all_time">За увесь час</string>
2425

2526
<string name="like_money_tracker">Вам подобається MoneyTracker?</string>
2627
<string name="rate_it_on_gp">Оцініть його на Google Play!</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<string name="week">周</string>
1919
<string name="month">月</string>
2020
<string name="year">年</string>
21+
<string name="all_time">整天</string>
2122
<string name="like_money_tracker">你喜欢我们这个软件吗?</string>
2223
<string name="rate_it_on_gp">在Google Play上评价吧!</string>
2324
<string name="maybe_later">稍后</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<item>@string/week</item>
66
<item>@string/month</item>
77
<item>@string/year</item>
8+
<item>@string/all_time</item>
89
<item>@string/custom</item>
910
</string-array>
1011
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<string name="week">Week</string>
1919
<string name="month">Month</string>
2020
<string name="year">Year</string>
21+
<string name="all_time">All time</string>
2122
<string name="like_money_tracker">Do you like MoneyTracker?</string>
2223
<string name="rate_it_on_gp">Rate it on Google Play!</string>
2324
<string name="maybe_later">Maybe Later</string>

0 commit comments

Comments
 (0)