Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Helena Rodriguez 2012-10-15 17:36:05 +02:00
commit 19500a33fd
4 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SWADroid/project.properties
View File

@ -8,5 +8,5 @@
# project structure.
# Project target.
target=android-15
target=Google Inc.:Google APIs:16
android.library=false

44
SWADroid/res/layout/notifications_list_item.xml
View File

@ -21,21 +21,6 @@
android:layout_height="wrap_content">
</ImageView>
<TextView
android:id="@+id/eventDate"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:textColor="@color/foreground2"
android:layout_marginTop="6dip" />
<TextView
android:id="@+id/eventTime"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:textColor="@color/foreground2" />
<TextView
android:id="@+id/eventSender"
android:layout_height="wrap_content"
@ -45,7 +30,7 @@
android:textColor="@color/foreground2"
android:layout_marginBottom="6dip"
android:padding="1dip" />
<!--
<ImageView
android:id="@+id/messageReplyButton"
android:layout_width="wrap_content"
@ -53,7 +38,7 @@
android:cropToPadding="false"
android:background="@drawable/message_reply"
android:clickable="true"
android:visibility="gone" />
android:visibility="gone" />-->
</LinearLayout>
<LinearLayout
@ -91,6 +76,31 @@
android:layout_width="match_parent"
android:textColor="@color/foreground1"
android:padding="1dip" />
<RelativeLayout
android:id="@+id/dateAndTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/eventDate"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:gravity="center_horizontal"
android:textColor="@color/foreground2"
android:text="Date"/>
<TextView
android:id="@+id/eventTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/eventDate"
android:layout_toRightOf="@id/eventDate"
android:layout_marginLeft="10dp"
android:text="TIme"
android:textColor="@color/foreground2" />
</RelativeLayout>
<TextView
android:id="@+id/eventSummary"

13
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java
View File

@ -91,12 +91,13 @@ public class NotificationItem extends MenuActivity {
summaryTextView.setText(summary);
//If the user photo exists and is public, download and show it
if(Global.connectionAvailable(this) && !userPhoto.equalsIgnoreCase("")) {
//userPhotoView.setImageURI(Uri.parse(userPhoto));
new DownloadImageTask(userPhotoView).execute(userPhoto);
} else {
Log.d("NotificationItem", "No connection or no photo " + userPhoto);
}
if(userPhoto != null)
if(Global.connectionAvailable(this) && !userPhoto.equalsIgnoreCase("")) {
//userPhotoView.setImageURI(Uri.parse(userPhoto));
new DownloadImageTask(userPhotoView).execute(userPhoto);
} else {
Log.d("NotificationItem", "No connection or no photo " + userPhoto);
}
content = fixLinks(content);
webview.getSettings().setRenderPriority(RenderPriority.HIGH);

12
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
View File

@ -103,8 +103,8 @@ public class NotificationsCursorAdapter extends CursorAdapter {
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);
//ImageView messageReplyButton = (ImageView) view.findViewById(R.id.messageReplyButton);
/*
OnClickListener replyMessageListener = new OnClickListener() {
public void onClick(View v) {
Intent activity = new Intent(ctx.getApplicationContext(), Messages.class);
@ -112,13 +112,13 @@ public class NotificationsCursorAdapter extends CursorAdapter {
activity.putExtra("summary", summary.getText().toString());
ctx.startActivity(activity);
}
};
};*/
if(eventType != null) {
eventCode.setText(notificationCode.toString());
eventUserPhoto.setText(userPhoto);
type = cursor.getString(cursor.getColumnIndex("eventType"));
messageReplyButton.setVisibility(View.GONE);
//messageReplyButton.setVisibility(View.GONE);
if(type.equals("examAnnouncement"))
{
@ -136,8 +136,8 @@ public class NotificationsCursorAdapter extends CursorAdapter {
{
type = context.getString(R.string.message);
notificationIcon.setImageResource(R.drawable.msg_received);
messageReplyButton.setOnClickListener(replyMessageListener);
messageReplyButton.setVisibility(View.VISIBLE);
//messageReplyButton.setOnClickListener(replyMessageListener);
//messageReplyButton.setVisibility(View.VISIBLE);
} else if(type.equals("forumReply"))
{
type = context.getString(R.string.forumReply);