#72[30m]. Change edit/delete options.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java

@@ -161,13 +161,36 @@ public boolean onCreateOptionsMenu(Menu menu) {
         return true;
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        switch (mode) {
+            case MODE_ADD:
+                menu.removeItem(R.id.action_delete);
+                break;
+
+            case MODE_EDIT:
+                break;
+
+            default:
+                break;
+        }
+
+        return true;
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_done:
                 tryRecord();
                 return true;
 
+            case R.id.action_delete:
+                recordController.delete(record);
+                setResult(RESULT_OK);
+                finish();
+                return true;
+
             default:
                 return super.onOptionsItemSelected(item);
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java

@@ -3,10 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
-import android.view.ContextMenu;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -38,6 +35,7 @@
 
 import butterknife.Bind;
 import butterknife.OnClick;
+import butterknife.OnItemClick;
 
 public class MainActivity extends BaseDrawerActivity {
     @SuppressWarnings("unused")
@@ -124,34 +122,13 @@ public void onPeriodSelected(Period period) {
         spinner.setPeriod(periodController.readLastUsedPeriod());
     }
 
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        getMenuInflater().inflate(R.menu.menu_record, menu);
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
-
-        switch (item.getItemId()) {
-            case R.id.edit:
-                // Minus one because of list view's header view
-                Record record = recordList.get(info.position - 1);
-                if (record.isIncome())
-                    startAddIncomeActivity(record, AddRecordActivity.Mode.MODE_EDIT);
-                else startAddExpenseActivity(record, AddRecordActivity.Mode.MODE_EDIT);
-                return true;
-
-            case R.id.delete:
-                // Minus one because of list view's header view
-                recordController.delete(recordList.get(info.position - 1));
-                update();
-                return true;
-
-            default:
-                return super.onContextItemSelected(item);
-        }
+    @OnItemClick(R.id.list_view)
+    public void editRecord(int position) {
+        // Minus one because of list view's header view
+        Record record = recordList.get(position - 1);
+        if (record.isIncome())
+            startAddIncomeActivity(record, AddRecordActivity.Mode.MODE_EDIT);
+        else startAddExpenseActivity(record, AddRecordActivity.Mode.MODE_EDIT);
     }
 
     @OnClick(R.id.btn_add_expense)

app/src/main/res/drawable-xxxhdpi/ic_delete.png

@@ -2,6 +2,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_delete"
+        android:title="@string/delete"
+        tools:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_done"
         android:icon="@drawable/ic_done"