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 6840e24971178cb4b2bd7cfa1c8e4cf8ff8345c5..d9f2adf45abc151a1c1c5b6439cb2429a09bde6b 100644 (file)
--- a/res/layout/add_event.xml
+++ b/res/layout/add_event.xml
@@ -1,52 +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" >
+              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:hint="@string/eventname"
+            android:ems="10" >
 
-    <TabHost
-        android:id="@android:id/tabhost"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        <requestFocus />
+    </EditText>
 
-        <LinearLayout
+    <TextView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
+            android:layout_height="wrap_content"
+            android:text="@string/start_label"
+            android:textAppearance="?android:attr/textAppearanceMedium">    </TextView>
 
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-            </TabWidget>
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+        <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: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_start"
+                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:ems="10"
+                android:focusable="false"
+                />
 
-            <FrameLayout
-                android:id="@android:id/tabcontent"
+    </LinearLayout>
+
+    <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" >
+
+        <TextView
+                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"
+                />
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+        <EditText
+                android:id="@+id/description"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <LinearLayout
-                    android:id="@+id/tab1"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical" >
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/tab2"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical" >
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/tab3"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical" >
-                </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-    </TabHost>
-
-</LinearLayout>
\ No newline at end of file
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/description"
+                android:inputType="textMultiLine" >
+
+            <requestFocus />
+        </EditText>
+
+    </LinearLayout>
+
+</LinearLayout>
+        </ScrollView>