Use actions instead of buttons

* res/layout/add.xml: Remove save_button.

* res/layout/main.xml: Remove add_button.

* res/menu/add_activity.xml:
* res/menu/main_activity.xml: New menus.

* res/values/strings.xml: Rename `add_button' to `main_menu_add' and
  `save_button' to `add_menu_save'.

* src/ryuslash/org/dvdroid/AddDVDActivity.java (createDVD): Renamed
  from `saveDVD', no longer takes a `View' as an argument.  Don't call
  finish in this function.

  (onCreateOptionsMenu):
  (onOptionsItemSelected): New overrides.

* src/ryuslash/org/dvdroid/DVDroidActivity.java (onCreateOptionsMenu):
  (onOptionsItemsSelected): New overrides.

  (showAddDVD): Renamed from `addDVD', no longer takes a `View' as an
  argument.

2 files changed, 56 insertions, 11 deletions

diff --git a/src/ryuslash/org/dvdroid/AddDVDActivity.java b/src/ryuslash/org/dvdroid/AddDVDActivity.java
index f6612f7..d25affd 100644
--- a/src/ryuslash/org/dvdroid/AddDVDActivity.java
+++ b/src/ryuslash/org/dvdroid/AddDVDActivity.java
@@ -3,6 +3,9 @@ package ryuslash.org.dvdroid;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -21,7 +24,7 @@ public class AddDVDActivity extends Activity
         datasource.open();
     }
 
-    public void saveDVD(View view)
+    public void createDVD()
     {
         EditText name_entry = (EditText)findViewById(R.id.name_entry);
         CheckBox watched_entry =
@@ -32,8 +35,6 @@ public class AddDVDActivity extends Activity
         datasource.createDVD(name_entry.getText().toString(),
                              watched_entry.isChecked() ? 1 : 0,
                              wishlist_entry.isChecked() ? 1 : 0);
-
-        finish();
     }
 
     @Override
@@ -56,4 +57,25 @@ public class AddDVDActivity extends Activity
         datasource.close();
         super.onDestroy();
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.add_activity, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        switch (item.getItemId()) {
+        case R.id.add_menu_save:
+            createDVD();
+            finish();
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/src/ryuslash/org/dvdroid/DVDroidActivity.java b/src/ryuslash/org/dvdroid/DVDroidActivity.java
index 613620c..e510a7b 100644
--- a/src/ryuslash/org/dvdroid/DVDroidActivity.java
+++ b/src/ryuslash/org/dvdroid/DVDroidActivity.java
@@ -6,6 +6,9 @@ import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
@@ -15,14 +18,6 @@ public class DVDroidActivity extends ListActivity
 {
     private DVDDataSource datasource;
 
-    public void addDVD(View view)
-    {
-        Intent intent = new Intent(this, AddDVDActivity.class);
-
-        datasource.close();
-        startActivityForResult(intent, 1);
-    }
-
     @Override
     protected void onActivityResult(int requestCode,
                                     int resultCode,
@@ -59,6 +54,26 @@ public class DVDroidActivity extends ListActivity
     }
 
     @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_activity, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        switch (item.getItemId()) {
+        case R.id.main_menu_add:
+            showAddDVD();
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
     protected void onPause()
     {
         datasource.close();
@@ -71,4 +86,12 @@ public class DVDroidActivity extends ListActivity
         datasource.open();
         super.onResume();
     }
+
+    public void showAddDVD()
+    {
+        Intent intent = new Intent(this, AddDVDActivity.class);
+
+        datasource.close();
+        startActivityForResult(intent, 1);
+    }
 }