Merge pull request SMILEConsortium#61 from chrqls/dev

[#4] Adding date on prepared questions screen
RazortoothRTC · Dec 6, 2013 · 9cc3bab · 9cc3bab
2 parents dd70679 + 9870026
commit 9cc3bab
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/res/layout-large-land/use_prepared_questions_item.xml b/res/layout-large-land/use_prepared_questions_item.xml
@@ -58,6 +58,22 @@
 	        android:text="@string/group_name_hint"
 	        android:layout_gravity="center_vertical"
 	        android:textColor="@color/black" />
+
+	    <TextView
+	        android:textSize="12sp"
+	        android:text="@string/separator"
+	        android:textStyle="bold"
+	        android:layout_gravity="center_vertical"
+	        android:layout_marginLeft="10dip"
+	        android:layout_marginRight="10dip"
+	        android:textColor="@color/red" />
+
+	    <TextView
+	        android:id="@+id/tv_date"
+	        android:textSize="12sp"
+	        android:text="@string/date_hint"
+	        android:layout_gravity="center_vertical"
+	        android:textColor="@color/green" />
 
     </TableRow>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -10,6 +10,7 @@
 	<string name="teacher_name_hint">Teacher name</string>
 	<string name="session_title_hint">Session title</string>
 	<string name="group_name_hint">Group name</string>
+	<string name="date_hint">Date</string>
 	<string name="btn_create_session">Create</string>
 	<string name="creating_session">Creating session...</string>
 	<string name="separator"> - </string>

diff --git a/src/main/java/org/smilec/smile/ui/adapter/IQSetListAdapter.java b/src/main/java/org/smilec/smile/ui/adapter/IQSetListAdapter.java
@@ -1,5 +1,8 @@
 package org.smilec.smile.ui.adapter;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import org.smilec.smile.R;
@@ -46,6 +49,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
             TextView tvGroupName = (TextView) convertView.findViewById(R.id.tv_group_name);
             tvGroupName.setText(String.valueOf(iqset.getGroupName()));
+
+            TextView tvDate = (TextView) convertView.findViewById(R.id.tv_date);
+            tvDate.setText(String.valueOf(iqset.getKey()));
         }
 
         return convertView;