aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2017-01-11 15:12:53 +0100
committersteckbrief <steckbrief@chefmail.de>2017-01-11 15:12:53 +0100
commitcd633f13b8d7327e47994bb5a000f0c0b7089e7f (patch)
tree43ff61108c39d922ed0b711b5ff01fb95c9cf3a6 /src/main
parent0a9bba28616e594279cd659ec2eb57da2074b3cd (diff)
Formatting of remote file status adjustedtrz/rename
Diffstat (limited to '')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java4
-rw-r--r--src/main/res/layout/message_sent.xml2
2 files changed, 3 insertions, 3 deletions
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<Message> {
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<Message> {
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"/>
</LinearLayout>
</LinearLayout>