From: Petru Trimbitas <l3asketballplayer@yahoo.com>
Date: Tue, 28 May 2013 19:54:43 +0000 (+0300)
Subject: add interface for displaying an event
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=222ca38de5b6576e6698a4008789f1f562f59529;p=unical.git

add interface for displaying an event
---

diff --git a/res/layout/addevent.xml b/res/layout/addevent.xml
index e9ad032..8c166e5 100644
--- a/res/layout/addevent.xml
+++ b/res/layout/addevent.xml
@@ -39,7 +39,7 @@
             </LinearLayout>
 
             <TextView
-                android:id="@+id/textView2"
+                android:id="@+id/location"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/description"
@@ -53,23 +53,6 @@
                 android:ems="10"
                 android:inputType="textMultiLine" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2.13" >
-
-                <TimePicker
-                    android:id="@+id/timePicker1"
-                    android:layout_width="171dp"
-                    android:layout_height="wrap_content" />
-
-                <DatePicker
-                    android:id="@+id/datePicker1"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/eventview.xml b/res/layout/eventview.xml
index 08d8cee..73fb2d2 100644
--- a/res/layout/eventview.xml
+++ b/res/layout/eventview.xml
@@ -28,7 +28,7 @@
         android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Description:"
+        android:text="@string/descriptionlabel"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <TextView
@@ -38,4 +38,24 @@
         android:text="Small Text"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
+    <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/locationlabel"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Medium Text"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/login.xml b/res/layout/login.xml
index 12cb589..664ba30 100644
--- a/res/layout/login.xml
+++ b/res/layout/login.xml
@@ -18,7 +18,7 @@
         android:layout_weight="0.00" >
 
         <TextView
-            android:id="@+id/textView2"
+            android:id="@+id/location"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/userlabel"
diff --git a/res/menu/options.xml b/res/menu/options.xml
index f95d124..974e391 100644
--- a/res/menu/options.xml
+++ b/res/menu/options.xml
@@ -6,6 +6,9 @@
     >
         
     </item>
+    <item android:id="@+id/deleteevent"
+        android:icon="@android:drawable/ic_menu_delete"
+        ></item>
     
 
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b3bd9c..11f2e86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_id">148275978690487</string>
     <string name="title">Title</string>
     <string name="description">Description</string>
+    <string name="descriptionlabel">Description: </string>
     <string name="login">Log In</string>
     <string name="location">Location</string>
     <string name="userlabel">User: </string>
diff --git a/src/ro/ieval/unical/displayEventActivity.java b/src/ro/ieval/unical/displayEventActivity.java
new file mode 100644
index 0000000..b6ded5d
--- /dev/null
+++ b/src/ro/ieval/unical/displayEventActivity.java
@@ -0,0 +1,37 @@
+package ro.ieval.unical;
+
+import java.util.Date;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.widget.TextView;
+
+public class displayEventActivity extends Activity {
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		//aici iei parametru
+		Event e=new Event();
+		setContentView(R.layout.eventview);
+	    final TextView eventTitle= (TextView) findViewById(R.id.eventTitle);
+		final TextView date=(TextView) findViewById(R.id.date);
+		final TextView description=(TextView) findViewById(R.id.description);
+		final TextView location= (TextView) findViewById(R.id.location);
+		eventTitle.setText(e.title);
+		date.setText((new Date(e.date)).toString());
+		description.setText(e.description);
+		location.setText(e.location);
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// TODO Auto-generated method stub
+		// nu stiu cum sa pun delete in loc de new event
+		MenuInflater inflater = getMenuInflater();
+	    inflater.inflate(R.menu.options, menu);
+		return true;
+	}
+}