From e479bf0a4dbb3aad8da320a8b676cc2d27fb336e Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 26 Feb 2014 20:59:18 +0000
Subject: [PATCH] Show private message timestamp in grey below content.
---
briar-android/res/values/color.xml | 1 +
.../android/contact/ConversationAdapter.java | 27 ++++++++++---------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index c306f6ddbb..d05bd0428c 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -9,4 +9,5 @@
<color name="compose_background">#FFFFFF</color>
<color name="horizontal_border">#CCCCCC</color>
<color name="no_posts">#AAAAAA</color>
+ <color name="private_message_date">#AAAAAA</color>
</resources>
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
index 3a3ae841ee..ce82052daf 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
@@ -48,18 +48,6 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
if(header.isRead()) background = res.getColor(R.color.read_background);
else background = res.getColor(R.color.unread_background);
- TextView date = new TextView(ctx);
- date.setId(1);
- date.setLayoutParams(MATCH_WRAP);
- if(header.isLocal()) date.setGravity(RIGHT);
- else date.setGravity(LEFT);
- date.setTextSize(14);
- date.setBackgroundColor(background);
- date.setPadding(pad, pad, pad, 0);
- long timestamp = header.getTimestamp();
- date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
- layout.addView(date);
-
View content;
if(item.getBody() == null) {
TextView ellipsis = new TextView(ctx);
@@ -77,9 +65,22 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
content.setId(2);
content.setLayoutParams(MATCH_WRAP);
content.setBackgroundColor(background);
- content.setPadding(pad, 0, pad, pad);
+ content.setPadding(pad, pad, pad, 0);
layout.addView(content);
+ TextView date = new TextView(ctx);
+ date.setId(1);
+ date.setLayoutParams(MATCH_WRAP);
+ if(header.isLocal()) date.setGravity(RIGHT);
+ else date.setGravity(LEFT);
+ date.setTextSize(14);
+ date.setTextColor(res.getColor(R.color.private_message_date));
+ date.setBackgroundColor(background);
+ date.setPadding(pad, 0, pad, pad);
+ long timestamp = header.getTimestamp();
+ date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
+ layout.addView(date);
+
return layout;
}
}
\ No newline at end of file
--
GitLab