189 fix bug connected with custom date in spinner main activity

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

@@ -43,7 +43,7 @@ public Period readLastUsedPeriod() {
                     return allTimePeriod();
 
                 case Period.TYPE_CUSTOM:
-                    return weekPeriod();
+                    return customPeriod(first, last);
 
                 default:
                     return weekPeriod();
@@ -58,6 +58,16 @@ public void writeLastUsedPeriod(Period period) {
         preferenceController.writePeriodType(period.getType());
     }
 
+    public Period customPeriod(long firstTs, long lastTs) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(firstTs);
+        Date first = cal.getTime();
+        cal.setTimeInMillis(lastTs);
+        Date last = cal.getTime();
+
+        return new Period(first, last, Period.TYPE_CUSTOM);
+    }
+
     public Period dayPeriod() {
         Calendar cal = Calendar.getInstance();
 

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

@@ -6,6 +6,7 @@
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Toast;
 
 import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
@@ -48,11 +49,14 @@ public PeriodSpinner(Context context, AttributeSet attrs, int defStyleAttr) {
         init(context);
     }
 
-    public void setPeriod(Period period) {
+    public void updatePeriod(Period period) {
         if (lastPeriod != null && lastPeriod.equals(period)) return;
         if (periodSelectedListener != null) periodSelectedListener.onPeriodSelected(period);
 
         lastPeriod = period;
+    }
+
+    public void setPeriod(Period period) {
 
         switch (period.getType()) {
             case Period.TYPE_DAY:
@@ -74,7 +78,13 @@ public void setPeriod(Period period) {
             case Period.TYPE_ALL_TIME:
                 setSelection(4);
                 break;
+
+            case Period.TYPE_CUSTOM:
+                super.setSelection(5);
+                updatePeriod(period);
+                break;
         }
+
     }
 
     public void setPeriodSelectedListener(OnPeriodSelectedListener periodSelectedListener) {
@@ -107,23 +117,23 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
 
                 switch (position) {
                     case 0:
-                        setPeriod(periodController.dayPeriod());
+                        updatePeriod(periodController.dayPeriod());
                         break;
 
                     case 1:
-                        setPeriod(periodController.weekPeriod());
+                        updatePeriod(periodController.weekPeriod());
                         break;
 
                     case 2:
-                        setPeriod(periodController.monthPeriod());
+                        updatePeriod(periodController.monthPeriod());
                         break;
 
                     case 3:
-                        setPeriod(periodController.yearPeriod());
+                        updatePeriod(periodController.yearPeriod());
                         break;
 
                     case 4:
-                        setPeriod(periodController.allTimePeriod());
+                        updatePeriod(periodController.allTimePeriod());
                         break;
 
                     case 5:
@@ -176,7 +186,11 @@ public void OnDataChanged(Date toDate) {
                         cal.set(Calendar.SECOND, 59);
                         cal.set(Calendar.MILLISECOND, 999);
 
-                        setPeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
+                        if (cal.getTime().getTime() < fromDate.getTime()) {
+                            Toast.makeText(context, R.string.start_earlier_end, Toast.LENGTH_SHORT).show();
+                        } else {
+                            updatePeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
+                        }
                     }
                 });
         dialog.show();

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

@@ -129,4 +129,7 @@
   <string name="graph">График</string>
   <string name="information">Информация</string>
   <string name="operations">Операции</string>
+
+  <string name="start_earlier_end">Дата конца не может быть раньше даты начала</string>
+
 </resources>

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

@@ -129,4 +129,6 @@
     <string name="graph">Графік</string>
     <string name="information">Інформація</string>
     <string name="operations">Операції</string>
+
+    <string name="start_earlier_end">Дата початку не може бути раніше за дату кінця</string>
 </resources>

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

@@ -118,4 +118,7 @@
     <string name="graph">圖形</string>
     <string name="information">信息</string>
     <string name="operations">操作</string>
+
+    <string name="start_earlier_end">开始日期不能早于结束日期</string>
+
 </resources>

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

@@ -145,4 +145,5 @@
     <string name="delete_backup_message">Are you sure about deleting this backup file %1$s? It can\'t be restored after.</string>
 
     <string name="title_summary_record" translatable="false">%1$s (%2$d)</string>
+    <string name="start_earlier_end">End date can\'t be earlier than start date</string>
 </resources>