#2[30m]. Refactor Records fragment to not use interaction callback.

Author: Evgenii Kanivets

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

@@ -1,6 +1,5 @@
 package com.blogspot.e_kanivets.moneytracker.activity;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -14,13 +13,12 @@
 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.model.Record;
 import com.blogspot.e_kanivets.moneytracker.util.AppUtils;
 
 public class NavDrawerActivity extends AppCompatActivity
-        implements NavigationDrawerFragment.NavigationDrawerCallbacks,
-        RecordsFragment.OnFragmentInteractionListener {
-
+        implements NavigationDrawerFragment.NavigationDrawerCallbacks {
+    @SuppressWarnings("unused")
+    private static final String TAG = "NavDrawerActivity";
     /**
      * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
      */
@@ -121,38 +119,4 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
         return super.onCreateOptionsMenu(menu);
     }
-
-    @Override
-    public void onAddIncomePressed() {
-        startAddIncomeActivity(null, AddIncomeActivity.Mode.MODE_ADD);
-    }
-
-    @Override
-    public void onAddExpensePressed() {
-        startAddExpenseActivity(null, AddExpenseActivity.Mode.MODE_ADD);
-    }
-
-    @Override
-    public void onEditRecord(Record record) {
-        if (record.isIncome()) startAddIncomeActivity(record, AddIncomeActivity.Mode.MODE_EDIT);
-        else startAddExpenseActivity(record, AddExpenseActivity.Mode.MODE_EDIT);
-    }
-
-    public void showAddAccountActivity() {
-        startActivity(new Intent(NavDrawerActivity.this, AddAccountActivity.class));
-    }
-
-    private void startAddIncomeActivity(Record record, AddIncomeActivity.Mode mode) {
-        Intent intent = new Intent(NavDrawerActivity.this, AddIncomeActivity.class);
-        intent.putExtra(AddExpenseActivity.KEY_RECORD, record);
-        intent.putExtra(AddExpenseActivity.KEY_MODE, mode);
-        startActivity(intent);
-    }
-
-    private void startAddExpenseActivity(Record record, AddExpenseActivity.Mode mode) {
-        Intent intent = new Intent(NavDrawerActivity.this, AddExpenseActivity.class);
-        intent.putExtra(AddExpenseActivity.KEY_RECORD, record);
-        intent.putExtra(AddExpenseActivity.KEY_MODE, mode);
-        startActivity(intent);
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.blogspot.e_kanivets.moneytracker.fragment;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
@@ -15,6 +16,7 @@
 import android.widget.ListView;
 
 import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.activity.AddAccountActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.NavDrawerActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
 import com.blogspot.e_kanivets.moneytracker.helper.MTHelper;
@@ -71,7 +73,7 @@ public void onAttach(Activity activity) {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn_add_account:
-                ((NavDrawerActivity) getActivity()).showAddAccountActivity();
+                startActivity(new Intent(getActivity(), AddAccountActivity.class));
                 break;
 
             default:

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

@@ -21,6 +21,8 @@
 import android.widget.TextView;
 
 import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.activity.AddExpenseActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.AddIncomeActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.NavDrawerActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter;
@@ -49,13 +51,6 @@ public class RecordsFragment extends Fragment implements View.OnClickListener, O
     private TextView tvFromDate;
     private TextView tvToDate;
 
-    private OnFragmentInteractionListener listener;
-
-    /**
-     * Use this factory method to create a new instance of this fragment using the provided parameters.
-     *
-     * @return A new instance of fragment RecordsFragment.
-     */
     public static RecordsFragment newInstance() {
         RecordsFragment fragment = new RecordsFragment();
         Bundle args = new Bundle();
@@ -81,13 +76,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
-        try {
-            listener = (OnFragmentInteractionListener) activity;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(activity.toString()
-                    + " must implement OnFragmentInteractionListener");
-        }
-
         ((NavDrawerActivity) activity).onSectionAttached(TAG);
     }
 
@@ -105,7 +93,9 @@ public boolean onContextItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.edit:
                 Record record = MTHelper.getInstance().getRecords().get(info.position);
-                listener.onEditRecord(record);
+                if (record.isIncome())
+                    startAddIncomeActivity(record, AddIncomeActivity.Mode.MODE_EDIT);
+                else startAddExpenseActivity(record, AddExpenseActivity.Mode.MODE_EDIT);
                 return true;
             case R.id.delete:
                 MTHelper.getInstance().deleteRecordById(MTHelper.getInstance().getRecords().
@@ -120,13 +110,11 @@ public boolean onContextItemSelected(MenuItem item) {
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.btn_add_expense:
-                //showAddExpenseDialog();
-                listener.onAddExpensePressed();
+                startAddExpenseActivity(null, AddExpenseActivity.Mode.MODE_ADD);
                 break;
 
             case R.id.btn_add_income:
-                //showAddIncomeDialog();
-                listener.onAddIncomePressed();
+                startAddIncomeActivity(null, AddIncomeActivity.Mode.MODE_ADD);
                 break;
 
             case R.id.btn_report:
@@ -295,9 +283,17 @@ private void showAppRateDialog() {
         dialog.show();
     }
 
-    public interface OnFragmentInteractionListener {
-        void onAddIncomePressed();
-        void onAddExpensePressed();
-        void onEditRecord(Record record);
+    private void startAddIncomeActivity(Record record, AddIncomeActivity.Mode mode) {
+        Intent intent = new Intent(getActivity(), AddIncomeActivity.class);
+        intent.putExtra(AddExpenseActivity.KEY_RECORD, record);
+        intent.putExtra(AddExpenseActivity.KEY_MODE, mode);
+        startActivity(intent);
+    }
+
+    private void startAddExpenseActivity(Record record, AddExpenseActivity.Mode mode) {
+        Intent intent = new Intent(getActivity(), AddExpenseActivity.class);
+        intent.putExtra(AddExpenseActivity.KEY_RECORD, record);
+        intent.putExtra(AddExpenseActivity.KEY_MODE, mode);
+        startActivity(intent);
     }
 }