Merge pull request #149 from evgenii-kanivets/dev

[2h]. All time. Cast periods.

Author: Evgenii Kanivets

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

@@ -39,6 +39,9 @@ public Period readLastUsedPeriod() {
                 case Period.TYPE_YEAR:
                     return yearPeriod();
 
+                case Period.TYPE_ALL_TIME:
+                    return allTimePeriod();
+
                 case Period.TYPE_CUSTOM:
                     return weekPeriod();
 
@@ -127,6 +130,28 @@ public Period yearPeriod() {
         return new Period(first, last, Period.TYPE_YEAR);
     }
 
+    public Period allTimePeriod() {
+        Calendar cal = Calendar.getInstance();
+
+        // 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 time
+        cal.set(Calendar.YEAR, 3000);
+        cal.set(Calendar.MONTH, Calendar.DECEMBER);
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        setDayEnd(cal);
+
+        Date last = cal.getTime();
+
+        return new Period(first, last, Period.TYPE_ALL_TIME);
+    }
+
     private void setDayStart(Calendar cal) {
         cal.set(Calendar.HOUR_OF_DAY, 0);
         cal.set(Calendar.MINUTE, 0);

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

@@ -19,6 +19,7 @@ public class Period implements Parcelable {
     public static final String TYPE_WEEK = "week";
     public static final String TYPE_MONTH = "month";
     public static final String TYPE_YEAR = "year";
+    public static final String TYPE_ALL_TIME = "all_time";
     public static final String TYPE_CUSTOM = "custom";
 
     @SuppressLint("SimpleDateFormat")

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

@@ -70,6 +70,10 @@ public void setPeriod(Period period) {
             case Period.TYPE_YEAR:
                 setSelection(3);
                 break;
+
+            case Period.TYPE_ALL_TIME:
+                setSelection(4);
+                break;
         }
     }
 
@@ -119,6 +123,10 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
                         break;
 
                     case 4:
+                        setPeriod(periodController.allTimePeriod());
+                        break;
+
+                    case 5:
                         // Custom period selection
                         showFromDateDialog();
                         break;

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

@@ -8,9 +8,11 @@
 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.Period;
 import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport;
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.base.BaseSummaryPresenter;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -63,8 +65,7 @@ public void update(IRecordReport report, String currency, List<String> ratesNeed
             viewHolder.tvTotal.setTextColor(red);
             viewHolder.tvTotal.setText(createRatesNeededList(currency, ratesNeeded));
         } else {
-            viewHolder.tvPeriod.setText(context.getString(R.string.period_from_to,
-                    report.getPeriod().getFirstDay(), report.getPeriod().getLastDay()));
+            viewHolder.tvPeriod.setText(formatPeriod(report.getPeriod()));
 
             viewHolder.tvTotalIncome.setTextColor(report.getTotalIncome() >= 0 ? green : red);
             viewHolder.tvTotalIncome.setText(formatController.formatIncome(report.getTotalIncome(),
@@ -80,6 +81,26 @@ public void update(IRecordReport report, String currency, List<String> ratesNeed
         }
     }
 
+    private String formatPeriod(Period period) {
+        switch (period.getType()) {
+            case Period.TYPE_DAY:
+                return period.getFirstDay();
+
+            case Period.TYPE_MONTH:
+                return new SimpleDateFormat("MMMM, yyyy").format(period.getFirst());
+
+            case Period.TYPE_YEAR:
+                return new SimpleDateFormat("yyyy").format(period.getFirst());
+
+            case Period.TYPE_ALL_TIME:
+                return context.getString(R.string.all_time);
+
+            default:
+                return context.getString(R.string.period_from_to, period.getFirstDay(),
+                        period.getLastDay());
+        }
+    }
+
     public static class ViewHolder {
         @BindView(R.id.tv_period)
         TextView tvPeriod;

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

@@ -21,6 +21,7 @@
     <string name="week">Неделя</string>
     <string name="month">Месяц</string>
     <string name="year">Год</string>
+    <string name="all_time">За все время</string>
 
     <string name="like_money_tracker">Вам нравится MoneyTracker?</string>
     <string name="rate_it_on_gp">Оцените его на Google Play!</string>
@@ -113,4 +114,13 @@
     <string name="same_currencies">Нельзя конвертировать валюту в саму себя.</string>
     <string name="record_in_future">Нельзя создать запись в будущем.</string>
     <string name="one_account_needed">Необходим, по крайней мере, один счет.</string>
+
+    <string name="title_activity_edit_account">Редактировать счет</string>
+    <string name="color">Цвет</string>
+    <string name="goal">Цель</string>
+    <string name="restore">Восстановить</string>
+    <string name="archive">Архивировать</string>
+    <string name="cant_archive_default_account">Нельзя архивировать счет по умолчанию.</string>
+    <string name="delete_account_title">Удалить счет</string>
+    <string name="delete_account_message">Вы уверены, что хотите удалить этот счет ? Вы не сможете восстановить его после удаления.</string>
 </resources>

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

@@ -21,6 +21,7 @@
     <string name="week">Тиждень</string>
     <string name="month">Місяць</string>
     <string name="year">Рік</string>
+    <string name="all_time">За увесь час</string>
 
     <string name="like_money_tracker">Вам подобається MoneyTracker?</string>
     <string name="rate_it_on_gp">Оцініть його на Google Play!</string>
@@ -113,4 +114,13 @@
     <string name="same_currencies">Не можна конвертувати валюту у саму себе.</string>
     <string name="record_in_future">Не можна створити запис у майбутньому.</string>
     <string name="one_account_needed">Необхідний, принаймні, один рахунок.</string>
+
+    <string name="title_activity_edit_account">Редагувати рахунок</string>
+    <string name="color">Колір</string>
+    <string name="goal">Ціль</string>
+    <string name="restore">Відновити</string>
+    <string name="archive">Архівувати</string>
+    <string name="cant_archive_default_account">Неможливо архівувати рахунок за замовчанням.</string>
+    <string name="delete_account_title">Видалити рахунок</string>
+    <string name="delete_account_message">Ви впевнені, що хочете видалити цей рахунок? Ви не зможете відновити його після видалення.</string>
 </resources>

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

@@ -18,6 +18,7 @@
     <string name="week">周</string>
     <string name="month">月</string>
     <string name="year">年</string>
+    <string name="all_time">整天</string>
     <string name="like_money_tracker">你喜欢我们这个软件吗？</string>
     <string name="rate_it_on_gp">在Google Play上评价吧！</string>
     <string name="maybe_later">稍后</string>
@@ -102,4 +103,13 @@
     <string name="same_currencies">无法在同种货币之间转换。</string>
     <string name="record_in_future">以后无法创建记录。</string>
     <string name="one_account_needed">至少需要一个账目。</string>
+
+    <string name="title_activity_edit_account">编辑帐户</string>
+    <string name="color">颜色</string>
+    <string name="goal">目标</string>
+    <string name="restore">恢复</string>
+    <string name="archive">档案</string>
+    <string name="cant_archive_default_account">您无法获得默认帐户。</string>
+    <string name="delete_account_title">删除帐户</string>
+    <string name="delete_account_message">你确定要删除这个帐户吗？ 以后不能恢复。</string>
 </resources>

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

@@ -5,6 +5,7 @@
         <item>@string/week</item>
         <item>@string/month</item>
         <item>@string/year</item>
+        <item>@string/all_time</item>
         <item>@string/custom</item>
     </string-array>
 </resources>

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

@@ -18,6 +18,7 @@
     <string name="week">Week</string>
     <string name="month">Month</string>
     <string name="year">Year</string>
+    <string name="all_time">All time</string>
     <string name="like_money_tracker">Do you like MoneyTracker?</string>
     <string name="rate_it_on_gp">Rate it on Google Play!</string>
     <string name="maybe_later">Maybe Later</string>
@@ -123,7 +124,6 @@
     <string name="record_in_future">Can\'t create a record in future.</string>
     <string name="one_account_needed">At least one account is needed.</string>
 
-    <!-- Not translated strings -->
     <string name="title_activity_edit_account">Edit Account</string>
     <string name="color">Color</string>
     <string name="goal">Goal</string>
@@ -132,4 +132,6 @@
     <string name="cant_archive_default_account">You can\'t archive a default account.</string>
     <string name="delete_account_title">Delete account</string>
     <string name="delete_account_message">Are you sure about deleting this account? It can\'t be restored after.</string>
+
+    <!-- Not translated strings -->
 </resources>