moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2025-02-17 23:40:20 -05:00
Code Issues Releases Wiki Activity

Remove color codes if the mirc colors option is off. Fixes #57

Browse Source
This commit is contained in:
Sebastian Kaspari 2011-04-14 22:53:38 +02:00
parent 86e0812741
commit c6dbe8cc18
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/src/org/yaaic/model/Message.java
View File

@ -229,15 +229,24 @@ public class Message
String prefix = hasIcon() && settings.showIcons() ? " " : ""; String prefix = hasIcon() && settings.showIcons() ? " " : "";
String nick = hasSender() ? "<" + sender + "> " : ""; String nick = hasSender() ? "<" + sender + "> " : "";
String timestamp = settings.showTimestamp() ? renderTimeStamp(settings.use24hFormat()) : ""; String timestamp = settings.showTimestamp() ? renderTimeStamp(settings.use24hFormat()) : "";
canvas = new SpannableString(prefix + timestamp + nick); canvas = new SpannableString(prefix + timestamp + nick);
SpannableString renderedText = new SpannableString(text); SpannableString renderedText;
if (settings.showMircColors()) { if (settings.showMircColors()) {
renderedText = MircColors.toSpannable(text); renderedText = MircColors.toSpannable(text);
} else {
renderedText = new SpannableString(
MircColors.removeStyleAndColors(text)
);
} }
if (settings.showGraphicalSmilies()) { if (settings.showGraphicalSmilies()) {
renderedText = Smilies.toSpannable(renderedText, context); renderedText = Smilies.toSpannable(renderedText, context);
} }
canvas = new SpannableString(TextUtils.concat(canvas, renderedText)); canvas = new SpannableString(TextUtils.concat(canvas, renderedText));
if (hasSender()) { if (hasSender()) {
int start = (prefix + timestamp).length() + 1; int start = (prefix + timestamp).length() + 1;
int end = start + sender.length(); int end = start + sender.length();
@ -252,14 +261,17 @@ public class Message
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
canvas.setSpan(new ImageSpan(drawable, ImageSpan.ALIGN_BOTTOM), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); canvas.setSpan(new ImageSpan(drawable, ImageSpan.ALIGN_BOTTOM), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
if (hasColor() && settings.showColors()) { if (hasColor() && settings.showColors()) {
// Only apply the foreground color to areas that don't already have a foreground color. // Only apply the foreground color to areas that don't already have a foreground color.
ForegroundColorSpan[] spans = canvas.getSpans(0, canvas.length(), ForegroundColorSpan.class); ForegroundColorSpan[] spans = canvas.getSpans(0, canvas.length(), ForegroundColorSpan.class);
int start = 0; int start = 0;
for (int i = 0; i < spans.length; i++) { for (int i = 0; i < spans.length; i++) {
canvas.setSpan(new ForegroundColorSpan(color), start, canvas.getSpanStart(spans[i]), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); canvas.setSpan(new ForegroundColorSpan(color), start, canvas.getSpanStart(spans[i]), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
start = canvas.getSpanEnd(spans[i]); start = canvas.getSpanEnd(spans[i]);
} }
canvas.setSpan(new ForegroundColorSpan(color), start, canvas.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); canvas.setSpan(new ForegroundColorSpan(color), start, canvas.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
} }