From: Petru Trimbitas <l3asketballplayer@yahoo.com>
Date: Thu, 13 Jun 2013 17:03:08 +0000 (+0300)
Subject: Add description to event_view
X-Git-Url: http://git.ieval.ro/?p=unical.git;a=commitdiff_plain;h=82d6ca0169344ba4d1e6995ac26f059fc9e05a01

Add description to event_view
---

diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml
index 42b2992..bcc97aa 100644
--- a/res/layout/event_view.xml
+++ b/res/layout/event_view.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical" >
 
     <ImageView
+        android:contentDescription="@+string/asd"
         android:id="@+id/imageView1"
         android:scaleType="fitXY"
         android:layout_width="match_parent"
@@ -12,6 +13,7 @@
         android:src="@android:drawable/title_bar_tall" />
 
     <LinearLayout
+        android:baselineAligned="false"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -75,5 +77,10 @@
         android:text="@string/descriptionlabel"
         android:textStyle="bold"
         android:textAppearance="?android:attr/textAppearanceLarge" />
+    <TextView
+        android:id="@+id/event_view_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 798adc6..967a556 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -35,6 +35,7 @@ public class DisplayEventActivity extends Activity {
 		final TextView endDate= (TextView) findViewById(R.id.enddate);
 		final TextView startTime= (TextView) findViewById(R.id.starttime);
 		final TextView endTime= (TextView) findViewById(R.id.endtime);
+		final TextView description= (TextView) findViewById(R.id.event_view_description);
 
 		final Date start=new Date(e.dtstart);
 		final Date end=new Date(e.dtend);
@@ -50,6 +51,7 @@ public class DisplayEventActivity extends Activity {
 		startDate.setText(dateFormat.format(start));
 		startTime.setText(timeFormat.format(start));
 		endTime.setText(timeFormat.format(end));
+		description.setText(e.description);
 	}
 
 	@Override