#43[1h 30m]. Remove PeriodController. Add PeriodSpinner. Refactor Period logic.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java

@@ -6,13 +6,11 @@
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatSpinner;
 import android.support.v7.widget.Toolbar;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
@@ -26,7 +24,6 @@
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
-import com.blogspot.e_kanivets.moneytracker.controller.PeriodController;
 import com.blogspot.e_kanivets.moneytracker.controller.RecordController;
 import com.blogspot.e_kanivets.moneytracker.entity.Category;
 import com.blogspot.e_kanivets.moneytracker.entity.Record;
@@ -39,11 +36,11 @@
 import com.blogspot.e_kanivets.moneytracker.report.ReportMaker;
 import com.blogspot.e_kanivets.moneytracker.report.base.IReport;
 import com.blogspot.e_kanivets.moneytracker.ui.AppRateDialog;
+import com.blogspot.e_kanivets.moneytracker.ui.PeriodSpinner;
 import com.blogspot.e_kanivets.moneytracker.ui.SummaryRecordsPresenter;
 import com.blogspot.e_kanivets.moneytracker.util.PrefUtils;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 
@@ -57,22 +54,20 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
     private static final int REQUEST_ACTION_RECORD = 1;
 
     private List<Record> recordList;
+    private Period period;
 
     private RecordController recordController;
-    private PeriodController periodController;
     private ExchangeRateController rateController;
     private AccountController accountController;
-
-    private IReport report;
+    private SummaryRecordsPresenter summaryPresenter;
 
     @Bind(R.id.drawer_layout)
     DrawerLayout drawer;
 
     @Bind(R.id.list_view)
     ListView listView;
     @Bind(R.id.spinner_period)
-    AppCompatSpinner spinner;
-    private SummaryRecordsPresenter summaryPresenter;
+    PeriodSpinner spinner;
 
     @Override
     protected int getContentViewId() {
@@ -83,8 +78,6 @@ protected int getContentViewId() {
     protected boolean initData() {
         PrefUtils.addLaunchCount();
 
-        periodController = new PeriodController();
-
         DbHelper dbHelper = new DbHelper(MainActivity.this);
         IRepo<Category> categoryRepo = new CategoryRepo(dbHelper);
         CategoryController categoryController = new CategoryController(categoryRepo);
@@ -111,49 +104,6 @@ protected void initViews() {
 
         registerForContextMenu(listView);
 
-        spinner.setAdapter(new ArrayAdapter<>(MainActivity.this, android.R.layout.simple_list_item_1,
-                getResources().getStringArray(R.array.array_periods)));
-        spinner.setSelection(PrefUtils.readUsedPeriod());
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.clear(Calendar.MINUTE);
-                calendar.clear(Calendar.SECOND);
-                calendar.clear(Calendar.MILLISECOND);
-
-                switch (position) {
-                    case 0:
-                        periodController.setPeriod(Period.dayPeriod());
-                        break;
-
-                    case 1:
-                        periodController.setPeriod(Period.weekPeriod());
-                        break;
-
-                    case 2:
-                        periodController.setPeriod(Period.monthPeriod());
-                        break;
-
-                    case 3:
-                        periodController.setPeriod(Period.yearPeriod());
-                        break;
-
-                    default:
-                        break;
-                }
-
-                PrefUtils.writeUsedPeriod(position);
-
-                update();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
         View summaryView = summaryPresenter.create();
         listView.addHeaderView(summaryView);
         summaryView.setOnClickListener(new View.OnClickListener() {
@@ -163,7 +113,15 @@ public void onClick(View v) {
             }
         });
 
-        update();
+        spinner.setPeriodSelectedListener(new PeriodSpinner.OnPeriodSelectedListener() {
+            @Override
+            public void onPeriodSelected(Period period) {
+                MainActivity.this.period = period;
+                PrefUtils.writePeriod(period);
+                update();
+            }
+        });
+        spinner.setPeriod(PrefUtils.readPeriod());
     }
 
     @Override
@@ -229,10 +187,12 @@ public boolean onContextItemSelected(MenuItem item) {
                     startAddIncomeActivity(record, AddRecordActivity.Mode.MODE_EDIT);
                 else startAddExpenseActivity(record, AddRecordActivity.Mode.MODE_EDIT);
                 return true;
+
             case R.id.delete:
                 recordController.delete(recordList.get(info.position));
                 update();
                 return true;
+
             default:
                 return super.onContextItemSelected(item);
         }
@@ -250,7 +210,7 @@ public void addIncome() {
 
     public void showReport() {
         Intent intent = new Intent(MainActivity.this, ReportActivity.class);
-        intent.putExtra(ReportActivity.KEY_PERIOD, periodController.getPeriod());
+        intent.putExtra(ReportActivity.KEY_PERIOD, period);
         intent.putExtra(ReportActivity.KEY_RECORD_LIST, (ArrayList<Record>) recordList);
         startActivity(intent);
     }
@@ -272,7 +232,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void update() {
-        recordList = recordController.getRecordsForPeriod(periodController.getPeriod());
+        recordList = recordController.getRecordsForPeriod(period);
         Collections.reverse(recordList);
 
         listView.setAdapter(new RecordAdapter(MainActivity.this, recordList));
@@ -282,7 +242,7 @@ private void update() {
             currency = accountController.readAll().get(0).getCurrency();
 
         ReportMaker reportMaker = new ReportMaker(rateController);
-        report = reportMaker.getReport(currency, periodController.getPeriod(), recordList);
+        IReport report = reportMaker.getReport(currency, period, recordList);
         summaryPresenter.update(report);
     }
 

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

@@ -1,29 +1,44 @@
 package com.blogspot.e_kanivets.moneytracker.model;
 
+import android.annotation.SuppressLint;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
 /**
- * Entity class for Period which consists from two dates.
+ * Entity class for Period which consists from two dates. Immutable.
  * Created on 10/09/14.
  *
  * @author Evgenii Kanivets
  */
 public class Period implements Parcelable {
+
+    public static final String TYPE_DAY = "day";
+    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_CUSTOM = "custom";
+
+    @SuppressLint("SimpleDateFormat")
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM, yyyy");
+
     private Date first;
     private Date last;
+    private String type;
 
-    public Period(Date first, Date last) {
-        this.first = first;
-        this.last = last;
+    public Period(Date first, Date last, String type) {
+        this.first = new Date(first.getTime());
+        this.last = new Date(last.getTime());
+        this.type = type;
     }
 
     protected Period(Parcel in) {
         first = new Date(in.readLong());
         last = new Date(in.readLong());
+        type = in.readString();
     }
 
     public static final Creator<Period> CREATOR = new Creator<Period>() {
@@ -46,26 +61,16 @@ public Date getLast() {
         return last;
     }
 
-    public void setFirst(Date first) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(first);
-
-        cal.set(Calendar.HOUR_OF_DAY, 0);
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.SECOND, 0);
-
-        this.first = cal.getTime();
+    public String getType() {
+        return type;
     }
 
-    public void setLast(Date last) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(last);
-
-        cal.set(Calendar.HOUR_OF_DAY, 23);
-        cal.set(Calendar.MINUTE, 59);
-        cal.set(Calendar.SECOND, 59);
+    public String getFirstDay() {
+        return dateFormat.format(getFirst());
+    }
 
-        this.last = cal.getTime();
+    public String getLastDay() {
+        return dateFormat.format(getLast());
     }
 
     @Override
@@ -77,6 +82,7 @@ public int describeContents() {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(first.getTime());
         dest.writeLong(last.getTime());
+        dest.writeString(type);
     }
 
     public static Period dayPeriod() {
@@ -97,7 +103,7 @@ public static Period dayPeriod() {
 
         Date last = cal.getTime();
 
-        return new Period(first, last);
+        return new Period(first, last, TYPE_DAY);
     }
 
     public static Period weekPeriod() {
@@ -122,7 +128,7 @@ public static Period weekPeriod() {
 
         Date last = cal.getTime();
 
-        return new Period(first, last);
+        return new Period(first, last, TYPE_WEEK);
     }
 
     public static Period monthPeriod() {
@@ -147,7 +153,7 @@ public static Period monthPeriod() {
 
         Date last = cal.getTime();
 
-        return new Period(first, last);
+        return new Period(first, last, TYPE_MONTH);
     }
 
     public static Period yearPeriod() {
@@ -174,7 +180,7 @@ public static Period yearPeriod() {
 
         Date last = cal.getTime();
 
-        return new Period(first, last);
+        return new Period(first, last, TYPE_YEAR);
     }
 
     @Override