Deleted AddIncome/AddExpense dialogs.

Author: evgenii

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/NavDrawerActivity.java

@@ -16,7 +16,7 @@
 import com.blogspot.e_kanivets.moneytracker.fragment.ExportFragment;
 import com.blogspot.e_kanivets.moneytracker.fragment.NavigationDrawerFragment;
 import com.blogspot.e_kanivets.moneytracker.fragment.RecordsFragment;
-import com.blogspot.e_kanivets.moneytracker.ui.AddIncomeDialog;
+import com.blogspot.e_kanivets.moneytracker.model.Record;
 import com.blogspot.e_kanivets.moneytracker.util.AppUtils;
 
 public class NavDrawerActivity extends ActionBarActivity
@@ -143,18 +143,35 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     public void onAddIncomePressed() {
+        showAddIncomeFragment(null, AddIncomeFragment.Mode.MODE_ADD);
+    }
+
+    @Override
+    public void onAddExpensePressed() {
+        showAddExpenseFragment(null, AddExpenseFragment.Mode.MODE_ADD);
+    }
+
+    @Override
+    public void onEditRecord(Record record) {
+        if (record.isIncome()) {
+            showAddIncomeFragment(record, AddIncomeFragment.Mode.MODE_EDIT);
+        } else {
+            showAddExpenseFragment(record, AddExpenseFragment.Mode.MODE_EDIT);
+        }
+    }
+
+    private void showAddIncomeFragment(Record record, AddIncomeFragment.Mode mode) {
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragmentManager.beginTransaction()
-                .replace(R.id.container, AddIncomeFragment.newInstance(null, AddIncomeFragment.Mode.MODE_ADD))
+                .replace(R.id.container, AddIncomeFragment.newInstance(record, mode))
                 .addToBackStack("")
                 .commit();
     }
 
-    @Override
-    public void onAddExpensePressed() {
+    private void showAddExpenseFragment(Record record, AddExpenseFragment.Mode mode) {
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragmentManager.beginTransaction()
-                .replace(R.id.container, AddExpenseFragment.newInstance(null, AddExpenseFragment.Mode.MODE_ADD))
+                .replace(R.id.container, AddExpenseFragment.newInstance(record, mode))
                 .addToBackStack("")
                 .commit();
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/RecordsFragment.java

@@ -6,7 +6,6 @@
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.PopupMenu;
 import android.view.ContextMenu;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -17,7 +16,6 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -29,8 +27,6 @@
 import com.blogspot.e_kanivets.moneytracker.helper.MTHelper;
 import com.blogspot.e_kanivets.moneytracker.helper.PeriodHelper;
 import com.blogspot.e_kanivets.moneytracker.model.Record;
-import com.blogspot.e_kanivets.moneytracker.ui.AddExpenseDialog;
-import com.blogspot.e_kanivets.moneytracker.ui.AddIncomeDialog;
 import com.blogspot.e_kanivets.moneytracker.ui.AppRateDialog;
 import com.blogspot.e_kanivets.moneytracker.ui.ChangeDateDialog;
 import com.blogspot.e_kanivets.moneytracker.util.AppUtils;
@@ -118,13 +114,7 @@ public boolean onContextItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.edit:
                 Record record = MTHelper.getInstance().getRecords().get(info.position);
-                if (record.isIncome()) {
-                    AddIncomeDialog dialog = new AddIncomeDialog(getActivity(), record, AddIncomeDialog.Mode.MODE_EDIT);
-                    dialog.show();
-                } else {
-                    AddExpenseDialog dialog = new AddExpenseDialog(getActivity(), record, AddExpenseDialog.Mode.MODE_EDIT);
-                    dialog.show();
-                }
+                listener.onEditRecord(record);
                 return true;
             case R.id.delete:
                 MTHelper.getInstance().deleteRecordById(MTHelper.getInstance().getRecords().
@@ -278,16 +268,6 @@ private void initActionBar() {
         }
     }
 
-    private void showAddIncomeDialog() {
-        AddIncomeDialog dialog = new AddIncomeDialog(getActivity(), null, AddIncomeDialog.Mode.MODE_ADD);
-        dialog.show();
-    }
-
-    private void showAddExpenseDialog() {
-        AddExpenseDialog dialog = new AddExpenseDialog(getActivity(), null, AddExpenseDialog.Mode.MODE_ADD);
-        dialog.show();
-    }
-
     private void showChangeFromDateDialog() {
         ChangeDateDialog dialog = new ChangeDateDialog(getActivity(),
                 MTHelper.getInstance().getPeriod().getFirst(), new ChangeDateDialog.OnDateChangedListener() {
@@ -325,5 +305,6 @@ private void showAppRateDialog() {
     public interface OnFragmentInteractionListener {
         void onAddIncomePressed();
         void onAddExpensePressed();
+        void onEditRecord(Record record);
     }
 }