Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

hides status text when it's empty

This commit is contained in:
Mariotaku Lee 2016-06-01 12:50:38 +08:00
parent 5afe40ae6b
commit 79ea126fec
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
twidere/src/main/java/org/mariotaku/twidere/fragment/StatusFragment.java
View File

@ -1027,18 +1027,17 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
ParcelableStatusUtils.applySpans(quotedText, status.quoted_spans);
linkify.applyAllLinks(quotedText, status.account_key, layoutPosition,
status.is_possibly_sensitive, skipLinksInText);
if (quotedDisplayEnd == 0 || quotedText.length() == 0) {
// No text
final SpannableString string = SpannableString.valueOf(context.getString(R.string.no_status_content_text));
string.setSpan(new ForegroundColorSpan(ThemeUtils.getColorFromAttribute(context,
android.R.attr.textColorTertiary, textView.getCurrentTextColor())), 0,
string.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
quotedTextView.setText(string);
} else if (quotedDisplayEnd != -1 && quotedDisplayEnd <= quotedText.length()) {
if (quotedDisplayEnd != -1 && quotedDisplayEnd <= quotedText.length()) {
quotedTextView.setText(quotedText.subSequence(0, quotedDisplayEnd));
} else {
quotedTextView.setText(quotedText);
}
if (quotedTextView.length() == 0) {
// No text
quotedTextView.setVisibility(View.GONE);
} else {
quotedTextView.setVisibility(View.VISIBLE);
}
quoteIndicator.setColor(status.quoted_user_color);
} else {
@ -1111,18 +1110,17 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
linkify.applyAllLinks(text, status.account_key, layoutPosition,
status.is_possibly_sensitive, skipLinksInText);
if (displayEnd == 0 || text.length() == 0) {
// No text
final SpannableString string = SpannableString.valueOf(context.getString(R.string.no_status_content_text));
string.setSpan(new ForegroundColorSpan(ThemeUtils.getColorFromAttribute(context,
android.R.attr.textColorTertiary, textView.getCurrentTextColor())), 0,
string.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setText(string);
} else if (displayEnd != -1 && displayEnd <= text.length()) {
if (displayEnd != -1 && displayEnd <= text.length()) {
textView.setText(text.subSequence(0, displayEnd));
} else {
textView.setText(text);
}
if (textView.length() == 0) {
// No text
textView.setVisibility(View.GONE);
} else {
textView.setVisibility(View.VISIBLE);
}
final ParcelableLocation location;
final String placeFullName;

32
twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java
View File

@ -288,19 +288,19 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
} else {
quotedText = status.quoted_text_unescaped;
}
if (quotedDisplayEnd == 0 || quotedText.length() == 0) {
// No text
final SpannableString string = SpannableString.valueOf(context.getString(R.string.no_status_content_text));
string.setSpan(new ForegroundColorSpan(ThemeUtils.getColorFromAttribute(context,
android.R.attr.textColorTertiary, textView.getCurrentTextColor())), 0,
string.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
quotedTextView.setText(string);
} else if (quotedDisplayEnd != -1 && quotedDisplayEnd <= quotedText.length()) {
if (quotedDisplayEnd != -1 && quotedDisplayEnd <= quotedText.length()) {
quotedTextView.setText(quotedText.subSequence(0, quotedDisplayEnd));
} else {
quotedTextView.setText(quotedText);
}
if (quotedTextView.length() == 0) {
// No text
quotedTextView.setVisibility(View.GONE);
} else {
quotedTextView.setVisibility(View.VISIBLE);
}
quoteIndicator.setColor(status.quoted_user_color);
} else {
quotedNameView.setVisibility(View.GONE);
@ -439,18 +439,18 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
} else {
text = status.text_unescaped;
}
if (displayEnd == 0 || text.length() == 0) {
// No text
final SpannableString string = SpannableString.valueOf(context.getString(R.string.no_status_content_text));
string.setSpan(new ForegroundColorSpan(ThemeUtils.getColorFromAttribute(context,
android.R.attr.textColorTertiary, textView.getCurrentTextColor())), 0,
string.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setText(string);
} else if (displayEnd != -1 && displayEnd <= text.length()) {
if (displayEnd != -1 && displayEnd <= text.length()) {
textView.setText(text.subSequence(0, displayEnd));
} else {
textView.setText(text);
}
if (textView.length() == 0) {
// No text
textView.setVisibility(View.GONE);
} else {
textView.setVisibility(View.VISIBLE);
}
if (replyCount > 0) {
replyCountView.setText(UnitConvertUtils.calculateProperCount(replyCount));