tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-11-08 Sergio Martin <sergio.martin@artica.es> 

* src/pandroid_event_viewer/pandorafms/EventList.java: Adapt
	the event comments to new storing format

	* res/layout/item_list_event_extended.xml: Improve event 
	comments layout to wrap the text to the container



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9038 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-11-08 10:03:47 +00:00
parent 6e3bdaacb1
commit 8e221dec39
3 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,11 @@
2013-11-08 Sergio Martin <sergio.martin@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java: Adapt
the event comments to new storing format
* res/layout/item_list_event_extended.xml: Improve event
comments layout to wrap the text to the container
2013-11-07 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java,

3
extras/pandroid_event_viewer/res/layout/item_list_event_extended.xml
View File

@ -116,6 +116,9 @@
android:id="@+id/comments_text"
android:layout_width="wrap_content"
android:singleLine="false"
android:ellipsize="none"
android:layout_weight="1"
android:scrollHorizontally="false"
android:text="@string/empty"
android:textColor="#000" />
</TableRow>

38
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
View File

@ -17,9 +17,11 @@ GNU General Public License for more details.
package pandroid_event_viewer.pandorafms;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Date;
import android.app.Activity;
import android.app.Dialog;
@ -53,6 +55,9 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import org.json.JSONArray;
import org.json.JSONObject;
/**
* Activity where events are displayed.
*
@ -537,14 +542,37 @@ public class EventList extends ListActivity {
}
if (item.user_comment.length() != 0) {
if (item.user_comment.length() > 200) {
item.user_comment = item.user_comment.substring(0,
197);
item.user_comment = item.user_comment.concat("...");
String comments = new String();
comments = "";
try {
JSONArray mJsonArray = new JSONArray(item.user_comment);
JSONObject mJsonObject = new JSONObject();
for (int i = 0; i < mJsonArray.length(); i++) {
mJsonObject = mJsonArray.getJSONObject(i);
long comment_utimestamp = Integer.parseInt(mJsonObject.getString("utimestamp"));
Date comment_date = new Date(comment_utimestamp * 1000);
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String comment_date_str = formatter.format(comment_date);
comments = comments + comment_date_str + "\n";
comments = comments + mJsonObject.getString("action") + " by " + mJsonObject.getString("id_user") + "\n";
comments = comments + "\"" + mJsonObject.getString("comment") + "\"" + "\n\n";
}
} catch (Exception e) {
// If comment is not stored as JSON (old format), clean it and show it as stored
item.user_comment = item.user_comment.replaceAll("^-- ", "\n");
item.user_comment = item.user_comment.replaceAll(" --$", "\n");
item.user_comment = item.user_comment.replaceAll(" --", "\n");
item.user_comment = item.user_comment.replaceAll("-- ", "\n\n");
comments = item.user_comment;
}
text = (TextView) viewEventExtended
.findViewById(R.id.comments_text);
text.setText(item.user_comment);
text.setText(comments);
}
if (item.group_name.length() != 0) {