Added date period and calculating first and last dauys of week

Evgeniy Kanivets · Evgeniy Kanivets · commit c0d8cab7756a · 2014-09-10T10:34:33.000+03:00
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/MainActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/MainActivity.java
@@ -15,6 +15,7 @@
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter;
@@ -40,6 +41,9 @@ public class MainActivity extends Activity implements Observer{
 
     private Button btnAddIncome;
     private Button btnAddExpense;
+    private Button btnReport;
+    private TextView tvFromDate;
+    private TextView tvToDate;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,11 +56,19 @@ protected void onCreate(Bundle savedInstanceState) {
         activity = this;
 
         //Link views
-        btnAddIncome = (Button) findViewById(R.id.b_add_income);
-        btnAddExpense = (Button) findViewById(R.id.b_add_expense);
+        btnAddIncome = (Button) findViewById(R.id.btn_add_income);
+        btnAddExpense = (Button) findViewById(R.id.btn_add_expense);
+        btnReport = (Button) findViewById(R.id.btn_report);
+
+        tvFromDate = (TextView) findViewById(R.id.tv_from_date);
+        tvToDate = (TextView) findViewById(R.id.tv_to_date);
 
         listView = (ListView) findViewById(R.id.listView);
 
+        //Set dates of current week
+        tvFromDate.setText(MTHelper.getInstance().getFirstDayOfWeek());
+        tvToDate.setText(MTHelper.getInstance().getLastDayOfWeek());
+
         //Set listeners
         btnAddIncome.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/helper/MTHelper.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/helper/MTHelper.java
@@ -11,7 +11,10 @@
 import com.blogspot.e_kanivets.moneytracker.util.Constants;
 import com.blogspot.e_kanivets.moneytracker.util.MTApp;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Observable;
 
@@ -53,8 +56,8 @@ public void initialize() {
                 //Read a record from DB
                 Category category = new Category(cursor.getInt(idColIndex),
                         cursor.getString(nameColIndex));
-                Log.d(Constants.TAG, "id = " + cursor.getInt(idColIndex) +
-                        " name = " + cursor.getString(nameColIndex));
+                /*Log.d(Constants.TAG, "id = " + cursor.getInt(idColIndex) +
+                        " name = " + cursor.getString(nameColIndex));*/
 
                 //Add record to list
                 categories.add(category);
@@ -84,12 +87,12 @@ public void initialize() {
                         cursor.getString(titleColIndex),
                         cursor.getInt(categoryColIndex),
                         cursor.getInt(priceColIndex));
-                Log.d(Constants.TAG, "id = " + cursor.getInt(idColIndex) +
+                /*Log.d(Constants.TAG, "id = " + cursor.getInt(idColIndex) +
                     " time = " + cursor.getLong(timeColIndex) +
                     " type = " + cursor.getInt(typeColIndex) +
                     " title = " + cursor.getString(titleColIndex) +
                     " category = " + cursor.getInt(categoryColIndex) +
-                    " price = " + cursor.getInt(priceColIndex));
+                    " price = " + cursor.getInt(priceColIndex));*/
 
                 //Add record to list
                 records.add(record);
@@ -192,12 +195,45 @@ public String getCategoryById(int id) {
 
     public int getCategoryIdByName(String name) {
         for(Category category : categories) {
-            Log.d(Constants.TAG, name + " " + category.getName() + " " + category.getName().equals(name));
+            //Log.d(Constants.TAG, name + " " + category.getName() + " " + category.getName().equals(name));
             if(category.getName().equals(name)) {
                 return category.getId();
             }
         }
 
         return -1;
     }
+
+    public String getFirstDayOfWeek() {
+        // get today and clear time of day
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0); // ! clear would not reset the hour of day !
+        cal.clear(Calendar.MINUTE);
+        cal.clear(Calendar.SECOND);
+        cal.clear(Calendar.MILLISECOND);
+
+        // set first day of week
+        cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek());
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        return dateFormat.format(cal.getTime());
+    }
+
+    public String getLastDayOfWeek() {
+        // get today and clear time of day
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0); // ! clear would not reset the hour of day !
+        cal.clear(Calendar.MINUTE);
+        cal.clear(Calendar.SECOND);
+        cal.clear(Calendar.MILLISECOND);
+
+        // set first day of week
+        cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek() + 6);
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        return dateFormat.format(cal.getTime());
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,35 @@
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="New Text"
+            android:id="@+id/tv_from_date"
+            android:layout_weight="1"
+            android:gravity="center" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="New Text"
+            android:id="@+id/tv_to_date"
+            android:layout_weight="1"
+            android:gravity="center" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/report"
+            android:id="@+id/btn_report" />
+    </LinearLayout>
+
     <ListView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -21,7 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/add_income"
-            android:id="@+id/b_add_income"
+            android:id="@+id/btn_add_income"
             android:layout_gravity="right"
             android:background="@drawable/selector_add_income"
             android:layout_weight="1"
@@ -31,7 +60,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/add_expense"
-            android:id="@+id/b_add_expense"
+            android:id="@+id/btn_add_expense"
             android:background="@drawable/selector_add_expense"
             android:layout_weight="1"
             android:padding="15dp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -16,5 +16,6 @@
     <string name="add">Add</string>
     
     <string name="wrong_number_text">Sorry, but entered data is wrong!</string>
+    <string name="report">Report</string>
 
 </resources>
