aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-01-18 13:44:18 +0100
committeriNPUTmice <daniel@gultsch.de>2015-01-18 13:44:18 +0100
commit6756386eee42e0bd7995c82be75a2179f8f61099 (patch)
treeb89ebb015ff56211246691f19be5df9a4a56807c /src
parentd58fadd05f303c594c05fca8307e0ac38425b817 (diff)
explain read marker
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java26
-rw-r--r--src/main/res/layout/message_status.xml13
2 files changed, 19 insertions, 20 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 1d8b2e44..1d4e2493 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -35,7 +35,6 @@ import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.entities.Message.ImageParams;
import eu.siacs.conversations.ui.ConversationActivity;
import eu.siacs.conversations.utils.UIHelper;
-import eu.siacs.conversations.xmpp.jid.Jid;
public class MessageAdapter extends ArrayAdapter<Message> {
@@ -388,10 +387,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
.findViewById(R.id.indicator_received);
break;
case STATUS:
- view = activity.getLayoutInflater().inflate(
- R.layout.message_status, parent, false);
- viewHolder.contact_picture = (ImageView) view
- .findViewById(R.id.message_photo);
+ view = activity.getLayoutInflater().inflate(R.layout.message_status, parent, false);
+ viewHolder.contact_picture = (ImageView) view.findViewById(R.id.message_photo);
+ viewHolder.status_message = (TextView) view.findViewById(R.id.status_message);
break;
default:
viewHolder = null;
@@ -411,20 +409,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
.avatarService().get(conversation.getContact(),
activity.getPixel(32)));
viewHolder.contact_picture.setAlpha(0.5f);
- viewHolder.contact_picture
- .setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- String name = conversation.getName();
- String read = getContext()
- .getString(
- R.string.contact_has_read_up_to_this_point,
- name);
- Toast.makeText(getContext(), read,
- Toast.LENGTH_SHORT).show();
- }
- });
+ viewHolder.status_message.setText(
+ activity.getString(R.string.contact_has_read_up_to_this_point, conversation.getName()));
}
return view;
@@ -577,6 +563,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
protected TextView time;
protected TextView messageBody;
protected ImageView contact_picture;
-
+ protected TextView status_message;
}
}
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d5f8bb33..20544cd5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -19,4 +19,17 @@
android:scaleType="fitXY"
android:src="@drawable/ic_profile" />
+ <TextView
+ android:id="@+id/status_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="8dp"
+ android:layout_toEndOf="@+id/message_photo"
+ android:layout_toRightOf="@+id/message_photo"
+ android:text="@string/contact_has_read_up_to_this_point"
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeInfo"
+ android:textStyle="italic"/>
+
</RelativeLayout> \ No newline at end of file