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" />
@@ -53,27 +53,30 @@
android:value="@string/parse_login_button_text" />
+ android:parentActivityName="org.missionassetfund.apps.android.activities.MainActivity" >
-
+ android:parentActivityName="org.missionassetfund.apps.android.activities.MainActivity" >
-
+
+
\ 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..95e5e78
--- /dev/null
+++ b/res/layout/activity_add_transaction.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 @@
+
+
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 737423b..127f81e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,7 +35,16 @@
Cancel
Create Goal
Make Payment
+ Add Transaction
+ Add Transaction
+ Add Transaction
+ Transaction Name
+ Category
+ Amount
+ Date
+ Oops! something is wrong saving. Try again...
+ Transaction saved!
Done saving goal.
date parsing issue
-
+
\ 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..1ed987a
--- /dev/null
+++ b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
@@ -0,0 +1,120 @@
+
+package org.missionassetfund.apps.android.activities;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+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.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
+
+ private EditText etTransactionName;
+ private Spinner sCategory;
+ private EditText etAmount;
+ private EditText etDate;
+
+ private ParseQueryAdapter categoryAdapter;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_add_transaction);
+
+ ActionBar actionBar = getActionBar();
+ actionBar.setDisplayHomeAsUpEnabled(true);
+
+ setupViews();
+ setupListeners();
+ }
+
+ @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);
+ }
+
+ 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(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) {
+ DateFormat 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(Double.parseDouble(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..ae1a43d 100644
--- a/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/LiquidAssetsActivity.java
@@ -1,3 +1,4 @@
+
package org.missionassetfund.apps.android.activities;
import org.missionassetfund.apps.android.R;
@@ -7,9 +8,9 @@
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/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());
+ }
+}
diff --git a/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java b/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
index 45d3050..48aea7f 100644
--- a/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/LiquidAssetsFragment.java
@@ -1,21 +1,30 @@
+
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.support.v4.app.FragmentActivity;
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;
+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;
private TextView tvSpentAmount;
@@ -23,17 +32,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);
+ startActivityForResult(addTransactionIntent, ADD_TRANSACTION_REQUEST_CODE);
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
private void setupSummary() {
tvRemainingAmount.setText(getCurrencyValueFormatted(234.56d));
tvSpentAmount.setText(getCurrencyValueFormatted(-123.45d));
@@ -48,13 +82,22 @@ 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);
}
+ @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 3aef35f..b1a0876 100644
--- a/src/org/missionassetfund/apps/android/models/Transaction.java
+++ b/src/org/missionassetfund/apps/android/models/Transaction.java
@@ -1,18 +1,18 @@
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 USER_KEY = "user";
public static final String GOAL_KEY = "goal";
- // Parse stores created at for ParseObject. Why do we need to do it
- // manually?
- // public static final String CREATED_AT_KEY = "createdAt";
+ 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";
@@ -64,15 +64,17 @@ public void setGoal(Goal goal) {
put(GOAL_KEY, goal);
}
- // Parse stores created at for ParseObject. Why do we need to do it
- // manually?
- // public Date getCreatedAt() {
- // return getDate(CREATED_AT_KEY);
- // }
- //
- // public void setCreatedAt(Date createdAt) {
- // put(CREATED_AT_KEY, createdAt);
- // }
+ public Date getCreatedAt() {
+ return getDate(CREATED_AT_KEY);
+ }
+
+ public Date getTransactionDate() {
+ return getDate(TRANSACTION_DATE);
+ }
+
+ public void setTransactionDate(Date transactionDate) {
+ put(TRANSACTION_DATE, transactionDate);
+ }
public Double getAmount() {
return getDouble(AMOUNT_KEY);