sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scale text size if topic is long

This commit is contained in:
Daniel Gultsch 2018-06-23 13:14:12 +02:00
parent 7a991d2d8c
commit a934054038
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -51,6 +51,8 @@ import eu.siacs.conversations.services.XmppConnectionService.OnMucRosterUpdate;
import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
import eu.siacs.conversations.ui.util.MyLinkify; import eu.siacs.conversations.ui.util.MyLinkify;
import eu.siacs.conversations.ui.util.SoftKeyboardUtils; import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
import eu.siacs.conversations.utils.EmojiWrapper;
import eu.siacs.conversations.utils.StylingHelper;
import eu.siacs.conversations.utils.UIHelper; import eu.siacs.conversations.utils.UIHelper;
import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.utils.XmppUri;
import rocks.xmpp.addr.Jid; import rocks.xmpp.addr.Jid;
@ -265,6 +267,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.binding.editMucNameButton.setOnClickListener(this::onMucEditButtonClicked); this.binding.editMucNameButton.setOnClickListener(this::onMucEditButtonClicked);
this.binding.mucEditTitle.addTextChangedListener(this); this.binding.mucEditTitle.addTextChangedListener(this);
this.binding.mucEditSubject.addTextChangedListener(this); this.binding.mucEditSubject.addTextChangedListener(this);
this.binding.mucEditSubject.addTextChangedListener(new StylingHelper.MessageEditorStyler(this.binding.mucEditSubject));
} }
@Override @Override
@ -614,15 +617,17 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.binding.mucTitle.setText(roomName); this.binding.mucTitle.setText(roomName);
this.binding.mucTitle.setVisibility(View.VISIBLE); this.binding.mucTitle.setVisibility(View.VISIBLE);
} else if (!printableValue(subject)) { } else if (!printableValue(subject)) {
this.binding.mucTitle.setText(mConversation.getName()); this.binding.mucTitle.setText(EmojiWrapper.transform(mConversation.getName()));
this.binding.mucTitle.setVisibility(View.VISIBLE); this.binding.mucTitle.setVisibility(View.VISIBLE);
} else { } else {
this.binding.mucTitle.setVisibility(View.GONE); this.binding.mucTitle.setVisibility(View.GONE);
} }
if (printableValue(subject)) { if (printableValue(subject)) {
SpannableStringBuilder spannable = new SpannableStringBuilder(subject); SpannableStringBuilder spannable = new SpannableStringBuilder(subject);
StylingHelper.format(spannable, this.binding.mucSubject.getCurrentTextColor());
MyLinkify.addLinks(spannable, false); MyLinkify.addLinks(spannable, false);
this.binding.mucSubject.setText(spannable); this.binding.mucSubject.setText(EmojiWrapper.transform(spannable));
this.binding.mucSubject.setTextAppearance(this,subject.length() > 120 ? R.style.TextAppearance_Conversations_Body1_Linkified : R.style.TextAppearance_Conversations_Subhead);
this.binding.mucSubject.setAutoLinkMask(0); this.binding.mucSubject.setAutoLinkMask(0);
this.binding.mucSubject.setVisibility(View.VISIBLE); this.binding.mucSubject.setVisibility(View.VISIBLE);
} else { } else {

4
src/main/res/values/styles.xml
View File

@ -23,6 +23,10 @@
<item name="android:textColorLink">?android:textColorPrimary</item> <item name="android:textColorLink">?android:textColorPrimary</item>
</style> </style>
<style name="TextAppearance.Conversations.Body1.Linkified" parent="TextAppearance.AppCompat.Body1">
<item name="android:textSize">?TextSizeBody1</item>
</style>
<style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption"> <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption">
<item name="android:textSize">?TextSizeCaption</item> <item name="android:textSize">?TextSizeCaption</item>
</style> </style>