#189. Save custom period between launches. Refactoring in PeriodSpinner.

Author: bogdan-evtushenko

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

@@ -48,11 +48,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 +77,12 @@ public void setPeriod(Period period) {
             case Period.TYPE_ALL_TIME:
                 setSelection(4);
                 break;
+
+            case Period.TYPE_CUSTOM:
+                super.setSelection(5);
+                break;
         }
+
     }
 
     public void setPeriodSelectedListener(OnPeriodSelectedListener periodSelectedListener) {
@@ -107,23 +115,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 +184,7 @@ public void OnDataChanged(Date toDate) {
                         cal.set(Calendar.SECOND, 59);
                         cal.set(Calendar.MILLISECOND, 999);
 
-                        setPeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
+                        updatePeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
                     }
                 });
         dialog.show();