From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 21 Aug 2013 12:42:06 +0000 (+0300)
Subject: Better DisplayEventActivity
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=00b0fd8e83bd390790342ebc41148f4a760d9fb4;p=unical.git

Better DisplayEventActivity
---

diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml
index 6fd935f..e4dfa8f 100644
--- a/res/layout/event_view.xml
+++ b/res/layout/event_view.xml
@@ -71,16 +71,33 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1dp"
+		android:background="@android:color/darker_gray"/>
+
+	<TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/descriptionlabel"
+        android:text="@string/description"
         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" />
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1dp"
+		android:background="@android:color/darker_gray"/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/alarms"
+		android:textStyle="bold"
+		android:textAppearance="?android:attr/textAppearanceLarge" />
 	<ListView
 		android:id="@+id/alarm_list"
 		android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a4c44a2..edc2770 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,7 +4,6 @@
     <string name="app_id">148275978690487</string>
     <string name="title">Title</string>
     <string name="description">Description</string>
-    <string name="descriptionlabel">Description: </string>
     <string name="log_in">Log In</string>
     <string name="location">Location</string>
     <string name="username">Username</string>
@@ -50,6 +49,7 @@
     <string name="edit_event">Edit Event</string>
 	<string name="add_alarm">Add alarm</string>
 	<string name="delete">Delete</string>
+	<string name="alarms">Alarms</string>
 
     <string-array name="repeat_array_s">
         <item>Day</item>
diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 4f16069..18f6ef9 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -81,13 +81,16 @@ public class DisplayEventActivity extends Activity {
 		final DateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
 
 		startDay.setText(dayOfWeekFormat.format(start));
+		startDate.setText(dateFormat.format(start));
 		if(!dateFormat.format(start).equals(dateFormat.format(end))) {
 			endDay.setText(dayOfWeekFormat.format(end));
 			endDate.setText(dateFormat.format(end));
 		}
-		startDate.setText(dateFormat.format(start));
+
 		startTime.setText(timeFormat.format(start));
-		endTime.setText(timeFormat.format(end));
+		if(!start.equals(end))
+			endTime.setText(timeFormat.format(end));
+
 		description.setText(event.description);
 		setAdapter();
 	}