From cd633f13b8d7327e47994bb5a000f0c0b7089e7f Mon Sep 17 00:00:00 2001 From: steckbrief Date: Wed, 11 Jan 2017 15:12:53 +0100 Subject: Formatting of remote file status adjusted --- .../de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java | 4 ++-- src/main/res/layout/message_sent.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java index a6bdec69..79ab3bc3 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java @@ -238,9 +238,9 @@ public class MessageAdapter extends ArrayAdapter { FileStatus fileStatus = message.getFileParams().getFileStatus(); if (fileStatus == FileStatus.DELETE_FAILED || fileStatus == FileStatus.DELETED || fileStatus == FileStatus.DELETING) { viewHolder.remoteFileStatus.setVisibility(View.VISIBLE); - viewHolder.remoteFileStatus.setTypeface(null, Typeface.ITALIC); switch (fileStatus) { case DELETE_FAILED: + TextViewUtil.setColor(viewHolder.remoteFileStatus, R.color.error); viewHolder.remoteFileStatus.setText(R.string.remote_filestatus_delete_failed); break; case DELETED: @@ -629,7 +629,7 @@ public class MessageAdapter extends ArrayAdapter { viewHolder.status_message = TextViewUtil.visible(view, R.id.status_message); } if (SENT == type) { - viewHolder.remoteFileStatus = TextViewUtil.visible(view, R.id.remote_file_status); + viewHolder.remoteFileStatus = TextViewUtil.gone(view, R.id.remote_file_status); } view.setTag(viewHolder); diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index f59c51f3..8bda9c8f 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -117,7 +117,7 @@ android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo" android:visibility="gone" - android:textStyle="italic"/> + android:textStyle="normal|italic"/> -- cgit v1.2.3