From 1e54b15c3ff3cf3187db08295651bf803066b9a0 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Thu, 10 Jul 2014 23:04:19 -0700
Subject: [PATCH 1/4] Create Add Transaction Activity

- Set up basic wire from the Liquid Assets view
- Create a basic xml view
---
 AndroidManifest.xml                           |  21 ++--
 res/layout/activity_add_transaction.xml       | 105 ++++++++++++++++++
 res/menu/liquid_assets.xml                    |  11 ++
 res/values/strings.xml                        |   9 +-
 .../activities/AddTransactionActivity.java    |  32 ++++++
 .../fragments/LiquidAssetsFragment.java       |  43 ++++++-
 6 files changed, 205 insertions(+), 16 deletions(-)
 create mode 100644 res/layout/activity_add_transaction.xml
 create mode 100644 res/menu/liquid_assets.xml
 create mode 100644 src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df5d47c..0bc5a54 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -12,13 +12,13 @@
         android:targetSdkVersion="19" />
 
     <application
-        android:name=".MAFApplication"
+        android:name="org.missionassetfund.apps.android.MAFApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".activities.MAFDispatchActivity"
+            android:name="org.missionassetfund.apps.android.activities.MAFDispatchActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -53,27 +53,30 @@
                 android:value="@string/parse_login_button_text" />
         </activity>
         <activity
-            android:name=".activities.MainActivity"
+            android:name="org.missionassetfund.apps.android.activities.MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop" >
         </activity>
         <activity
-            android:name=".activities.LiquidAssetsActivity"
+            android:name="org.missionassetfund.apps.android.activities.LiquidAssetsActivity"
             android:label="@string/title_liquid_asset"
-            android:parentActivityName=".activities.MainActivity" >
+            android:parentActivityName="org.missionassetfund.apps.android.activities.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.missionassetfund.apps.activities.MainActivity" />
         </activity>
-                <activity
-            android:name=".activities.GoalDetailsActivity"
+        <activity
+            android:name="org.missionassetfund.apps.android.activities.GoalDetailsActivity"
             android:label="@string/title_goal_details"
-            android:parentActivityName=".activities.MainActivity" >
+            android:parentActivityName="org.missionassetfund.apps.android.activities.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.missionassetfund.apps.activities.MainActivity" />
         </activity>
-        
+        <activity
+            android:name="org.missionassetfund.apps.android.activities.AddTransactionActivity"
+            android:label="@string/title_activity_add_transaction" >
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/res/layout/activity_add_transaction.xml b/res/layout/activity_add_transaction.xml
new file mode 100644
index 0000000..5d2c776
--- /dev/null
+++ b/res/layout/activity_add_transaction.xml
@@ -0,0 +1,105 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:id="@+id/tvTransactionName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_transaction_name" />
+
+            <EditText
+                android:id="@+id/etTransactionName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:id="@+id/tvCategory"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_category" />
+
+            <Spinner
+                android:id="@+id/sCategory"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:id="@+id/tvAmount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_transaction_amount" />
+
+            <EditText
+                android:id="@+id/etAmount"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:inputType="numberDecimal" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:id="@+id/tvDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_transaction_date" />
+
+            <EditText
+                android:id="@+id/etDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:inputType="date" >
+
+                <requestFocus />
+            </EditText>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btnAddTransaction"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:text="@string/label_add_transaction_btn" />
+
+</RelativeLayout>
diff --git a/res/menu/liquid_assets.xml b/res/menu/liquid_assets.xml
new file mode 100644
index 0000000..48ee5c5
--- /dev/null
+++ b/res/menu/liquid_assets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_add_transaction"
+        android:icon="@drawable/ic_action_add"
+        android:orderInCategory="200"
+        android:showAsAction="always"
+        android:title="@string/title_add_transaction"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c087254..cc4e888 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,5 +35,12 @@
     <string name="label_btn_cancel">Cancel</string>
     <string name="label_btn_create_goal">Create Goal</string>
     <string name="label_btn_goal_payment">Make Payment</string>
-    
+    <string name="title_add_transaction">Add Transaction</string>
+    <string name="title_activity_add_transaction">Add Transaction</string>
+    <string name="label_add_transaction_btn">Add Transaction</string>
+    <string name="label_transaction_name">Transaction Name</string>
+    <string name="label_category">Category</string>
+    <string name="label_transaction_amount">Amount</string>
+    <string name="label_transaction_date">Date</string>
+
 </resources>
\ No newline at end of file
diff --git a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
new file mode 100644
index 0000000..2207090
--- /dev/null
+++ b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
@@ -0,0 +1,32 @@
+
+package org.missionassetfund.apps.android.activities;
+
+import org.missionassetfund.apps.android.R;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+public class AddTransactionActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_transaction);
+
+        ActionBar actionBar = getActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        // Respond to the action bar's Up/Home button
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java b/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
index 45d3050..0930d24 100644
--- a/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
@@ -1,12 +1,18 @@
+
 package org.missionassetfund.apps.android.fragments;
 
 import java.text.NumberFormat;
 
 import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.activities.AddTransactionActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -15,7 +21,7 @@
 import com.echo.holographlibrary.PieSlice;
 
 public class LiquidAssetsFragment extends Fragment {
-    
+
     private PieGraph pgLiquidAssetDonutChart;
     private TextView tvRemainingAmount;
     private TextView tvSpentAmount;
@@ -23,17 +29,42 @@ public class LiquidAssetsFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_liquid_assets, container, false);
-        
+
         pgLiquidAssetDonutChart = (PieGraph) view.findViewById(R.id.liquid_assets_donut_chart);
         tvRemainingAmount = (TextView) view.findViewById(R.id.tv_remaining_amount);
         tvSpentAmount = (TextView) view.findViewById(R.id.tv_spent_amount);
-        
+
         setupChart();
         setupSummary();
-        
+
         return view;
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.liquid_assets, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_add_transaction:
+                Intent addTransactionIntent = new Intent(getActivity(),
+                        AddTransactionActivity.class);
+                getActivity().startActivity(addTransactionIntent);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     private void setupSummary() {
         tvRemainingAmount.setText(getCurrencyValueFormatted(234.56d));
         tvSpentAmount.setText(getCurrencyValueFormatted(-123.45d));
@@ -48,10 +79,10 @@ private void setupChart() {
         slice.setColor(getResources().getColor(R.color.navy_blue));
         slice.setValue(5);
         pgLiquidAssetDonutChart.addSlice(slice);
-        
+
         pgLiquidAssetDonutChart.setInnerCircleRatio(180);
     }
-    
+
     public String getCurrencyValueFormatted(Double value) {
         NumberFormat baseFormat = NumberFormat.getCurrencyInstance();
         return baseFormat.format(value);

From 92e9ecbd33abc6a797e701aaeabf9da6e67fa654 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Fri, 11 Jul 2014 19:06:31 -0700
Subject: [PATCH 2/4] Add simple DatePickerFragment

---
 .../android/fragments/DatePickerFragment.java | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/org/missionassetfund/apps/android/fragments/DatePickerFragment.java

diff --git a/src/org/missionassetfund/apps/android/fragments/DatePickerFragment.java b/src/org/missionassetfund/apps/android/fragments/DatePickerFragment.java
new file mode 100644
index 0000000..010a702
--- /dev/null
+++ b/src/org/missionassetfund/apps/android/fragments/DatePickerFragment.java
@@ -0,0 +1,54 @@
+
+package org.missionassetfund.apps.android.fragments;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import android.app.Activity;
+import android.app.DatePickerDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.widget.DatePicker;
+
+public class DatePickerFragment extends DialogFragment
+        implements DatePickerDialog.OnDateSetListener {
+
+    private DatePickerDialogListener listener;
+
+    public interface DatePickerDialogListener {
+        void onDateSelected(Date date);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the current date as the default date in the picker
+        final Calendar c = Calendar.getInstance();
+        int year = c.get(Calendar.YEAR);
+        int month = c.get(Calendar.MONTH);
+        int day = c.get(Calendar.DAY_OF_MONTH);
+
+        // Create a new instance of DatePickerDialog and return it
+        return new DatePickerDialog(getActivity(), this, year, month, day);
+    }
+
+    // Store the listener (activity) that will have events fired once the
+    // fragment is attached
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof DatePickerDialogListener) {
+            listener = (DatePickerDialogListener) activity;
+        } else {
+            throw new ClassCastException(activity.toString()
+                    + " must implement DatePickerDialogListener");
+        }
+    }
+
+    public void onDateSet(DatePicker view, int year, int month, int day) {
+        // Do something with the date chosen by the user
+        Calendar newDate = Calendar.getInstance();
+        newDate.set(year, month, day);
+        listener.onDateSelected(newDate.getTime());
+    }
+}

From 806dddd312b207bf68834e03221e87cc2468dd82 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Fri, 11 Jul 2014 20:50:43 -0700
Subject: [PATCH 3/4] Implement Add transactions.

- Load up spinner category from parse.
- Save transaction into parse.
- send a response back to the parent fragment.
---
 res/layout/activity_add_transaction.xml       | 16 ++--
 res/values/strings.xml                        |  2 +
 .../activities/AddTransactionActivity.java    | 90 ++++++++++++++++++-
 .../activities/LiquidAssetsActivity.java      | 10 ++-
 .../fragments/LiquidAssetsFragment.java       | 14 ++-
 .../apps/android/models/Transaction.java      | 14 ++-
 6 files changed, 127 insertions(+), 19 deletions(-)

diff --git a/res/layout/activity_add_transaction.xml b/res/layout/activity_add_transaction.xml
index 5d2c776..95e5e78 100644
--- a/res/layout/activity_add_transaction.xml
+++ b/res/layout/activity_add_transaction.xml
@@ -26,8 +26,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:ems="10" />
+                android:ems="10" >
 
+                <requestFocus />
+            </EditText>
         </LinearLayout>
 
         <LinearLayout
@@ -45,7 +47,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1" />
-
         </LinearLayout>
 
         <LinearLayout
@@ -65,7 +66,6 @@
                 android:layout_weight="1"
                 android:ems="10"
                 android:inputType="numberDecimal" />
-
         </LinearLayout>
 
         <LinearLayout
@@ -84,13 +84,10 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:ems="10"
+                android:focusableInTouchMode="false"
                 android:inputType="date" >
-
-                <requestFocus />
             </EditText>
-
         </LinearLayout>
-
     </LinearLayout>
 
     <Button
@@ -100,6 +97,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="20dp"
-        android:text="@string/label_add_transaction_btn" />
+        android:text="@string/label_add_transaction_btn"
+        android:onClick="onAddTransaction" />
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cc4e888..9a7f1c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,5 +42,7 @@
     <string name="label_category">Category</string>
     <string name="label_transaction_amount">Amount</string>
     <string name="label_transaction_date">Date</string>
+    <string name="parse_error_saving">Oops! something is worng saving. Try again...</string>
+    <string name="parse_success_transaction_save">Transaction saved!</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
index 2207090..2843f95 100644
--- a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
@@ -1,14 +1,41 @@
 
 package org.missionassetfund.apps.android.activities;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.fragments.DatePickerFragment;
+import org.missionassetfund.apps.android.fragments.DatePickerFragment.DatePickerDialogListener;
+import org.missionassetfund.apps.android.models.Category;
+import org.missionassetfund.apps.android.models.Transaction;
+import org.missionassetfund.apps.android.models.User;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import com.parse.ParseException;
+import com.parse.ParseQueryAdapter;
+import com.parse.SaveCallback;
+
+public class AddTransactionActivity extends FragmentActivity implements DatePickerDialogListener {
+    // TODO(jose): find out where should we put Transaction Type
 
-public class AddTransactionActivity extends Activity {
+    private EditText etTransactionName;
+    private Spinner sCategory;
+    private EditText etAmount;
+    private EditText etDate;
+
+    private ParseQueryAdapter<Category> categoryAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -17,6 +44,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+
+        setupViews();
+        setupListeners();
     }
 
     @Override
@@ -29,4 +59,60 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private void setupViews() {
+        etTransactionName = (EditText) findViewById(R.id.etTransactionName);
+        sCategory = (Spinner) findViewById(R.id.sCategory);
+        etAmount = (EditText) findViewById(R.id.etAmount);
+        etDate = (EditText) findViewById(R.id.etDate);
+
+        // Setup Parse Adapter to fill-up the spinner
+        categoryAdapter = new ParseQueryAdapter<Category>(this, Category.class);
+        categoryAdapter.setTextKey(Category.NAME_KEY);
+        sCategory.setAdapter(categoryAdapter);
+    }
+
+    private void setupListeners() {
+        // Setup DatePickerDialog
+        etDate.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                DialogFragment newFragment = new DatePickerFragment();
+                newFragment.show(getSupportFragmentManager(), "datePicker");
+            }
+        });
+    }
+
+    @Override
+    public void onDateSelected(Date date) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        etDate.setTag(date);
+        etDate.setText(formatter.format(date));
+    }
+
+    public void onAddTransaction(View v) {
+        // TODO(jose): Data validation
+        Transaction transaction = new Transaction();
+        transaction.setUser((User) User.getCurrentUser());
+        transaction.setDescription(etTransactionName.getText().toString());
+        transaction.setCategory((Category) sCategory.getSelectedItem());
+        transaction.setAmount(Float.parseFloat(etAmount.getText().toString()));
+        transaction.setTransactionDate((Date) etDate.getTag());
+
+        transaction.saveInBackground(new SaveCallback() {
+
+            @Override
+            public void done(ParseException e) {
+                if (e != null) {
+                    Toast.makeText(getApplication(), getString(R.string.parse_error_saving),
+                            Toast.LENGTH_LONG).show();
+                    Log.d("DEBUG", e.getMessage());
+                } else {
+                    setResult(RESULT_OK);
+                    finish();
+                }
+            }
+        });
+    }
 }
diff --git a/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java b/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
index a292e47..d27b052 100644
--- a/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
@@ -1,15 +1,17 @@
+
 package org.missionassetfund.apps.android.activities;
 
 import org.missionassetfund.apps.android.R;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
 public class LiquidAssetsActivity extends FragmentActivity {
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_liquid_assets);
-	}
+    }
 }
diff --git a/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java b/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
index 0930d24..48aea7f 100644
--- a/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
@@ -9,6 +9,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -16,11 +17,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.echo.holographlibrary.PieGraph;
 import com.echo.holographlibrary.PieSlice;
 
 public class LiquidAssetsFragment extends Fragment {
+    public static final int ADD_TRANSACTION_REQUEST_CODE = 1;
 
     private PieGraph pgLiquidAssetDonutChart;
     private TextView tvRemainingAmount;
@@ -58,7 +61,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_add_transaction:
                 Intent addTransactionIntent = new Intent(getActivity(),
                         AddTransactionActivity.class);
-                getActivity().startActivity(addTransactionIntent);
+                startActivityForResult(addTransactionIntent, ADD_TRANSACTION_REQUEST_CODE);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -88,4 +91,13 @@ public String getCurrencyValueFormatted(Double value) {
         return baseFormat.format(value);
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == FragmentActivity.RESULT_OK && requestCode == ADD_TRANSACTION_REQUEST_CODE) {
+            // TODO: refresh transaction list
+            Toast.makeText(getActivity(), getString(R.string.parse_success_transaction_save),
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+
 }
diff --git a/src/org/missionassetfund/apps/android/models/Transaction.java b/src/org/missionassetfund/apps/android/models/Transaction.java
index 24edfcd..6dff8b4 100644
--- a/src/org/missionassetfund/apps/android/models/Transaction.java
+++ b/src/org/missionassetfund/apps/android/models/Transaction.java
@@ -1,16 +1,20 @@
 
 package org.missionassetfund.apps.android.models;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import com.parse.ParseClassName;
 import com.parse.ParseObject;
 
 @ParseClassName("Transaction")
-public class Transaction extends ParseObject {
+public class Transaction extends ParseObject implements Serializable {
+    public static final String TRANSACTION_KEY = "transaction";
+
     public static final String USER_KEY = "user";
     public static final String GOAL_KEY = "goal";
     public static final String CREATED_AT_KEY = "createdAt";
+    public static final String TRANSACTION_DATE = "transactionDate";
     public static final String AMOUNT_KEY = "amount";
     public static final String DESCRIPTION_KEY = "description";
     public static final String TYPE_KEY = "type";
@@ -66,8 +70,12 @@ public Date getCreatedAt() {
         return getDate(CREATED_AT_KEY);
     }
 
-    public void setCreatedAt(Date createdAt) {
-        put(CREATED_AT_KEY, createdAt);
+    public Date getTransactionDate() {
+        return getDate(TRANSACTION_DATE);
+    }
+
+    public void setTransactionDate(Date transactionDate) {
+        put(TRANSACTION_DATE, transactionDate);
     }
 
     public Float getAmount() {

From 241051511149c2c21b491fe2605514a0b4350a97 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Fri, 11 Jul 2014 21:46:34 -0700
Subject: [PATCH 4/4] Fix: remove unused code

---
 .../apps/android/activities/LiquidAssetsActivity.java           | 1 -
 src/org/missionassetfund/apps/android/models/Transaction.java   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java b/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
index d27b052..ae1a43d 100644
--- a/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
@@ -3,7 +3,6 @@
 
 import org.missionassetfund.apps.android.R;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
diff --git a/src/org/missionassetfund/apps/android/models/Transaction.java b/src/org/missionassetfund/apps/android/models/Transaction.java
index 46ed5cf..b1a0876 100644
--- a/src/org/missionassetfund/apps/android/models/Transaction.java
+++ b/src/org/missionassetfund/apps/android/models/Transaction.java
@@ -9,8 +9,6 @@
 
 @ParseClassName("Transaction")
 public class Transaction extends ParseObject implements Serializable {
-    public static final String TRANSACTION_KEY = "transaction";
-
     public static final String USER_KEY = "user";
     public static final String GOAL_KEY = "goal";
     public static final String CREATED_AT_KEY = "createdAt";