From e5ddad21390e8d0429e8805b0dc9707813fc0131 Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral Date: Tue, 3 Apr 2012 20:44:00 +0000 Subject: [PATCH] Added content message to marks notifications. Fixed HTML bug in location field of notifications git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@254 5bc14d19-1e4b-4ba2-aa50-860af135f48c --- SWADroid/gen/es/ugr/swad/swadroid/R.java | 72 ++++++++++--------- .../res/layout/notifications_list_item.xml | 10 +++ SWADroid/res/values-es/strings.xml | 1 + SWADroid/res/values/strings.xml | 7 +- .../NotificationsCursorAdapter.java | 23 +++--- 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/SWADroid/gen/es/ugr/swad/swadroid/R.java b/SWADroid/gen/es/ugr/swad/swadroid/R.java index 1d3521c3..e24d15e7 100644 --- a/SWADroid/gen/es/ugr/swad/swadroid/R.java +++ b/SWADroid/gen/es/ugr/swad/swadroid/R.java @@ -68,20 +68,21 @@ public final class R { } public static final class id { public static final int actionBarLayout=0x7f090000; - public static final int clean_database_menu=0x7f09003d; - public static final int contentWebView=0x7f090022; - public static final int courseNameText=0x7f090020; - public static final int decrement=0x7f09001e; + public static final int clean_database_menu=0x7f09003e; + public static final int contentWebView=0x7f090023; + public static final int courseNameText=0x7f090021; + public static final int decrement=0x7f09001f; public static final int eventContent=0x7f090017; public static final int eventDate=0x7f090013; public static final int eventLocation=0x7f090019; public static final int eventMetaData=0x7f090011; + public static final int eventMsg=0x7f09001c; public static final int eventSender=0x7f090015; public static final int eventSummary=0x7f09001a; public static final int eventText=0x7f09001b; public static final int eventTime=0x7f090014; public static final int eventType=0x7f090018; - public static final int increment=0x7f09001c; + public static final int increment=0x7f09001d; public static final int listIcon=0x7f090009; public static final int listItems=0x7f09000b; public static final int listText=0x7f09000a; @@ -94,39 +95,39 @@ public final class R { public static final int moduleIcon=0x7f090001; public static final int moduleName=0x7f090002; public static final int notificationIcon=0x7f090012; - public static final int preferences_menu=0x7f09003e; - public static final int rate_menu=0x7f09003c; + public static final int preferences_menu=0x7f09003f; + public static final int rate_menu=0x7f09003d; public static final int refresh=0x7f090008; - public static final int senderNameText=0x7f09001f; - public static final int share_menu=0x7f09003b; - public static final int summaryText=0x7f090021; - public static final int testAnswerTypesAcceptButton=0x7f090025; - public static final int testAnswerTypesList=0x7f090024; - public static final int testAnswerTypesText=0x7f090023; + public static final int senderNameText=0x7f090020; + public static final int share_menu=0x7f09003c; + public static final int summaryText=0x7f090022; + public static final int testAnswerTypesAcceptButton=0x7f090026; + public static final int testAnswerTypesList=0x7f090025; + public static final int testAnswerTypesText=0x7f090024; public static final int testEvaluateButton=0x7f090006; - public static final int testMakeAnswer=0x7f090029; - public static final int testMakeBottomBar=0x7f09002e; - public static final int testMakeCorrectAnswer=0x7f09002c; - public static final int testMakeCorrectAnswerImage=0x7f09002a; - public static final int testMakeEditText=0x7f09002b; - public static final int testMakeList=0x7f09002d; - public static final int testMakeNextButton=0x7f090031; - public static final int testMakePrevButton=0x7f09002f; - public static final int testMakeQuestionScore=0x7f090027; - public static final int testMakeStem=0x7f090026; - public static final int testMakeText=0x7f090028; - public static final int testNumQuestionsAcceptButton=0x7f090037; - public static final int testNumQuestionsNumberPicker=0x7f090034; - public static final int testNumQuestionsText=0x7f090036; - public static final int testResultsButton=0x7f090035; - public static final int testResultsScore=0x7f090033; - public static final int testResultsText=0x7f090032; + public static final int testMakeAnswer=0x7f09002a; + public static final int testMakeBottomBar=0x7f09002f; + public static final int testMakeCorrectAnswer=0x7f09002d; + public static final int testMakeCorrectAnswerImage=0x7f09002b; + public static final int testMakeEditText=0x7f09002c; + public static final int testMakeList=0x7f09002e; + public static final int testMakeNextButton=0x7f090032; + public static final int testMakePrevButton=0x7f090030; + public static final int testMakeQuestionScore=0x7f090028; + public static final int testMakeStem=0x7f090027; + public static final int testMakeText=0x7f090029; + public static final int testNumQuestionsAcceptButton=0x7f090038; + public static final int testNumQuestionsNumberPicker=0x7f090035; + public static final int testNumQuestionsText=0x7f090037; + public static final int testResultsButton=0x7f090036; + public static final int testResultsScore=0x7f090034; + public static final int testResultsText=0x7f090033; public static final int testShowResultsButton=0x7f090004; - public static final int testTagsAcceptButton=0x7f09003a; - public static final int testTagsList=0x7f090039; - public static final int testTagsText=0x7f090038; - public static final int test_questions_bar=0x7f090030; - public static final int timepicker_input=0x7f09001d; + public static final int testTagsAcceptButton=0x7f09003b; + public static final int testTagsList=0x7f09003a; + public static final int testTagsText=0x7f090039; + public static final int test_questions_bar=0x7f090031; + public static final int timepicker_input=0x7f09001e; public static final int title_sep_1=0x7f090007; public static final int title_sep_2=0x7f090005; public static final int title_sep_3=0x7f090003; @@ -202,6 +203,7 @@ public final class R { public static final int marketURL=0x7f070065; public static final int marketWebURL=0x7f070066; public static final int marksFile=0x7f07002d; + public static final int marksMsg=0x7f070076; public static final int message=0x7f07002f; public static final int messageSendErrorMsg=0x7f07005e; public static final int messageSendedMsg=0x7f07005d; diff --git a/SWADroid/res/layout/notifications_list_item.xml b/SWADroid/res/layout/notifications_list_item.xml index 1683b67b..97bff01b 100644 --- a/SWADroid/res/layout/notifications_list_item.xml +++ b/SWADroid/res/layout/notifications_list_item.xml @@ -98,5 +98,15 @@ android:padding="1dip" android:autoLink="web" android:visibility="gone" /> + + \ No newline at end of file diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml index bac795f8..1e0854ca 100644 --- a/SWADroid/res/values-es/strings.xml +++ b/SWADroid/res/values-es/strings.xml @@ -120,4 +120,5 @@ Nuevas notificaciones nuevas notificaciones Enviado desde + Pulse sobre la notificación para ver la calificación. \ No newline at end of file diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml index bb8518c7..240a8e23 100644 --- a/SWADroid/res/values/strings.xml +++ b/SWADroid/res/values/strings.xml @@ -114,16 +114,17 @@ the e-learning platform SWAD.\nGet it for free here: https://market.android.com/details?id=es.ugr.swad.swadroid market://details?id=es.ugr.swad.swadroid - https://play.google.com/store/apps/details?id=es.ugr.swad.swadroidhttps://twitter.com/#!/SWADroid + http://goo.gl/Wgo1yhttps://twitter.com/#!/SWADroid https://www.facebook.com/SWADroid - https://plus.google.com/115615684349730524355/posts - https://groups.google.com/forum/#!forum/swadroid + http://goo.gl/kuezQ + http://goo.gl/3A5iO http://swadroid.wordpress.com \@SWADroidTwitter Facebook Google+ Mailing list BlogAndroid MarketNew notificationsnew notificationsSended from + Click on the notification to view the mark. diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java index ffac7665..6e3cee02 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java @@ -49,7 +49,7 @@ public class NotificationsCursorAdapter extends CursorAdapter { * @param c Database cursor */ public NotificationsCursorAdapter(Context context, Cursor c) { - super(context, c); + super(context, c, true); ctx = context; int numRows = c.getCount(); @@ -77,8 +77,9 @@ public class NotificationsCursorAdapter extends CursorAdapter { final Context ctx = context; final Long notificationCode = cursor.getLong(cursor.getColumnIndex("id")); long unixTime; - String type, sender, senderFirstname, senderSurname1, senderSurname2, summaryText; - String contentText; + String type = ""; + String sender, senderFirstname, senderSurname1, senderSurname2, summaryText; + String contentText, contentMsgText; String[] dateContent; Date d; int numRows = cursor.getCount(); @@ -95,6 +96,7 @@ public class NotificationsCursorAdapter extends CursorAdapter { TextView location = (TextView) view.findViewById(R.id.eventLocation); final TextView summary = (TextView) view.findViewById(R.id.eventSummary); TextView content = (TextView) view.findViewById(R.id.eventText); + TextView contentMsg = (TextView) view.findViewById(R.id.eventMsg); ImageView notificationIcon = (ImageView) view.findViewById(R.id.notificationIcon); ImageView messageReplyButton = (ImageView) view.findViewById(R.id.messageReplyButton); @@ -172,7 +174,7 @@ public class NotificationsCursorAdapter extends CursorAdapter { eventSender.setText(sender); } if(location != null) { - location.setText(cursor.getString(cursor.getColumnIndex("location"))); + location.setText(Html.fromHtml(cursor.getString(cursor.getColumnIndex("location")))); } if(summary != null){ summaryText = cursor.getString(cursor.getColumnIndex("summary")); @@ -189,13 +191,18 @@ public class NotificationsCursorAdapter extends CursorAdapter { //Empty field checking if(contentText.equals("anyType{}")) contentText = context.getString(R.string.noContentMsg); - - content.setText(contentText); + content.setText(contentText); + + if(type.equals(context.getString(R.string.marksFile))) { + contentMsgText = context.getString(R.string.marksMsg); + contentMsg.setText(contentMsgText); + contentVisible[cursor.getPosition()] = true; + } if(contentVisible[cursor.getPosition()]) { - content.setVisibility(View.VISIBLE); + contentMsg.setVisibility(View.VISIBLE); } else { - content.setVisibility(View.GONE); + contentMsg.setVisibility(View.GONE); } } }