narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

changed text styling to keep the keyword

Browse source
This commit is contained in:
Daniel Gultsch 2017-11-06 23:44:00 +01:00
parent e0643f687b
commit 22c37bd430
2 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -411,6 +411,13 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
viewHolder.image.setVisibility(View.GONE); viewHolder.image.setVisibility(View.GONE);
viewHolder.audioPlayer.setVisibility(View.GONE); viewHolder.audioPlayer.setVisibility(View.GONE);
viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody.setVisibility(View.VISIBLE);
viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setHighlightColor(ContextCompat.getColor(activity, darkBackground
? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500));
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
if (message.getBody() != null) { if (message.getBody() != null) {
final String nick = UIHelper.getMessageDisplayName(message); final String nick = UIHelper.getMessageDisplayName(message);
SpannableStringBuilder body = message.getMergedBody(); SpannableStringBuilder body = message.getMergedBody();
@ -477,7 +484,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
body.setSpan(new RelativeSizeSpan(1.2f), matcher.start(), matcher.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); body.setSpan(new RelativeSizeSpan(1.2f), matcher.start(), matcher.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
StylingHelper.format(body, true); StylingHelper.format(body, viewHolder.messageBody.getCurrentTextColor());
Linkify.addLinks(body, XMPP_PATTERN, "xmpp"); Linkify.addLinks(body, XMPP_PATTERN, "xmpp");
Linkify.addLinks(body, Patterns.AUTOLINK_WEB_URL, "http", WEBURL_MATCH_FILTER, WEBURL_TRANSFORM_FILTER); Linkify.addLinks(body, Patterns.AUTOLINK_WEB_URL, "http", WEBURL_MATCH_FILTER, WEBURL_TRANSFORM_FILTER);
@ -491,11 +498,6 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
viewHolder.messageBody.setText(""); viewHolder.messageBody.setText("");
viewHolder.messageBody.setTextIsSelectable(false); viewHolder.messageBody.setTextIsSelectable(false);
} }
viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setHighlightColor(ContextCompat.getColor(activity, darkBackground
? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500));
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
} }
private void displayDownloadableMessage(ViewHolder viewHolder, final Message message, String text) { private void displayDownloadableMessage(ViewHolder viewHolder, final Message message, String text) {

33
src/main/java/eu/siacs/conversations/utils/StylingHelper.java
View file

@ -63,25 +63,17 @@ public class StylingHelper {
} }
} }
public static void format(final Editable editable) {
format(editable, false);
}
public static void format(final Editable editable, final boolean replaceStyleAnnotation) {
for (ImStyleParser.Style style : ImStyleParser.parse(editable)) {
editable.setSpan(createSpanForStyle(style), style.getStart(), style.getEnd(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (replaceStyleAnnotation) {
editable.replace(style.getStart(), style.getStart() + 1, "\u200B");
editable.replace(style.getEnd(), style.getEnd() + 1, "\u200B");
}
}
}
public static void format(final Editable editable, @ColorInt int color) { public static void format(final Editable editable, @ColorInt int color) {
final int syntaxColor = Color.argb(
Math.round(Color.alpha(color) * 0.6f),
Color.red(color),
Color.green(color),
Color.blue(color)
);
for(ImStyleParser.Style style : ImStyleParser.parse(editable)) { for(ImStyleParser.Style style : ImStyleParser.parse(editable)) {
editable.setSpan(createSpanForStyle(style), style.getStart() + 1, style.getEnd(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); editable.setSpan(createSpanForStyle(style), style.getStart() + 1, style.getEnd(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
editable.setSpan(new ForegroundColorSpan(color),style.getStart(),style.getStart()+1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); editable.setSpan(new ForegroundColorSpan(syntaxColor),style.getStart(),style.getStart()+1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
editable.setSpan(new ForegroundColorSpan(color),style.getEnd(),style.getEnd()+1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); editable.setSpan(new ForegroundColorSpan(syntaxColor),style.getEnd(),style.getEnd()+1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
} }
@ -121,14 +113,7 @@ public class StylingHelper {
@Override @Override
public void afterTextChanged(Editable editable) { public void afterTextChanged(Editable editable) {
clear(editable); clear(editable);
final int color = mEditText.getCurrentTextColor(); format(editable,mEditText.getCurrentTextColor());
final int syntaxColor = Color.argb(
Math.round(Color.alpha(color) * 0.6f),
Color.red(color),
Color.green(color),
Color.blue(color)
);
format(editable,syntaxColor);
} }
} }
} }