From efd7301318a9e8166df221f593a75729946fed9e Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Sat, 19 Jul 2014 22:32:46 -0700
Subject: [PATCH 1/4] Hack few things to make Add Transaction code
 re-usable(ish)

---
 res/layout/fragment_amount_input.xml          |  1 +
 .../activities/AddTransactionActivity.java    | 10 +++++-----
 .../fragments/AmountInputFragment.java        |  9 +++++++++
 .../android/fragments/NameInputFragment.java  |  6 ++++++
 .../apps/android/models/Input.java            | 20 +++++++++++++++++--
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/res/layout/fragment_amount_input.xml b/res/layout/fragment_amount_input.xml
index ad4d790..743ffa6 100644
--- a/res/layout/fragment_amount_input.xml
+++ b/res/layout/fragment_amount_input.xml
@@ -31,6 +31,7 @@
     </LinearLayout>
 
     <RadioGroup
+        android:id="@+id/rgType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
diff --git a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
index 9d4b0a3..bb467ec 100644
--- a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
@@ -60,11 +60,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // setup input steps
         inputElements = new Input[] {
-                new Input("Amount", 0, AmountInputFragment.class),
-                new Input("Name", 1, NameInputFragment.class),
-                new Input("Category", 2, CategoryInputFragment.class),
-                new Input("Date", 3, DateInputFragment.class),
-                new Input("Done", 4, DoneFragment.class)
+                new Input("Amount", "0", 0, AmountInputFragment.class),
+                new Input("Name", "Lunch", 1, NameInputFragment.class),
+                new Input("Category", "Food", 2, CategoryInputFragment.class),
+                new Input("Date", "Today", 3, DateInputFragment.class),
+                new Input("Done", "", 4, DoneFragment.class)
         };
 
         lvSteps.setAdapter(aInput);
diff --git a/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java b/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java
index 491f09e..c07c804 100644
--- a/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java
@@ -2,6 +2,7 @@
 package org.missionassetfund.apps.android.fragments;
 
 import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.activities.NewGoalActivity;
 import org.missionassetfund.apps.android.interfaces.OnInputFormListener;
 import org.missionassetfund.apps.android.utils.CurrencyUtils;
 
@@ -15,6 +16,7 @@
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Toast;
 
 public class AmountInputFragment extends Fragment {
@@ -24,6 +26,7 @@ public class AmountInputFragment extends Fragment {
     private EditText etAmount;
     private RadioButton rbExpense;
     private ImageButton btnNext;
+    private RadioGroup rgType;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -33,6 +36,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         etAmount = (EditText) view.findViewById(R.id.etAmount);
         rbExpense = (RadioButton) view.findViewById(R.id.rbExpense);
         btnNext = (ImageButton) view.findViewById(R.id.btnNext);
+        rgType = (RadioGroup) view.findViewById(R.id.rgType);
+
+        // Ugly hack to try reuse this view in both goal / transaction
+        if (getActivity().getClass() == NewGoalActivity.class) {
+            rgType.setVisibility(View.INVISIBLE);
+        }
 
         // Setup listener
         btnNext.setOnClickListener(new OnClickListener() {
diff --git a/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java b/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java
index f19d806..16a9c48 100644
--- a/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java
@@ -2,6 +2,7 @@
 package org.missionassetfund.apps.android.fragments;
 
 import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.activities.NewGoalActivity;
 import org.missionassetfund.apps.android.interfaces.OnInputFormListener;
 
 import android.app.Activity;
@@ -32,6 +33,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         btnBack = (ImageButton) view.findViewById(R.id.btnBack);
         btnNext = (ImageButton) view.findViewById(R.id.btnNext);
 
+        // Ugly hack to try reuse this view in both goal / transaction
+        if (getActivity().getClass() == NewGoalActivity.class) {
+            etName.setHint(R.string.sample_new_goal_name);
+        }
+
         // Setup listener
         btnNext.setOnClickListener(new OnClickListener() {
 
diff --git a/src/org/missionassetfund/apps/android/models/Input.java b/src/org/missionassetfund/apps/android/models/Input.java
index 31cea5f..894027c 100644
--- a/src/org/missionassetfund/apps/android/models/Input.java
+++ b/src/org/missionassetfund/apps/android/models/Input.java
@@ -1,15 +1,23 @@
 
 package org.missionassetfund.apps.android.models;
 
-public class Input {
+import java.io.Serializable;
+
+public class Input implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public static final String INPUT_KEY = "input";
+    
     private String name;
     private String value;
+    private String hint;
     private int pos;
     private Class fragmentClass;
 
-    public Input(String name, int pos, Class fragmentClass) {
+    public Input(String name, String hint, int pos, Class fragmentClass) {
         super();
         this.name = name;
+        this.hint = hint;
         this.pos = pos;
         this.fragmentClass = fragmentClass;
     }
@@ -30,6 +38,14 @@ public void setValue(String value) {
         this.value = value;
     }
 
+    public String getHint() {
+        return hint;
+    }
+
+    public void setHint(String hint) {
+        this.hint = hint;
+    }
+
     public int getPos() {
         return pos;
     }

From b371338d030360d7392507bc602fde6b4794cd79 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Sun, 20 Jul 2014 00:00:16 -0700
Subject: [PATCH 2/4] Refactor New Goal UI

- Create FrequencyFragment to read frequency for payments
- Set up a FrequencyAdapter to properly customize spinner
- New Goal UI Polished based on specs.
---
 res/layout/activity_new_goal.xml              | 123 +--------
 res/layout/fragment_frequency_input.xml       |  36 +++
 res/layout/item_frequency.xml                 |  13 +
 res/layout/item_frequency_dropdown.xml        |  15 ++
 res/values/colors.xml                         |   4 +
 res/values/strings.xml                        |   2 +-
 res/values/styles.xml                         |  17 +-
 .../android/activities/NewGoalActivity.java   | 246 +++++++++++++-----
 .../android/adapters/FrequencyAdapter.java    |  50 ++++
 .../fragments/FrequencyInputFragment.java     |  87 +++++++
 .../apps/android/models/Input.java            |  10 +-
 11 files changed, 420 insertions(+), 183 deletions(-)
 create mode 100644 res/layout/fragment_frequency_input.xml
 create mode 100644 res/layout/item_frequency.xml
 create mode 100644 res/layout/item_frequency_dropdown.xml
 create mode 100644 src/org/missionassetfund/apps/android/adapters/FrequencyAdapter.java
 create mode 100644 src/org/missionassetfund/apps/android/fragments/FrequencyInputFragment.java

diff --git a/res/layout/activity_new_goal.xml b/res/layout/activity_new_goal.xml
index 9cc079d..42ec06d 100644
--- a/res/layout/activity_new_goal.xml
+++ b/res/layout/activity_new_goal.xml
@@ -1,123 +1,20 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/app_green"
     android:orientation="vertical" >
 
-    <RelativeLayout
-        android:id="@+id/rlNewGoalName"
+    <ListView
+        android:id="@+id/lvSteps"
+        style="@style/AddTransactionUI.InputListView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
+    </ListView>
 
-        <TextView
-            android:id="@+id/tvNewGoalLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:text="@string/label_new_goal_name"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <EditText
-            android:id="@+id/etNewGoalName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/tvNewGoalLabel"
-            android:layout_alignParentRight="true"
-            android:hint="@string/sample_new_goal_name"
-            android:inputType="text" >
-
-            <requestFocus />
-        </EditText>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/rlNewGoalAmount"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <TextView
-            android:id="@+id/tvAmountLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_amount"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <EditText
-            android:id="@+id/etGoalAmount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/tvAmountLabel"
-            android:layout_alignParentRight="true"
-            android:hint="@string/sample_total_payment"
-            android:inputType="numberDecimal" >
-        </EditText>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/rlNewGoalFrequency"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <TextView
-            android:id="@+id/tvNewGoalFrequencyLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_goal_frequency"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <Spinner
-            android:id="@+id/spinnerGoalFrequency"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/tvNewGoalFrequencyLabel"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/tvNewGoalFrequencyLabel"
-            android:layout_marginLeft="120dp"
-            android:layout_toRightOf="@+id/tvNewGoalFrequencyLabel"
-            android:gravity="right"
-            android:paddingRight="5dp" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/rlNewGoalDueDate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <TextView
-            android:id="@+id/tvDueLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_goal_due_date"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <EditText
-            android:id="@+id/etGoalDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/tvDueLabel"
-            android:layout_alignParentRight="true"
-            android:hint="@string/sample_goal_due_date"
-            android:inputType="date" >
-        </EditText>
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:weightSum="1" >
-
-        <Button
-            android:id="@+id/btnCancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/label_btn_cancel" />
-
-        <Button
-            android:id="@+id/btnCreateGoal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/label_btn_create_goal" />
-    </LinearLayout>
+    <FrameLayout
+        android:id="@+id/flStepsContainer"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent" >
+    </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_frequency_input.xml b/res/layout/fragment_frequency_input.xml
new file mode 100644
index 0000000..d859886
--- /dev/null
+++ b/res/layout/fragment_frequency_input.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <Spinner
+        android:id="@+id/spFrequency"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:spinnerMode="dropdown"
+        android:textAlignment="center" />
+
+    <ImageButton
+        android:id="@+id/btnBack"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginBottom="40dp"
+        android:layout_marginLeft="40dp"
+        android:background="@drawable/circle_back_button" />
+
+    <ImageButton
+        android:id="@+id/btnNext"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="40dp"
+        android:layout_marginRight="40dp"
+        android:background="@drawable/circle_next_button" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_frequency.xml b/res/layout/item_frequency.xml
new file mode 100644
index 0000000..db2a0ec
--- /dev/null
+++ b/res/layout/item_frequency.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    
+    <TextView
+        android:id="@+id/tvFrequency"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/FrequencyUI.TextView"/>
+
+</LinearLayout>
diff --git a/res/layout/item_frequency_dropdown.xml b/res/layout/item_frequency_dropdown.xml
new file mode 100644
index 0000000..07a5a5c
--- /dev/null
+++ b/res/layout/item_frequency_dropdown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:padding="5dp" >
+
+    <TextView
+        android:id="@+id/tvFrequency"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/FrequencyUI.TextView.Dropdown"/>
+
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7c9b03f..f67563a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,6 +19,10 @@
     <color name="add_transaction_name_hint_value">#80FFFFFF</color>
     <color name="add_transaction_category_display_value">@color/white</color>
     <color name="add_transaction_category_dropdown_value">@color/darkgray</color>
+    
+    <!-- FrequencyFragment -->
+    <color name="frequency_fragment_item_display_text">@color/white</color>
+    <color name="frequency_fragment_item_dropdown_text">@color/darkgray</color>
 
     <!-- Parse -->
     <color name="com_parse_ui_parse_login_button">#40000000</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8a3798b..e2951ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,7 +78,7 @@
     <string name="sample_goal_frequency">Monthly</string>
     <string name="sample_due_date">JUL 25</string>
     <string name="sample_due_date_human">DUE IN 2 DAYS</string>
-    <string name="sample_new_goal_name">Vegas Trip</string>
+    <string name="sample_new_goal_name">Vacation</string>
 
     <!-- Parse -->
     <string name="com_parse_ui_logo_content_description">Logo</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e528dac..3eac325 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -67,7 +67,7 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <!-- InputItem -->
+    <!-- Add Transaction UI -->
     <style name="AddTransactionUI" />
 
     <style name="AddTransactionUI.InputItem.NameTextView" parent="@android:style/TextAppearance">
@@ -127,6 +127,21 @@
         <item name="android:textColor">@color/add_transaction_category_dropdown_value</item>
         <item name="android:singleLine">true</item>
     </style>
+    
+    <!-- Custom Input Fragments -->
+    <style name="FrequencyUI" />
+    
+    <style name="FrequencyUI.TextView">
+        <item name="android:textSize">40sp</item>
+        <item name="android:textColor">@color/frequency_fragment_item_display_text</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    
+    <style name="FrequencyUI.TextView.Dropdown">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/frequency_fragment_item_dropdown_text</item>
+        <item name="android:singleLine">true</item>
+    </style>
 
     <!-- Parse -->
     <style name="ParseLoginUI" />
diff --git a/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java b/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
index 25c2d37..80e4212 100644
--- a/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
@@ -1,106 +1,226 @@
 
 package org.missionassetfund.apps.android.activities;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.Locale;
 
 import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.adapters.InputItemAdapter;
+import org.missionassetfund.apps.android.fragments.AmountInputFragment;
+import org.missionassetfund.apps.android.fragments.DateInputFragment;
+import org.missionassetfund.apps.android.fragments.DoneFragment;
+import org.missionassetfund.apps.android.fragments.FrequencyInputFragment;
+import org.missionassetfund.apps.android.fragments.NameInputFragment;
+import org.missionassetfund.apps.android.interfaces.OnInputFormListener;
 import org.missionassetfund.apps.android.models.Goal;
 import org.missionassetfund.apps.android.models.GoalPaymentInterval;
+import org.missionassetfund.apps.android.models.Input;
 import org.missionassetfund.apps.android.models.User;
 import org.missionassetfund.apps.android.utils.MAFDateUtils;
 
-import android.app.Activity;
+import android.app.ActionBar;
+import android.content.Context;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Spinner;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
 import android.widget.Toast;
 
 import com.parse.ParseException;
 import com.parse.SaveCallback;
 
-public class NewGoalActivity extends Activity {
+public class NewGoalActivity extends FragmentActivity implements OnInputFormListener {
 
-    private EditText etGoalName;
-    private EditText etGoalAmount;
-    private Spinner spinnerGoalFrequency;
-    private EditText etGoalDate;
-    private Button btnCreateGoal;
+    private ListView lvSteps;
+    private ArrayList<Input> inputs;
+    private InputItemAdapter aInput;
 
-    private ArrayAdapter<GoalPaymentInterval> frequencyAdapter;
+    private Input[] inputElements;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_new_goal);
 
-        frequencyAdapter = new ArrayAdapter<GoalPaymentInterval>(this,
-                android.R.layout.simple_spinner_item, GoalPaymentInterval.values());
-        frequencyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        ActionBar actionBar = getActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
 
-        setupViews();
-    }
+        lvSteps = (ListView) findViewById(R.id.lvSteps);
 
-    private void setupViews() {
-        etGoalName = (EditText) findViewById(R.id.etNewGoalName);
-        btnCreateGoal = (Button) findViewById(R.id.btnCreateGoal);
-        etGoalAmount = (EditText) findViewById(R.id.etGoalAmount);
-        spinnerGoalFrequency = (Spinner) findViewById(R.id.spinnerGoalFrequency);
-        etGoalDate = (EditText) findViewById(R.id.etGoalDate);
+        inputs = new ArrayList<Input>();
+        aInput = new InputItemAdapter(this, inputs);
 
-        spinnerGoalFrequency.setAdapter(frequencyAdapter);
+        // setup input steps
+        inputElements = new Input[] {
+                new Input("Amount", "0", 0, AmountInputFragment.class),
+                new Input("Name", "Travel Fund", 1, NameInputFragment.class),
+                new Input("Frequency", "Monthly", 2, FrequencyInputFragment.class),
+                new Input("Date", "Today", 3, DateInputFragment.class),
+                new Input("Done", "", 4, DoneFragment.class)
+        };
 
-        btnCreateGoal.setOnClickListener(newGoalClickListener);
-    }
+        lvSteps.setAdapter(aInput);
 
-    private OnClickListener newGoalClickListener = new OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-            Goal goal = new Goal();
-            goal.setUser((User) User.getCurrentUser());
-            goal.setName(etGoalName.getText().toString());
-            Double amount = Double.parseDouble(etGoalAmount.getText().toString());
-            goal.setAmount(amount);
-            GoalPaymentInterval paymentInterval = (GoalPaymentInterval) spinnerGoalFrequency
-                    .getSelectedItem();
-            goal.setPaymenyInterval(paymentInterval);
-
-            // This will be replaced by date picker. Bear it for now.
-            DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy", Locale.US);
-            // Default is 2 months after current date
-            Date goalDate = MAFDateUtils.addDaysToDate(new Date(), 60);
-            try {
-                goalDate = dateFormat.parse(etGoalDate.getText().toString());
-            } catch (java.text.ParseException e) {
-                Log.e("error", getString(R.string.error_parse_date), e);
+        // setup listeners
+        lvSteps.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Input input = inputs.get(position);
+                int size = inputs.size();
+                for (int i = (size - 1); i >= position; i--) {
+                    inputs.remove(i);
+                }
+                aInput.notifyDataSetChanged();
+                showFragment(input.getFragmentClass());
             }
-            goal.setGoalDate(goalDate);
+        });
 
-            int numDaysToTargetDate = MAFDateUtils.getDaysTo(goalDate);
-            Integer numPayments = numDaysToTargetDate / paymentInterval.toInt();
-            goal.setNumPayments(numPayments);
+        showFragment(AmountInputFragment.class);
+    }
 
-            goal.setPaymentAmount(amount / numPayments);
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void OnNextSelected(Class activeFragmentClass, String value) {
+        @SuppressWarnings("unchecked")
+        Input input = inputElements[getInputPosition(activeFragmentClass)];
+        input.setValue(value);
+        inputs.add(input);
+        aInput.notifyDataSetChanged();
+        hideSoftKeyboard();
+        showFragment(getNextFragmentClass(input));
+    }
 
-            goal.saveInBackground(new SaveCallback() {
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void OnBackSelected(Class activeFragmentClass) {
+        @SuppressWarnings("unchecked")
+        Input input = inputElements[getInputPosition(activeFragmentClass)];
+        inputs.remove(input.getPos() - 1);
+        aInput.notifyDataSetChanged();
+        showFragment(getPreviousFragmentClass(input));
+    }
 
-                @Override
-                public void done(ParseException arg0) {
-                    Toast.makeText(getApplicationContext(),
-                            getString(R.string.toast_done_saving_goal), Toast.LENGTH_SHORT).show();
+    @Override
+    public void OnFinishSelected() {
+        FragmentManager mgr = getSupportFragmentManager();
+
+        // Get Amount data from fragment
+        AmountInputFragment amountFragment = (AmountInputFragment) mgr
+                .findFragmentByTag(AmountInputFragment.class.getName());
+        Double goalAmount = Double.parseDouble(amountFragment.getAmountSelected());
+
+        // Get Name data from fragment
+        NameInputFragment nameFragment = (NameInputFragment) mgr
+                .findFragmentByTag(NameInputFragment.class.getName());
+        String goalName = nameFragment.getNameSelected();
+
+        // Get Frequency selected from fragment
+        FrequencyInputFragment frequencyFragment = (FrequencyInputFragment) mgr
+                .findFragmentByTag(FrequencyInputFragment.class.getName());
+        GoalPaymentInterval paymentInterval = (GoalPaymentInterval) frequencyFragment
+                .getFrequencySelected();
+
+        // Get Date from fragment
+        DateInputFragment dateFragment = (DateInputFragment) mgr
+                .findFragmentByTag(DateInputFragment.class.getName());
+        Date goalDate = dateFragment.getDateSelected();
+
+        // Get Number of Payments
+        int numDaysToTargetDate = MAFDateUtils.getDaysTo(goalDate);
+        Integer numPayments = numDaysToTargetDate / paymentInterval.toInt();
+
+        // TODO(jose): Data validation
+        Goal goal = new Goal();
+        goal.setUser((User) User.getCurrentUser());
+        goal.setAmount(goalAmount);
+        goal.setName(goalName);
+        goal.setPaymenyInterval(paymentInterval);
+        goal.setNumPayments(numPayments);
+        goal.setPaymentAmount(goalAmount / numPayments);
+        goal.setGoalDate(goalDate);
+
+        goal.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();
                 }
+            }
+        });
+    }
 
-            });
+    @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);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private void showFragment(Class activeFragmentClass) {
+        FragmentManager mgr = getSupportFragmentManager();
+        FragmentTransaction transaction = mgr.beginTransaction();
+        try {
+            for (Input input : inputElements) {
+                Class klass = input.getFragmentClass();
+                Fragment fragment = mgr.findFragmentByTag(klass.getName());
+                if (klass == activeFragmentClass) {
+                    if (fragment != null) {
+                        transaction.show(fragment);
+                    } else {
+                        transaction.add(R.id.flStepsContainer, (Fragment) klass.newInstance(),
+                                klass.getName());
+                    }
+                } else {
+                    if (fragment != null) {
+                        transaction.hide(fragment);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        transaction.commit();
+    }
+
+    public void hideSoftKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
+    }
+
+    private int getInputPosition(Class<? extends Fragment> fragmentClass) {
+        for (Input i : inputElements) {
+            if (i.getFragmentClass() == fragmentClass) {
+                return i.getPos();
+            }
+        }
+        return 0;
+    }
+
+    private Class<?> getNextFragmentClass(Input input) {
+        return inputElements[input.getPos() + 1].getFragmentClass();
+    }
+
+    private Class<?> getPreviousFragmentClass(Input input) {
+        return inputElements[input.getPos() - 1].getFragmentClass();
+    }
 }
diff --git a/src/org/missionassetfund/apps/android/adapters/FrequencyAdapter.java b/src/org/missionassetfund/apps/android/adapters/FrequencyAdapter.java
new file mode 100644
index 0000000..6db5572
--- /dev/null
+++ b/src/org/missionassetfund/apps/android/adapters/FrequencyAdapter.java
@@ -0,0 +1,50 @@
+
+package org.missionassetfund.apps.android.adapters;
+
+import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.models.GoalPaymentInterval;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+public class FrequencyAdapter extends ArrayAdapter<GoalPaymentInterval> implements SpinnerAdapter {
+
+    public FrequencyAdapter(Context context, GoalPaymentInterval[] paymentIntervals) {
+        super(context, R.layout.item_frequency, paymentIntervals);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        GoalPaymentInterval paymentInterval = getItem(position);
+
+        if (convertView == null) {
+            convertView = LayoutInflater.from(getContext()).inflate(R.layout.item_frequency,
+                    parent, false);
+        }
+        TextView tvFrequency = (TextView) convertView.findViewById(R.id.tvFrequency);
+
+        tvFrequency.setText(paymentInterval.toString());
+
+        return convertView;
+    }
+
+    @Override
+    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+        GoalPaymentInterval paymentInterval = getItem(position);
+
+        if (convertView == null) {
+            LayoutInflater inflator = LayoutInflater.from(getContext());
+            convertView = inflator.inflate(R.layout.item_frequency_dropdown, parent, false);
+        }
+
+        TextView tvFrequency = (TextView) convertView.findViewById(R.id.tvFrequency);
+        tvFrequency.setText(paymentInterval.toString());
+
+        return convertView;
+    }
+}
diff --git a/src/org/missionassetfund/apps/android/fragments/FrequencyInputFragment.java b/src/org/missionassetfund/apps/android/fragments/FrequencyInputFragment.java
new file mode 100644
index 0000000..bd7f5c6
--- /dev/null
+++ b/src/org/missionassetfund/apps/android/fragments/FrequencyInputFragment.java
@@ -0,0 +1,87 @@
+
+package org.missionassetfund.apps.android.fragments;
+
+import org.missionassetfund.apps.android.R;
+import org.missionassetfund.apps.android.adapters.FrequencyAdapter;
+import org.missionassetfund.apps.android.interfaces.OnInputFormListener;
+import org.missionassetfund.apps.android.models.GoalPaymentInterval;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+public class FrequencyInputFragment extends Fragment {
+    private OnInputFormListener onInputFormListener;
+
+    private Spinner spFrequency;
+    private ImageButton btnBack;
+    private ImageButton btnNext;
+
+    private FrequencyAdapter frequencyAdapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_frequency_input, container, false);
+
+        // Setup view
+        spFrequency = (Spinner) view.findViewById(R.id.spFrequency);
+        btnBack = (ImageButton) view.findViewById(R.id.btnBack);
+        btnNext = (ImageButton) view.findViewById(R.id.btnNext);
+
+        // Populate spinner
+        frequencyAdapter = new FrequencyAdapter(getActivity(), GoalPaymentInterval.values());
+
+        spFrequency.setAdapter(frequencyAdapter);
+
+        // Setup listener
+        btnNext.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                // TODO(jose): Have next button disable until spFrequency has
+                // value
+                if (spFrequency.getSelectedItem() != null) {
+                    GoalPaymentInterval frequency = (GoalPaymentInterval) spFrequency
+                            .getSelectedItem();
+                    onInputFormListener.OnNextSelected(FrequencyInputFragment.class,
+                            frequency.toString());
+                } else {
+                    Toast.makeText(getActivity(), getString(R.string.error_category_require),
+                            Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+        btnBack.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                onInputFormListener.OnBackSelected(FrequencyInputFragment.class);
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof OnInputFormListener) {
+            onInputFormListener = (OnInputFormListener) activity;
+        } else {
+            throw new ClassCastException(activity.toString()
+                    + " must implement OnInputFormListener");
+        }
+    }
+
+    public GoalPaymentInterval getFrequencySelected() {
+        return (GoalPaymentInterval) spFrequency.getSelectedItem();
+    }
+}
diff --git a/src/org/missionassetfund/apps/android/models/Input.java b/src/org/missionassetfund/apps/android/models/Input.java
index 894027c..83a03dc 100644
--- a/src/org/missionassetfund/apps/android/models/Input.java
+++ b/src/org/missionassetfund/apps/android/models/Input.java
@@ -7,14 +7,14 @@ public class Input implements Serializable {
     private static final long serialVersionUID = 1L;
 
     public static final String INPUT_KEY = "input";
-    
+
     private String name;
     private String value;
     private String hint;
     private int pos;
-    private Class fragmentClass;
+    private Class<?> fragmentClass;
 
-    public Input(String name, String hint, int pos, Class fragmentClass) {
+    public Input(String name, String hint, int pos, Class<?> fragmentClass) {
         super();
         this.name = name;
         this.hint = hint;
@@ -54,11 +54,11 @@ public void setPos(int pos) {
         this.pos = pos;
     }
 
-    public Class getFragmentClass() {
+    public Class<?> getFragmentClass() {
         return fragmentClass;
     }
 
-    public void setFragmentClass(Class fragmentClass) {
+    public void setFragmentClass(Class<?> fragmentClass) {
         this.fragmentClass = fragmentClass;
     }
 }

From 6ede094aa78497313026ddb3f66317d2474de8a6 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Sun, 20 Jul 2014 00:10:30 -0700
Subject: [PATCH 3/4] Dynamic Action Bar base on the steps

---
 .../android/activities/AddTransactionActivity.java | 12 ++++++++++++
 .../apps/android/activities/NewGoalActivity.java   | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
index bb467ec..540d4b8 100644
--- a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
@@ -109,6 +109,9 @@ private void showFragment(Class activeFragmentClass) {
                 Class klass = input.getFragmentClass();
                 Fragment fragment = mgr.findFragmentByTag(klass.getName());
                 if (klass == activeFragmentClass) {
+                    // Change ActionBar title
+                    setActionBarTitle(input);
+                    
                     if (fragment != null) {
                         transaction.show(fragment);
                     } else {
@@ -198,6 +201,15 @@ public void done(ParseException e) {
             }
         });
     }
+    
+    /**
+     * Set Action Bar title base on the step
+     * 
+     * @param input
+     */
+    private void setActionBarTitle(Input input) {
+        setTitle(input.getName());
+    }
 
     public void hideSoftKeyboard() {
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
diff --git a/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java b/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
index 80e4212..e1e99ba 100644
--- a/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
@@ -64,7 +64,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 new Input("Name", "Travel Fund", 1, NameInputFragment.class),
                 new Input("Frequency", "Monthly", 2, FrequencyInputFragment.class),
                 new Input("Date", "Today", 3, DateInputFragment.class),
-                new Input("Done", "", 4, DoneFragment.class)
+                new Input("Add New Goal", "", 4, DoneFragment.class)
         };
 
         lvSteps.setAdapter(aInput);
@@ -184,6 +184,9 @@ private void showFragment(Class activeFragmentClass) {
                 Class klass = input.getFragmentClass();
                 Fragment fragment = mgr.findFragmentByTag(klass.getName());
                 if (klass == activeFragmentClass) {
+
+                    setActionBarTitle(input);
+
                     if (fragment != null) {
                         transaction.show(fragment);
                     } else {
@@ -202,6 +205,15 @@ private void showFragment(Class activeFragmentClass) {
         transaction.commit();
     }
 
+    /**
+     * Set Action Bar title base on the step
+     * 
+     * @param input
+     */
+    private void setActionBarTitle(Input input) {
+        setTitle(input.getName());
+    }
+
     public void hideSoftKeyboard() {
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);

From 360ab013f6dc4c6918285c4c706c7d8f07291af6 Mon Sep 17 00:00:00 2001
From: Jose Montes de Oca <jfmontesdeoca11@gmail.com>
Date: Sun, 20 Jul 2014 13:42:59 -0700
Subject: [PATCH 4/4] Fix ugly hack to re-use fragments

- Plugged in to listener for the activity to decide the behavior
---
 res/values/strings.xml                        |  1 +
 .../activities/AddTransactionActivity.java    | 13 ++++++++++---
 .../android/activities/NewGoalActivity.java   | 15 ++++++++++++++-
 .../fragments/AmountInputFragment.java        | 19 ++++++++++++-------
 .../android/fragments/NameInputFragment.java  | 12 +++---------
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e2951ab..949daa5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,6 +79,7 @@
     <string name="sample_due_date">JUL 25</string>
     <string name="sample_due_date_human">DUE IN 2 DAYS</string>
     <string name="sample_new_goal_name">Vacation</string>
+    <string name="smaple_new_transaction_name">Lunch</string>
 
     <!-- Parse -->
     <string name="com_parse_ui_logo_content_description">Logo</string>
diff --git a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
index f2cc41a..08e0257 100644
--- a/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/AddTransactionActivity.java
@@ -31,6 +31,7 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.RadioGroup;
 import android.widget.Toast;
 
 import com.parse.ParseException;
@@ -38,7 +39,7 @@
 
 public class AddTransactionActivity extends FragmentActivity
         implements OnInputFormListener, NameInputFragment.OnCreateViewListener,
-        CategoryInputFragment.OnCreateViewListener {
+        CategoryInputFragment.OnCreateViewListener, AmountInputFragment.OnCreateViewListener {
 
     private ListView lvSteps;
     private ArrayList<Input> inputs;
@@ -114,7 +115,7 @@ private void showFragment(Class activeFragmentClass) {
                 if (klass == activeFragmentClass) {
                     // Change ActionBar title
                     setActionBarTitle(input);
-                    
+
                     if (fragment != null) {
                         transaction.show(fragment);
                     } else {
@@ -206,7 +207,7 @@ public void done(ParseException e) {
             }
         });
     }
-    
+
     /**
      * Set Action Bar title base on the step
      * 
@@ -243,10 +244,16 @@ public void setEditTextName(EditText editTextName) {
         if (mTransactionName != null) {
             editTextName.setText(mTransactionName);
         }
+        editTextName.setHint(R.string.smaple_new_transaction_name);
     }
 
     @Override
     public String getCategoryId() {
         return mCategoryId == null ? null : mCategoryId;
     }
+
+    @Override
+    public void setAmountCategoryVisibility(RadioGroup rgType) {
+        rgType.setVisibility(View.VISIBLE);
+    }
 }
diff --git a/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java b/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
index e1e99ba..5ae924b 100644
--- a/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
+++ b/src/org/missionassetfund/apps/android/activities/NewGoalActivity.java
@@ -31,13 +31,16 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.RadioGroup;
 import android.widget.Toast;
 
 import com.parse.ParseException;
 import com.parse.SaveCallback;
 
-public class NewGoalActivity extends FragmentActivity implements OnInputFormListener {
+public class NewGoalActivity extends FragmentActivity implements OnInputFormListener,
+        NameInputFragment.OnCreateViewListener, AmountInputFragment.OnCreateViewListener {
 
     private ListView lvSteps;
     private ArrayList<Input> inputs;
@@ -235,4 +238,14 @@ private Class<?> getNextFragmentClass(Input input) {
     private Class<?> getPreviousFragmentClass(Input input) {
         return inputElements[input.getPos() - 1].getFragmentClass();
     }
+
+    @Override
+    public void setEditTextName(EditText editTextName) {
+        editTextName.setHint(R.string.sample_new_goal_name);
+    }
+
+    @Override
+    public void setAmountCategoryVisibility(RadioGroup rgType) {
+        rgType.setVisibility(View.INVISIBLE);
+    }
 }
diff --git a/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java b/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java
index c07c804..96fae9f 100644
--- a/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/AmountInputFragment.java
@@ -2,7 +2,6 @@
 package org.missionassetfund.apps.android.fragments;
 
 import org.missionassetfund.apps.android.R;
-import org.missionassetfund.apps.android.activities.NewGoalActivity;
 import org.missionassetfund.apps.android.interfaces.OnInputFormListener;
 import org.missionassetfund.apps.android.utils.CurrencyUtils;
 
@@ -22,12 +21,17 @@
 public class AmountInputFragment extends Fragment {
 
     private OnInputFormListener listener;
+    private OnCreateViewListener onCreateViewListener;
 
     private EditText etAmount;
     private RadioButton rbExpense;
     private ImageButton btnNext;
     private RadioGroup rgType;
 
+    public interface OnCreateViewListener {
+        public void setAmountCategoryVisibility(RadioGroup rgType);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_amount_input, container, false);
@@ -38,11 +42,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         btnNext = (ImageButton) view.findViewById(R.id.btnNext);
         rgType = (RadioGroup) view.findViewById(R.id.rgType);
 
-        // Ugly hack to try reuse this view in both goal / transaction
-        if (getActivity().getClass() == NewGoalActivity.class) {
-            rgType.setVisibility(View.INVISIBLE);
-        }
-
         // Setup listener
         btnNext.setOnClickListener(new OnClickListener() {
 
@@ -61,6 +60,8 @@ public void onClick(View v) {
             }
         });
 
+        onCreateViewListener.setAmountCategoryVisibility(rgType);
+
         return view;
     }
 
@@ -71,7 +72,11 @@ public void onAttach(Activity activity) {
             listener = (OnInputFormListener) activity;
         } else {
             throw new ClassCastException(activity.toString()
-                    + " must implement OnNextSelectedListener");
+                    + " must implement OnInputFormListener");
+        }
+
+        if (activity instanceof OnCreateViewListener) {
+            onCreateViewListener = (OnCreateViewListener) activity;
         }
     }
 
diff --git a/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java b/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java
index d44cf09..da465f6 100644
--- a/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java
+++ b/src/org/missionassetfund/apps/android/fragments/NameInputFragment.java
@@ -2,7 +2,6 @@
 package org.missionassetfund.apps.android.fragments;
 
 import org.missionassetfund.apps.android.R;
-import org.missionassetfund.apps.android.activities.NewGoalActivity;
 import org.missionassetfund.apps.android.interfaces.OnInputFormListener;
 
 import android.app.Activity;
@@ -24,7 +23,7 @@ public class NameInputFragment extends Fragment {
     private EditText etName;
     private ImageButton btnBack;
     private ImageButton btnNext;
-    
+
     public interface OnCreateViewListener {
         public void setEditTextName(EditText editTextName);
     }
@@ -38,11 +37,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         btnBack = (ImageButton) view.findViewById(R.id.btnBack);
         btnNext = (ImageButton) view.findViewById(R.id.btnNext);
 
-        // Ugly hack to try reuse this view in both goal / transaction
-        if (getActivity().getClass() == NewGoalActivity.class) {
-            etName.setHint(R.string.sample_new_goal_name);
-        }
-
         // Setup listener
         btnNext.setOnClickListener(new OnClickListener() {
 
@@ -66,7 +60,7 @@ public void onClick(View v) {
                 onInputFormListener.OnBackSelected(NameInputFragment.class);
             }
         });
-        
+
         onCreateViewListener.setEditTextName(etName);
 
         return view;
@@ -81,7 +75,7 @@ public void onAttach(Activity activity) {
             throw new ClassCastException(activity.toString()
                     + " must implement OnInputFormListener");
         }
-        
+
         if (activity instanceof OnCreateViewListener) {
             onCreateViewListener = (OnCreateViewListener) activity;
         }