TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2276 from mcginty/group-meta-colors

Browse Source 
group visual fixes
This commit is contained in:
Moxie Marlinspike 2014-12-29 14:37:45 -08:00
commit 4d8004ab21
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/database/model/MessageRecord.java
View File

@ -19,6 +19,8 @@ package org.thoughtcrime.securesms.database.model;
import android.content.Context; import android.content.Context;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.text.style.TextAppearanceSpan; import android.text.style.TextAppearanceSpan;
@ -177,7 +179,7 @@ public abstract class MessageRecord extends DisplayRecord {
protected SpannableString emphasisAdded(String sequence) { protected SpannableString emphasisAdded(String sequence) {
SpannableString spannable = new SpannableString(sequence); SpannableString spannable = new SpannableString(sequence);
spannable.setSpan(new TextAppearanceSpan(context, android.R.style.TextAppearance_Small), 0, sequence.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); spannable.setSpan(new RelativeSizeSpan(0.9f), 0, sequence.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannable.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), 0, sequence.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); spannable.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), 0, sequence.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable; return spannable;

15
src/org/thoughtcrime/securesms/util/GroupUtil.java
View File

@ -37,20 +37,21 @@ public class GroupUtil {
} }
try { try {
String description = ""; StringBuilder description = new StringBuilder();
GroupContext groupContext = GroupContext.parseFrom(Base64.decode(encodedGroup)); GroupContext groupContext = GroupContext.parseFrom(Base64.decode(encodedGroup));
List<String> members = groupContext.getMembersList(); List<String> members = groupContext.getMembersList();
String title = groupContext.getName(); String title = groupContext.getName();
if (!members.isEmpty()) { if (!members.isEmpty()) {
description += context.getString(R.string.GroupUtil_joined_the_group, Util.join(members, ", ")); description.append(context.getString(R.string.GroupUtil_joined_the_group, Util.join(members, ", ")));
} }
if (title != null && !title.trim().isEmpty()) { if (title != null && !title.trim().isEmpty()) {
description += context.getString(R.string.GroupUtil_title_is_now, title); if (description.length() > 0) description.append(" ");
description.append(context.getString(R.string.GroupUtil_title_is_now, title));
} }
return description; return description.toString();
} catch (InvalidProtocolBufferException e) { } catch (InvalidProtocolBufferException e) {
Log.w("GroupUtil", e); Log.w("GroupUtil", e);
return context.getString(R.string.GroupUtil_group_updated); return context.getString(R.string.GroupUtil_group_updated);