X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=res%2Flayout%2Fadd_event.xml;h=c14561c8094408161dab3f116148449f28730ddd;hb=684382d3fff6c49c3373bf8fd0f44d7cb2ffe218;hp=002e6dbd3b6374b12633f892e11200f6f23cc40e;hpb=ecee6932221bfa129c90b47a4d8015c0082752f7;p=unical.git

diff --git a/res/layout/add_event.xml b/res/layout/add_event.xml
index 002e6db..c14561c 100644
--- a/res/layout/add_event.xml
+++ b/res/layout/add_event.xml
@@ -1,106 +1,184 @@
 <?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" >
 
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.00" >
+        <requestFocus />
+    </EditText>
 
-        <LinearLayout
+    <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:text="@string/start_label"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2.13" >
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
 
-                <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/title"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+        <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"
+                />
 
-                <EditText
-                    android:id="@+id/editText1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10" >
+    </LinearLayout>
 
-                    <requestFocus />
-                </EditText>
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/end_label"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            </LinearLayout>
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
 
-            <TextView
-                android:id="@+id/location"
-                android:layout_width="match_parent"
+        <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:text="@string/description"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                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:ems="10"
+                android:focusable="false"
+                />
 
-            <EditText
-                android:id="@+id/editText2"
+    </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="wrap_content"
-                android:layout_weight="2.13"
                 android:ems="10"
-                android:inputType="textMultiLine" />
+                android:hint="@string/description"
+                android:inputType="textMultiLine" >
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <requestFocus />
+        </EditText>
+        <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="2.13" >
+                android:text="@string/repeat"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <CheckBox
-                    android:id="@+id/checkBox1"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2.13"
-                    android:text="@string/repeatlabel" />
+        <Switch
+                android:id="@+id/repeat_switch"
+                android:layout_weight="1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
 
-                <Spinner
-                    android:id="@+id/spinner1"
-                    android:layout_width="213dp"
-                    android:layout_height="wrap_content" />
+    </LinearLayout>
 
-            </LinearLayout>
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/repeat_layout"
+            android:orientation="vertical" >
 
-        </LinearLayout>
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left" >
 
-    </ScrollView>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/repeat_every"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.00" >
+            <EditText
+                    android:id="@+id/repeat_time"
+                    android:inputType="number"
+                    android:layout_width="wrap_content"
+                    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" />
+            <Spinner
+                    android:id="@+id/repeat_spinner"
+                    android:entries="@array/repeat_array_p"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    />
 
-        <EditText
-            android:id="@+id/editText3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10" />
+        </LinearLayout>
 
+        <LinearLayout
+                android:id="@+id/repeat_count_layout"
+                android:layout_gravity="left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+
+            <Spinner
+                    android:id="@+id/repeat_type"
+                    android:entries="@array/repeat_type_array"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            <EditText
+                    android:id="@+id/repeat_count"
+                    android:inputType="number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+            <TextView
+                    style="@android:style/Widget.DeviceDefault.EditText"
+                    android:id="@+id/repeat_until"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:onClick="showDateTimePickerDialog"
+                    android:ems="8"
+                    android:visibility="gone" />
+        </LinearLayout>
     </LinearLayout>
-
-    <Button
-        android:id="@+id/AddEventButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/addeventtitle"
-    />
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+        </ScrollView>
\ No newline at end of file