From e8df341197ea79776a0376fbdcce9d4360561bb5 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 8 Aug 2012 23:05:19 +0200
Subject: 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.
---
 res/layout/add.xml         | 7 -------
 res/layout/main.xml        | 7 -------
 res/menu/add_activity.xml  | 6 ++++++
 res/menu/main_activity.xml | 6 ++++++
 res/values/strings.xml     | 4 ++--
 5 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 res/menu/add_activity.xml
 create mode 100644 res/menu/main_activity.xml

(limited to 'res')

diff --git a/res/layout/add.xml b/res/layout/add.xml
index 22430f3..4ca4627 100644
--- a/res/layout/add.xml
+++ b/res/layout/add.xml
@@ -20,11 +20,4 @@
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
       android:text="@string/watched_entry" />
-
-  <Button
-      android:id="@+id/save_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/save_button"
-      android:onClick="saveDVD" />
 </LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 925b362..42e5b78 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -3,13 +3,6 @@
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
-  <Button
-      android:id="@+id/add_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/add_button"
-      android:onClick="addDVD" />
-
   <ListView
       android:id="@android:id/list"
       android:layout_width="fill_parent"
diff --git a/res/menu/add_activity.xml b/res/menu/add_activity.xml
new file mode 100644
index 0000000..e0defc0
--- /dev/null
+++ b/res/menu/add_activity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/add_menu_save"
+        android:title="@string/add_menu_save"
+        android:showAsAction="ifRoom|withText" />
+</menu>
diff --git a/res/menu/main_activity.xml b/res/menu/main_activity.xml
new file mode 100644
index 0000000..ce1512b
--- /dev/null
+++ b/res/menu/main_activity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/main_menu_add"
+        android:title="@string/main_menu_add"
+        android:showAsAction="ifRoom|withText" />
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 40f4d6e..dc3e703 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,6 +4,6 @@
   <string name="name_entry">Title...</string>
   <string name="wishlist_entry">On wishlist</string>
   <string name="watched_entry">Watched</string>
-  <string name="add_button">Add</string>
-  <string name="save_button">Save</string>
+  <string name="main_menu_add">Add</string>
+  <string name="add_menu_save">Save</string>
 </resources>
-- 
cgit v1.3-2-g0d8e