From 9fc77db21845e2a89c03cea43228f95545c0b639 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 8 Aug 2012 22:11:12 +0200
Subject: Separate adding of DVDs

* AndroidManifest.xml: Add `AddDVDActivity' as an activity.

* res/layout/add.xml: Layout for `AddDVDActivity'.

* res/layout/main.xml: Remove the nested `LinearLayout' and `EditText'
  widgets.

* res/values/strings.xml: Change the `name_entry' hint text, add
  captions for `wishlist_entry', `watched_entry' and `save_button'.

* src/ryuslash/org/dvdroid/AddDVDActivity.java: New activity.

* src/ryuslash/org/dvdroid/DVDDataSource.java (createDVD): Accept
  WATCHED and WISHLIST parameters and send these to the database
  instead of `0' and `1'.

* src/ryuslash/org/dvdroid/DVDroidActivity.java (addDVD): Call
  `AddDVDActivity' to add a new DVD to the collection.

  (onActivityResult): New override.
---
 res/layout/add.xml     | 30 ++++++++++++++++++++++++++++++
 res/layout/main.xml    | 23 ++++++-----------------
 res/values/strings.xml |  5 ++++-
 3 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 res/layout/add.xml

(limited to 'res')

diff --git a/res/layout/add.xml b/res/layout/add.xml
new file mode 100644
index 0000000..22430f3
--- /dev/null
+++ b/res/layout/add.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+  <EditText
+      android:id="@+id/name_entry"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:hint="@string/name_entry" />
+
+  <CheckBox
+      android:id="@+id/wishlist_entry"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/wishlist_entry" />
+
+  <CheckBox
+      android:id="@+id/watched_entry"
+      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 f109163..925b362 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -3,23 +3,12 @@
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
-  <LinearLayout
-      android:orientation="horizontal"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
-    <EditText
-        android:id="@+id/name_entry"
-        android:layout_weight="1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="@string/name_entry" />
-    <Button
-        android:id="@+id/add_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/add_button"
-        android:onClick="addDVD" />
-  </LinearLayout>
+  <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"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c49385..40f4d6e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">DVDroid</string>
-  <string name="name_entry">Enter A DVD title</string>
+  <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>
 </resources>
-- 
cgit v1.3-2-g0d8e