Add description to event_view

diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml
index 42b29921eb4d46dee6d8b943025c174406087466..bcc97aa2bb7c0468fb90ccf5d3e236a81ffbb773 100644 (file)
--- 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 798adc68a53d5e0608397b89e46df7e2b4754302..967a556b5cf03c69303f343466f660086c5f5f83 100644 (file)
--- 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