Removes repeat layout. Format date now works correctly

[unical.git] / res / layout / add_event.xml

diff --git a/res/layout/add_event.xml b/res/layout/add_event.xml
index 0e57abc89aa16c7c3b3706edeaf36ded52144ecb..d9f2adf45abc151a1c1c5b6439cb2429a09bde6b 100644 (file)
--- a/res/layout/add_event.xml
+++ b/res/layout/add_event.xml
@@ -1,106 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+        >
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.00" >
-
-        <LinearLayout
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <EditText
+            android:inputType="text"
+            android:id="@+id/eventtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2.13" >
-
-                <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/title"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:hint="@string/eventname"
+            android:ems="10" >
 
-                <EditText
-                    android:id="@+id/editText1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10" >
+        <requestFocus />
+    </EditText>
 
-                    <requestFocus />
-                </EditText>
-
-            </LinearLayout>
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/start_label"
+            android:textAppearance="?android:attr/textAppearanceMedium">    </TextView>
 
-            <TextView
-                android:id="@+id/location"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/description"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
 
-            <EditText
-                android:id="@+id/editText2"
-                android:layout_width="match_parent"
+        <TextView
+                style="@android:style/Widget.DeviceDefault.EditText"
+                android:id="@+id/time_start"
+                android:freezesText="true"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="2.13"
+                android:onClick="showDateTimePickerDialog"
+                android:text="@string/pick_time"
+                android:layout_weight="1"
                 android:ems="10"
-                android:inputType="textMultiLine" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
+                android:focusable="false"
+                />
+        <TextView
+                style="@android:style/Widget.DeviceDefault.EditText"
+                android:id="@+id/date_start"
+                android:freezesText="true"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="2.13" >
-
-                <CheckBox
-                    android:id="@+id/checkBox1"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2.13"
-                    android:text="@string/repeatlabel" />
-
-                <Spinner
-                    android:id="@+id/spinner1"
-                    android:layout_width="213dp"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
+                android:onClick="showDateTimePickerDialog"
+                android:text="@string/pick_date"
+                android:layout_weight="1"
+                android:ems="10"
+                android:focusable="false"
+                />
 
-        </LinearLayout>
+    </LinearLayout>
 
-    </ScrollView>
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/end_label"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.00" >
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
 
         <TextView
-            android:id="@+id/textView3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/locationlabel"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+                style="@android:style/Widget.DeviceDefault.EditText"
+                android:id="@+id/time_end"
+                android:freezesText="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:onClick="showDateTimePickerDialog"
+                android:text="@string/pick_time"
+                android:layout_weight="1"
+                android:ems="10"
+                android:focusable="false"
+                />
+        <TextView
+                style="@android:style/Widget.DeviceDefault.EditText"
+                android:id="@+id/date_end"
+                android:freezesText="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:onClick="showDateTimePickerDialog"
+                android:text="@string/pick_date"
+                android:layout_weight="1"
+                android:focusable="false"
+                />
 
-        <EditText
-            android:id="@+id/editText3"
+    </LinearLayout>
+
+    <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10" />
+            android:layout_height="wrap_content" >
+        <EditText
+                android:id="@+id/description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/description"
+                android:inputType="textMultiLine" >
 
-    </LinearLayout>
+            <requestFocus />
+        </EditText>
 
-    <Button
-        android:id="@+id/AddEventButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Add Event"
-    />
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+        </ScrollView>