emoji bug fix, added emoji picker feedback
This commit is contained in:
nuclearfog
parent
e74a59aa71
commit
e6d240622b
|
|
@ -729,34 +729,41 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
|
|||
*/
|
||||
private void setUser(@NonNull User user) {
|
||||
this.user = user;
|
||||
Spannable descriptionSpan = null;
|
||||
|
||||
following.setText(StringUtils.NUMBER_FORMAT.format(user.getFollowing()));
|
||||
follower.setText(StringUtils.NUMBER_FORMAT.format(user.getFollower()));
|
||||
following.setVisibility(VISIBLE);
|
||||
follower.setVisibility(VISIBLE);
|
||||
username.setText(user.getUsername());
|
||||
user_createdAt.setVisibility(VISIBLE);
|
||||
screenName.setText(user.getScreenname());
|
||||
// set status count
|
||||
if (user.getStatusCount() >= 0) {
|
||||
tabSelector.setLabel(0, StringUtils.NUMBER_FORMAT.format(user.getStatusCount()));
|
||||
} else {
|
||||
tabSelector.setLabel(0, "");
|
||||
}
|
||||
// set favorites count
|
||||
if (user.getFavoriteCount() >= 0) {
|
||||
tabSelector.setLabel(1, StringUtils.NUMBER_FORMAT.format(user.getFavoriteCount()));
|
||||
} else {
|
||||
tabSelector.setLabel(1, "");
|
||||
}
|
||||
if (user_createdAt.getVisibility() != VISIBLE) {
|
||||
user_createdAt.setVisibility(VISIBLE);
|
||||
// set username and emojis
|
||||
if (!user.getUsername().trim().isEmpty() && user.getEmojis().length > 0) {
|
||||
Spannable usernameSpan = new SpannableString(user.getUsername());
|
||||
usernameSpan = EmojiUtils.removeTags(usernameSpan);
|
||||
username.setText(usernameSpan);
|
||||
} else {
|
||||
username.setText(user.getUsername());
|
||||
}
|
||||
// set user join date
|
||||
if (settings.getLogin().getConfiguration() == Configuration.MASTODON) {
|
||||
user_createdAt.setText(SimpleDateFormat.getDateInstance().format(user.getTimestamp()));
|
||||
} else {
|
||||
user_createdAt.setText(SimpleDateFormat.getDateTimeInstance().format(user.getTimestamp()));
|
||||
}
|
||||
}
|
||||
// set user description
|
||||
if (!user.getDescription().isEmpty()) {
|
||||
descriptionSpan = Tagger.makeTextWithLinks(user.getDescription(), settings.getHighlightColor(), this);
|
||||
Spannable descriptionSpan = Tagger.makeTextWithLinks(user.getDescription(), settings.getHighlightColor(), this);
|
||||
if (user.getEmojis().length > 0) {
|
||||
descriptionSpan = EmojiUtils.removeTags(descriptionSpan);
|
||||
}
|
||||
|
|
@ -765,24 +772,28 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
|
|||
} else {
|
||||
description.setVisibility(GONE);
|
||||
}
|
||||
// set user verified icon
|
||||
if (user.isVerified()) {
|
||||
username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.verify, 0, 0, 0);
|
||||
AppStyles.setDrawableColor(username, settings.getIconColor());
|
||||
} else {
|
||||
username.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
||||
}
|
||||
// set user protected icon
|
||||
if (user.isProtected()) {
|
||||
screenName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.lock, 0, 0, 0);
|
||||
AppStyles.setDrawableColor(screenName, settings.getIconColor());
|
||||
} else {
|
||||
screenName.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
||||
}
|
||||
// set user location
|
||||
if (!user.getLocation().isEmpty()) {
|
||||
user_location.setText(user.getLocation());
|
||||
user_location.setVisibility(VISIBLE);
|
||||
} else {
|
||||
user_location.setVisibility(GONE);
|
||||
}
|
||||
// set profile url
|
||||
if (!user.getProfileUrl().isEmpty()) {
|
||||
String link = user.getProfileUrl();
|
||||
if (link.startsWith("http://"))
|
||||
|
|
@ -795,6 +806,7 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
|
|||
} else {
|
||||
user_website.setVisibility(GONE);
|
||||
}
|
||||
// set profile/banner images
|
||||
if (settings.imagesEnabled()) {
|
||||
String bannerImageUrl = user.getBannerImageThumbnailUrl();
|
||||
String profileImageUrl = user.getProfileImageThumbnailUrl();
|
||||
|
|
@ -811,13 +823,15 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
|
|||
profileImage.setImageResource(0);
|
||||
}
|
||||
}
|
||||
// initialize emoji loading for username/description
|
||||
if (settings.imagesEnabled() && user.getEmojis().length > 0) {
|
||||
if (!user.getUsername().isEmpty()) {
|
||||
SpannableString usernameSpan = new SpannableString(user.getUsername());
|
||||
EmojiParam param = new EmojiParam(user.getEmojis(), usernameSpan, getResources().getDimensionPixelSize(R.dimen.profile_icon_size));
|
||||
emojiLoader.execute(param, usernameUpdate);
|
||||
}
|
||||
if (descriptionSpan != null) {
|
||||
if (!user.getDescription().trim().isEmpty()) {
|
||||
Spannable descriptionSpan = new SpannableString(user.getDescription());
|
||||
EmojiParam param = new EmojiParam(user.getEmojis(), descriptionSpan, getResources().getDimensionPixelSize(R.dimen.profile_icon_size));
|
||||
emojiLoader.execute(param, userDescriptionUpdate);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -224,10 +224,10 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
private ViewGroup root, header;
|
||||
private NestedScrollView container;
|
||||
private LockableConstraintLayout body;
|
||||
private TextView statusApi, createdAt, statusText, screenName, username, locationName, sensitive, spoiler, spoilerHint, translateText;
|
||||
private Button replyButton, repostButton, likeButton, replyName, repostNameButton;
|
||||
private ImageView profileImage;
|
||||
private RecyclerView cardList;
|
||||
private TextView status_source, created_at, status_text, screen_name, username, location_name, sensitive, spoiler, spoiler_hint, translate_text;
|
||||
private Button reply_button, repost_button, like_button, reply_name, repost_name_button;
|
||||
private ImageView profile_image;
|
||||
private RecyclerView card_list;
|
||||
private Toolbar toolbar;
|
||||
|
||||
@Nullable
|
||||
|
|
@ -252,23 +252,23 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
body = findViewById(R.id.page_status_body);
|
||||
container = findViewById(R.id.page_status_scroll);
|
||||
toolbar = findViewById(R.id.page_status_toolbar);
|
||||
replyButton = findViewById(R.id.page_status_reply);
|
||||
repostButton = findViewById(R.id.page_status_repost);
|
||||
likeButton = findViewById(R.id.page_status_favorite);
|
||||
reply_button = findViewById(R.id.page_status_reply);
|
||||
repost_button = findViewById(R.id.page_status_repost);
|
||||
like_button = findViewById(R.id.page_status_favorite);
|
||||
username = findViewById(R.id.page_status_username);
|
||||
screenName = findViewById(R.id.page_status_screenname);
|
||||
profileImage = findViewById(R.id.page_status_profile);
|
||||
replyName = findViewById(R.id.page_status_reply_reference);
|
||||
statusText = findViewById(R.id.page_status_text);
|
||||
createdAt = findViewById(R.id.page_status_date);
|
||||
statusApi = findViewById(R.id.page_status_api);
|
||||
locationName = findViewById(R.id.page_status_location_name);
|
||||
screen_name = findViewById(R.id.page_status_screenname);
|
||||
profile_image = findViewById(R.id.page_status_profile);
|
||||
reply_name = findViewById(R.id.page_status_reply_reference);
|
||||
status_text = findViewById(R.id.page_status_text);
|
||||
created_at = findViewById(R.id.page_status_date);
|
||||
status_source = findViewById(R.id.page_status_api);
|
||||
location_name = findViewById(R.id.page_status_location_name);
|
||||
sensitive = findViewById(R.id.page_status_sensitive);
|
||||
spoiler = findViewById(R.id.page_status_spoiler);
|
||||
repostNameButton = findViewById(R.id.page_status_reposter_reference);
|
||||
translateText = findViewById(R.id.page_status_text_translate);
|
||||
spoilerHint = findViewById(R.id.page_status_text_sensitive_hint);
|
||||
cardList = findViewById(R.id.page_status_cards);
|
||||
repost_name_button = findViewById(R.id.page_status_reposter_reference);
|
||||
translate_text = findViewById(R.id.page_status_text_translate);
|
||||
spoiler_hint = findViewById(R.id.page_status_text_sensitive_hint);
|
||||
card_list = findViewById(R.id.page_status_cards);
|
||||
|
||||
statusLoader = new StatusAction(this);
|
||||
pollLoader = new PollAction(this);
|
||||
|
|
@ -281,27 +281,27 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
|
||||
adapter = new PreviewAdapter(settings, picasso, this);
|
||||
|
||||
replyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.answer, 0, 0, 0);
|
||||
repostButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.repost, 0, 0, 0);
|
||||
locationName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.location, 0, 0, 0);
|
||||
reply_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.answer, 0, 0, 0);
|
||||
repost_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.repost, 0, 0, 0);
|
||||
location_name.setCompoundDrawablesWithIntrinsicBounds(R.drawable.location, 0, 0, 0);
|
||||
sensitive.setCompoundDrawablesWithIntrinsicBounds(R.drawable.sensitive, 0, 0, 0);
|
||||
spoiler.setCompoundDrawablesWithIntrinsicBounds(R.drawable.exclamation, 0, 0, 0);
|
||||
replyName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.back, 0, 0, 0);
|
||||
repostNameButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.repost, 0, 0, 0);
|
||||
statusText.setMovementMethod(LinkAndScrollMovement.getInstance());
|
||||
statusText.setLinkTextColor(settings.getHighlightColor());
|
||||
cardList.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
|
||||
cardList.setAdapter(adapter);
|
||||
reply_name.setCompoundDrawablesWithIntrinsicBounds(R.drawable.back, 0, 0, 0);
|
||||
repost_name_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.repost, 0, 0, 0);
|
||||
status_text.setMovementMethod(LinkAndScrollMovement.getInstance());
|
||||
status_text.setLinkTextColor(settings.getHighlightColor());
|
||||
card_list.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
|
||||
card_list.setAdapter(adapter);
|
||||
if (settings.likeEnabled()) {
|
||||
likeButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.like, 0, 0, 0);
|
||||
like_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.like, 0, 0, 0);
|
||||
} else {
|
||||
likeButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.favorite, 0, 0, 0);
|
||||
like_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.favorite, 0, 0, 0);
|
||||
}
|
||||
toolbar.setTitle("");
|
||||
setSupportActionBar(toolbar);
|
||||
AppStyles.setTheme(root);
|
||||
locationName.setTextColor(settings.getHighlightColor());
|
||||
translateText.setTextColor(settings.getHighlightColor());
|
||||
location_name.setTextColor(settings.getHighlightColor());
|
||||
translate_text.setTextColor(settings.getHighlightColor());
|
||||
|
||||
// get parameters
|
||||
if (savedInstanceState == null) {
|
||||
|
|
@ -369,19 +369,19 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
confirmDialog = new ConfirmDialog(this);
|
||||
metricsDialog = new MetricsDialog(this);
|
||||
confirmDialog.setConfirmListener(this);
|
||||
repostNameButton.setOnClickListener(this);
|
||||
replyName.setOnClickListener(this);
|
||||
translateText.setOnClickListener(this);
|
||||
replyButton.setOnClickListener(this);
|
||||
repostButton.setOnClickListener(this);
|
||||
likeButton.setOnClickListener(this);
|
||||
profileImage.setOnClickListener(this);
|
||||
locationName.setOnClickListener(this);
|
||||
repostButton.setOnLongClickListener(this);
|
||||
likeButton.setOnLongClickListener(this);
|
||||
repostNameButton.setOnLongClickListener(this);
|
||||
locationName.setOnLongClickListener(this);
|
||||
statusText.setOnClickListener(this);
|
||||
repost_name_button.setOnClickListener(this);
|
||||
reply_name.setOnClickListener(this);
|
||||
translate_text.setOnClickListener(this);
|
||||
reply_button.setOnClickListener(this);
|
||||
repost_button.setOnClickListener(this);
|
||||
like_button.setOnClickListener(this);
|
||||
profile_image.setOnClickListener(this);
|
||||
location_name.setOnClickListener(this);
|
||||
repost_button.setOnLongClickListener(this);
|
||||
like_button.setOnLongClickListener(this);
|
||||
repost_name_button.setOnLongClickListener(this);
|
||||
location_name.setOnLongClickListener(this);
|
||||
status_text.setOnClickListener(this);
|
||||
container.setOnScrollChangeListener(this);
|
||||
body.addLockCallback(this);
|
||||
}
|
||||
|
|
@ -649,9 +649,9 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
// unblur text on click
|
||||
else if (v.getId() == R.id.page_status_text) {
|
||||
// remove blur if any
|
||||
if (statusText.getPaint().getMaskFilter() != null) {
|
||||
statusText.getPaint().setMaskFilter(null);
|
||||
spoilerHint.setVisibility(View.INVISIBLE);
|
||||
if (status_text.getPaint().getMaskFilter() != null) {
|
||||
status_text.getPaint().setMaskFilter(null);
|
||||
spoiler_hint.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
}
|
||||
// translate status text
|
||||
|
|
@ -811,137 +811,152 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
*/
|
||||
private void setStatus(@NonNull Status status) {
|
||||
this.status = status;
|
||||
Spannable spannableText = null;
|
||||
if (status.getEmbeddedStatus() != null) {
|
||||
repostNameButton.setVisibility(View.VISIBLE);
|
||||
repostNameButton.setText(status.getAuthor().getScreenname());
|
||||
repost_name_button.setVisibility(View.VISIBLE);
|
||||
repost_name_button.setText(status.getAuthor().getScreenname());
|
||||
status = status.getEmbeddedStatus();
|
||||
} else {
|
||||
repostNameButton.setVisibility(View.GONE);
|
||||
repost_name_button.setVisibility(View.GONE);
|
||||
}
|
||||
User author = status.getAuthor();
|
||||
Location location = status.getLocation();
|
||||
invalidateOptionsMenu();
|
||||
|
||||
repost_button.setVisibility(View.VISIBLE);
|
||||
like_button.setVisibility(View.VISIBLE);
|
||||
reply_button.setVisibility(View.VISIBLE);
|
||||
screen_name.setText(author.getScreenname());
|
||||
created_at.setText(SimpleDateFormat.getDateTimeInstance().format(status.getTimestamp()));
|
||||
reply_button.setText(StringUtils.NUMBER_FORMAT.format(status.getReplyCount()));
|
||||
like_button.setText(StringUtils.NUMBER_FORMAT.format(status.getFavoriteCount()));
|
||||
repost_button.setText(StringUtils.NUMBER_FORMAT.format(status.getRepostCount()));
|
||||
// set repost icon
|
||||
if (status.isReposted()) {
|
||||
AppStyles.setDrawableColor(repostButton, settings.getRepostIconColor());
|
||||
AppStyles.setDrawableColor(repost_button, settings.getRepostIconColor());
|
||||
} else {
|
||||
AppStyles.setDrawableColor(repostButton, settings.getIconColor());
|
||||
AppStyles.setDrawableColor(repost_button, settings.getIconColor());
|
||||
}
|
||||
// set favorite/like icon
|
||||
if (status.isFavorited()) {
|
||||
AppStyles.setDrawableColor(likeButton, settings.getFavoriteIconColor());
|
||||
AppStyles.setDrawableColor(like_button, settings.getFavoriteIconColor());
|
||||
} else {
|
||||
AppStyles.setDrawableColor(likeButton, settings.getIconColor());
|
||||
AppStyles.setDrawableColor(like_button, settings.getIconColor());
|
||||
}
|
||||
// set user verified icon
|
||||
if (author.isVerified()) {
|
||||
username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.verify, 0, 0, 0);
|
||||
AppStyles.setDrawableColor(username, settings.getIconColor());
|
||||
} else {
|
||||
username.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
||||
}
|
||||
// set user protected icon
|
||||
if (author.isProtected()) {
|
||||
screenName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.lock, 0, 0, 0);
|
||||
AppStyles.setDrawableColor(screenName, settings.getIconColor());
|
||||
screen_name.setCompoundDrawablesWithIntrinsicBounds(R.drawable.lock, 0, 0, 0);
|
||||
AppStyles.setDrawableColor(screen_name, settings.getIconColor());
|
||||
} else {
|
||||
screenName.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
||||
screen_name.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
||||
}
|
||||
// add 'translate' label
|
||||
if (!status.getText().isEmpty() && !status.getLanguage().isEmpty() && !status.getLanguage().equals(Locale.getDefault().getLanguage())) {
|
||||
translateText.setVisibility(View.VISIBLE); // todo add translation support check
|
||||
translate_text.setVisibility(View.VISIBLE); // todo add translation support check
|
||||
} else {
|
||||
translateText.setVisibility(View.GONE);
|
||||
translate_text.setVisibility(View.GONE);
|
||||
}
|
||||
// set username
|
||||
if (status.getAuthor().getEmojis().length > 0) {
|
||||
Spannable usernameSpan = new SpannableString(author.getUsername());
|
||||
if (settings.imagesEnabled()) {
|
||||
EmojiParam param = new EmojiParam(author.getEmojis(), usernameSpan, getResources().getDimensionPixelSize(R.dimen.page_status_icon_size));
|
||||
emojiLoader.execute(param, usernameUpdate);
|
||||
usernameSpan = EmojiUtils.removeTags(usernameSpan);
|
||||
}
|
||||
username.setText(usernameSpan);
|
||||
} else {
|
||||
username.setText(author.getUsername());
|
||||
screenName.setText(author.getScreenname());
|
||||
createdAt.setText(SimpleDateFormat.getDateTimeInstance().format(status.getTimestamp()));
|
||||
replyButton.setText(StringUtils.NUMBER_FORMAT.format(status.getReplyCount()));
|
||||
likeButton.setText(StringUtils.NUMBER_FORMAT.format(status.getFavoriteCount()));
|
||||
repostButton.setText(StringUtils.NUMBER_FORMAT.format(status.getRepostCount()));
|
||||
}
|
||||
// set status source
|
||||
if (!status.getSource().isEmpty()) {
|
||||
statusApi.setText(R.string.status_sent_from);
|
||||
statusApi.append(status.getSource());
|
||||
statusApi.setVisibility(View.VISIBLE);
|
||||
status_source.setText(R.string.status_sent_from);
|
||||
status_source.append(status.getSource());
|
||||
status_source.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
statusApi.setVisibility(View.GONE);
|
||||
status_source.setVisibility(View.GONE);
|
||||
}
|
||||
// set status text
|
||||
if (!status.getText().isEmpty()) {
|
||||
spannableText = Tagger.makeTextWithLinks(status.getText(), settings.getHighlightColor(), this);
|
||||
statusText.setVisibility(View.VISIBLE);
|
||||
statusText.setText(spannableText);
|
||||
} else {
|
||||
statusText.setVisibility(View.GONE);
|
||||
Spannable spannableText = Tagger.makeTextWithLinks(status.getText(), settings.getHighlightColor(), this);
|
||||
if (status.getEmojis().length > 0 && settings.imagesEnabled()) {
|
||||
EmojiParam param = new EmojiParam(status.getEmojis(), spannableText, getResources().getDimensionPixelSize(R.dimen.page_status_icon_size));
|
||||
emojiLoader.execute(param, statusTextUpdate);
|
||||
spannableText = EmojiUtils.removeTags(spannableText);
|
||||
}
|
||||
status_text.setVisibility(View.VISIBLE);
|
||||
status_text.setText(spannableText);
|
||||
} else {
|
||||
status_text.setVisibility(View.GONE);
|
||||
}
|
||||
// setup button to replied status
|
||||
if (status.getRepliedStatusId() > 0) {
|
||||
if (!status.getReplyName().isEmpty())
|
||||
replyName.setText(status.getReplyName());
|
||||
else
|
||||
replyName.setText(R.string.status_replyname_empty);
|
||||
replyName.setVisibility(View.VISIBLE);
|
||||
if (!status.getReplyName().isEmpty()) {
|
||||
reply_name.setText(status.getReplyName());
|
||||
} else {
|
||||
replyName.setVisibility(View.GONE);
|
||||
reply_name.setText(R.string.status_replyname_empty);
|
||||
}
|
||||
reply_name.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
reply_name.setVisibility(View.GONE);
|
||||
}
|
||||
// set status sensible warining
|
||||
if (status.isSensitive()) {
|
||||
sensitive.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
sensitive.setVisibility(View.GONE);
|
||||
}
|
||||
// set status spoiler warning
|
||||
if (status.isSpoiler()) {
|
||||
spoiler.setVisibility(View.VISIBLE);
|
||||
if (settings.hideSensitiveEnabled()) {
|
||||
spoilerHint.setVisibility(View.VISIBLE);
|
||||
statusText.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
|
||||
float radius = statusText.getTextSize() / 3;
|
||||
spoiler_hint.setVisibility(View.VISIBLE);
|
||||
status_text.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
|
||||
float radius = status_text.getTextSize() / 3;
|
||||
BlurMaskFilter filter = new BlurMaskFilter(radius, BlurMaskFilter.Blur.NORMAL);
|
||||
statusText.getPaint().setMaskFilter(filter);
|
||||
status_text.getPaint().setMaskFilter(filter);
|
||||
} else {
|
||||
spoilerHint.setVisibility(View.INVISIBLE);
|
||||
spoiler_hint.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
} else {
|
||||
spoiler.setVisibility(View.GONE);
|
||||
spoilerHint.setVisibility(View.INVISIBLE);
|
||||
spoiler_hint.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
String profileImageUrl = author.getProfileImageThumbnailUrl();
|
||||
if (settings.imagesEnabled() && !profileImageUrl.isEmpty()) {
|
||||
// set profile image url
|
||||
if (settings.imagesEnabled() && !author.getProfileImageThumbnailUrl().isEmpty()) {
|
||||
Transformation roundCorner = new RoundedCornersTransformation(4, 0);
|
||||
picasso.load(profileImageUrl).transform(roundCorner).error(R.drawable.no_image).into(profileImage);
|
||||
picasso.load(author.getProfileImageThumbnailUrl()).transform(roundCorner).error(R.drawable.no_image).into(profile_image);
|
||||
} else {
|
||||
profileImage.setImageResource(0);
|
||||
profile_image.setImageResource(0);
|
||||
}
|
||||
// set location information
|
||||
if (location != null) {
|
||||
locationName.setVisibility(View.VISIBLE);
|
||||
location_name.setVisibility(View.VISIBLE);
|
||||
if (!location.getPlace().isEmpty()) {
|
||||
locationName.setText(location.getFullName());
|
||||
location_name.setText(location.getFullName());
|
||||
} else {
|
||||
locationName.setText("");
|
||||
location_name.setText("");
|
||||
}
|
||||
if (!location.getCoordinates().isEmpty()) {
|
||||
locationName.append(" " + location.getCoordinates());
|
||||
location_name.append(" " + location.getCoordinates());
|
||||
}
|
||||
} else {
|
||||
locationName.setVisibility(View.GONE);
|
||||
}
|
||||
if (repostButton.getVisibility() != View.VISIBLE) {
|
||||
repostButton.setVisibility(View.VISIBLE);
|
||||
likeButton.setVisibility(View.VISIBLE);
|
||||
replyButton.setVisibility(View.VISIBLE);
|
||||
location_name.setVisibility(View.GONE);
|
||||
}
|
||||
// set status attachment preview
|
||||
if ((status.getCards().length > 0 || status.getMedia().length > 0) || status.getPoll() != null) {
|
||||
cardList.setVisibility(View.VISIBLE);
|
||||
card_list.setVisibility(View.VISIBLE);
|
||||
adapter.replaceAll(status);
|
||||
statusText.setMaxLines(5);
|
||||
status_text.setMaxLines(5);
|
||||
} else {
|
||||
cardList.setVisibility(View.GONE);
|
||||
statusText.setMaxLines(10);
|
||||
}
|
||||
if (settings.imagesEnabled()) {
|
||||
if (status.getEmojis().length > 0 && spannableText != null) {
|
||||
EmojiParam param = new EmojiParam(status.getEmojis(), spannableText, getResources().getDimensionPixelSize(R.dimen.page_status_icon_size));
|
||||
emojiLoader.execute(param, statusTextUpdate);
|
||||
}
|
||||
if (author.getEmojis().length > 0 && !author.getUsername().isEmpty()) {
|
||||
SpannableString usernameSpan = new SpannableString(author.getUsername());
|
||||
EmojiParam param = new EmojiParam(author.getEmojis(), usernameSpan, getResources().getDimensionPixelSize(R.dimen.page_status_icon_size));
|
||||
emojiLoader.execute(param, usernameUpdate);
|
||||
}
|
||||
card_list.setVisibility(View.GONE);
|
||||
status_text.setMaxLines(10);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1122,20 +1137,20 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
*/
|
||||
private void onTranslationResult(@NonNull TranslationResult result) {
|
||||
if (result.translation != null) {
|
||||
if (statusText.getLineCount() > statusText.getMaxLines()) {
|
||||
int y = statusText.getLayout().getLineTop(statusText.getLineCount());
|
||||
statusText.scrollTo(0, y);
|
||||
if (status_text.getLineCount() > status_text.getMaxLines()) {
|
||||
int y = status_text.getLayout().getLineTop(status_text.getLineCount());
|
||||
status_text.scrollTo(0, y);
|
||||
}
|
||||
// build translation string
|
||||
String text = "\n...\n" + result.translation.getText() + "\n...";
|
||||
Spannable textSpan = Tagger.makeTextWithLinks(text, settings.getHighlightColor(), this);
|
||||
// append translation
|
||||
statusText.append(textSpan);
|
||||
translateText.setText(R.string.status_translate_source);
|
||||
translateText.append(result.translation.getSource() + ", ");
|
||||
translateText.append(getString(R.string.status_translate_source_language));
|
||||
translateText.append(result.translation.getOriginalLanguage());
|
||||
translateText.setOnClickListener(null); // disable link to translation
|
||||
status_text.append(textSpan);
|
||||
translate_text.setText(R.string.status_translate_source);
|
||||
translate_text.append(result.translation.getSource() + ", ");
|
||||
translate_text.append(getString(R.string.status_translate_source_language));
|
||||
translate_text.append(result.translation.getOriginalLanguage());
|
||||
translate_text.setOnClickListener(null); // disable link to translation
|
||||
} else {
|
||||
String message = ErrorHandler.getErrorMessage(this, result.exception);
|
||||
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
|
||||
|
|
@ -1148,7 +1163,7 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
private void onStatusTextUpdate(@NonNull EmojiResult result) {
|
||||
if (settings.getLogin().getConfiguration() == Configuration.MASTODON && result.images != null) {
|
||||
Spannable spannable = EmojiUtils.addEmojis(getApplicationContext(), result.spannable, result.images);
|
||||
statusText.setText(spannable);
|
||||
status_text.setText(spannable);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -285,7 +285,17 @@ public class StatusEditor extends MediaActivity implements OnClickListener, OnPr
|
|||
|
||||
@Override
|
||||
public void onEmojiSelected(Emoji emoji) {
|
||||
statusText.append(emoji.getCode());
|
||||
String tagToInsert;
|
||||
int start = Math.max(statusText.getSelectionStart(), 0);
|
||||
int end = Math.max(statusText.getSelectionEnd(), 0);
|
||||
if (start == 0) {
|
||||
tagToInsert = emoji.getCode() + ' ';
|
||||
} else if (end == statusText.length()) {
|
||||
tagToInsert = ' ' + emoji.getCode();
|
||||
} else {
|
||||
tagToInsert = ' ' + emoji.getCode() + ' ';
|
||||
}
|
||||
statusText.getText().replace(Math.min(start, end), Math.max(start, end), tagToInsert, 0, tagToInsert.length());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import android.view.LayoutInflater;
|
|||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.animation.AnimationUtils;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
|
|
@ -61,6 +62,7 @@ public class EmojiHolder extends ViewHolder implements OnClickListener {
|
|||
for (int i = 0; i < emojiViews.length; i++) {
|
||||
if (v == emojiViews[i]) {
|
||||
listener.onItemClick(pos, OnHolderClickListener.EMOJI_CLICK, i);
|
||||
v.startAnimation(AnimationUtils.loadAnimation(v.getContext(),R.anim.emoji));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -160,8 +160,10 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
time.setText(StringUtils.formatCreationTime(itemView.getResources(), message.getTimestamp()));
|
||||
iconList.setVisibility(View.VISIBLE);
|
||||
adapter.addItems(message);
|
||||
if (sender.getEmojis().length > 0) {
|
||||
if (sender.getEmojis().length > 0 && !sender.getUsername().trim().isEmpty()) {
|
||||
Spannable usernameSpan = new SpannableString(sender.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, sender.getEmojis(), usernameSpan, username.getResources().getDimensionPixelSize(R.dimen.item_user_icon_size));
|
||||
emojiLoader.execute(param, this);
|
||||
username.setText(EmojiUtils.removeTags(usernameSpan));
|
||||
} else {
|
||||
username.setText(sender.getUsername());
|
||||
|
|
@ -193,11 +195,6 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
} else {
|
||||
profile.setImageResource(0);
|
||||
}
|
||||
if (settings.imagesEnabled() && sender.getEmojis().length > 0 && !sender.getUsername().isEmpty()) {
|
||||
SpannableString userSpan = new SpannableString(sender.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, sender.getEmojis(), userSpan, username.getResources().getDimensionPixelSize(R.dimen.item_user_icon_size));
|
||||
emojiLoader.execute(param, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -135,32 +135,38 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
|
|||
*/
|
||||
public void setContent(Status status) {
|
||||
tagId = status.getId();
|
||||
Spannable textSpan = null;
|
||||
User author = status.getAuthor();
|
||||
if (status.getEmbeddedStatus() != null) {
|
||||
reposter.setText(author.getScreenname());
|
||||
reposter.setText(status.getAuthor().getScreenname());
|
||||
reposter.setVisibility(View.VISIBLE);
|
||||
repostUserIcon.setVisibility(View.VISIBLE);
|
||||
status = status.getEmbeddedStatus();
|
||||
author = status.getAuthor();
|
||||
} else {
|
||||
reposter.setVisibility(View.GONE);
|
||||
repostUserIcon.setVisibility(View.GONE);
|
||||
}
|
||||
if (author.getEmojis().length > 0) {
|
||||
Spannable usernameSpan = new SpannableString(author.getUsername());
|
||||
username.setText(EmojiUtils.removeTags(usernameSpan));
|
||||
} else {
|
||||
username.setText(author.getUsername());
|
||||
}
|
||||
User author = status.getAuthor();
|
||||
String profileImageUrl = author.getProfileImageThumbnailUrl();
|
||||
|
||||
screenname.setText(author.getScreenname());
|
||||
repost.setText(StringUtils.NUMBER_FORMAT.format(status.getRepostCount()));
|
||||
favorite.setText(StringUtils.NUMBER_FORMAT.format(status.getFavoriteCount()));
|
||||
reply.setText(StringUtils.NUMBER_FORMAT.format(status.getReplyCount()));
|
||||
created.setText(StringUtils.formatCreationTime(itemView.getResources(), status.getTimestamp()));
|
||||
// set username and emojis
|
||||
if (author.getEmojis().length > 0 && !author.getUsername().trim().isEmpty() && settings.imagesEnabled()) {
|
||||
SpannableString usernameSpan = new SpannableString(author.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, author.getEmojis(), usernameSpan, statusText.getResources().getDimensionPixelSize(R.dimen.item_status_icon_size));
|
||||
emojiLoader.execute(param, usernameResult);
|
||||
username.setText(EmojiUtils.removeTags(usernameSpan));
|
||||
} else {
|
||||
username.setText(author.getUsername());
|
||||
}
|
||||
// set status text and emojis
|
||||
if (!status.getText().trim().isEmpty()) {
|
||||
textSpan = Tagger.makeTextWithLinks(status.getText(), settings.getHighlightColor());
|
||||
if (status.getEmojis().length > 0) {
|
||||
Spannable textSpan = Tagger.makeTextWithLinks(status.getText(), settings.getHighlightColor());
|
||||
if (status.getEmojis().length > 0 && settings.imagesEnabled()) {
|
||||
EmojiParam param = new EmojiParam(tagId, status.getEmojis(), textSpan, statusText.getResources().getDimensionPixelSize(R.dimen.item_status_icon_size));
|
||||
emojiLoader.execute(param, textResult);
|
||||
textSpan = EmojiUtils.removeTags(textSpan);
|
||||
}
|
||||
statusText.setText(textSpan);
|
||||
|
|
@ -168,6 +174,7 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
|
|||
} else {
|
||||
statusText.setVisibility(View.GONE);
|
||||
}
|
||||
// set status blur if spoiler content
|
||||
if (settings.hideSensitiveEnabled() && status.isSpoiler()) {
|
||||
statusText.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
|
||||
float radius = statusText.getTextSize() / 3;
|
||||
|
|
@ -176,33 +183,38 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
|
|||
} else {
|
||||
statusText.getPaint().setMaskFilter(null);
|
||||
}
|
||||
// set repost icon
|
||||
if (status.isReposted()) {
|
||||
repostIcon.setColorFilter(settings.getRepostIconColor());
|
||||
} else {
|
||||
repostIcon.setColorFilter(settings.getIconColor());
|
||||
}
|
||||
// set favorite/like icon
|
||||
if (status.isFavorited()) {
|
||||
favoriteIcon.setColorFilter(settings.getFavoriteIconColor());
|
||||
} else {
|
||||
favoriteIcon.setColorFilter(settings.getIconColor());
|
||||
}
|
||||
// set user verified icon
|
||||
if (author.isVerified()) {
|
||||
verifiedIcon.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
verifiedIcon.setVisibility(View.GONE);
|
||||
}
|
||||
// set user protected icon
|
||||
if (author.isProtected()) {
|
||||
lockedIcon.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
lockedIcon.setVisibility(View.GONE);
|
||||
}
|
||||
String profileImageUrl = author.getProfileImageThumbnailUrl();
|
||||
// set profile image
|
||||
if (settings.imagesEnabled() && !profileImageUrl.isEmpty()) {
|
||||
Transformation roundCorner = new RoundedCornersTransformation(2, 0);
|
||||
picasso.load(profileImageUrl).transform(roundCorner).error(R.drawable.no_image).into(profile);
|
||||
} else {
|
||||
profile.setImageResource(0);
|
||||
}
|
||||
// set 'replied' text and icon
|
||||
if (status.getRepliedStatusId() > 0) {
|
||||
replyStatus.setVisibility(View.VISIBLE);
|
||||
replyname.setVisibility(View.VISIBLE);
|
||||
|
|
@ -214,8 +226,8 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
|
|||
replyStatus.setVisibility(View.GONE);
|
||||
replyname.setVisibility(View.GONE);
|
||||
}
|
||||
// setup attachment indicators
|
||||
if (settings.statusIndicatorsEnabled()) {
|
||||
// set visibility first so iconholder can measure the listview height
|
||||
iconList.setVisibility(View.VISIBLE);
|
||||
adapter.addItems(status);
|
||||
if (adapter.isEmpty()) {
|
||||
|
|
@ -226,17 +238,6 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
|
|||
} else {
|
||||
iconList.setVisibility(View.GONE);
|
||||
}
|
||||
if (settings.imagesEnabled()) {
|
||||
if (status.getEmojis().length > 0 && textSpan != null) {
|
||||
EmojiParam param = new EmojiParam(tagId, status.getEmojis(), textSpan, statusText.getResources().getDimensionPixelSize(R.dimen.item_status_icon_size));
|
||||
emojiLoader.execute(param, textResult);
|
||||
}
|
||||
if (author.getEmojis().length > 0 && !author.getUsername().isEmpty()) {
|
||||
SpannableString userSpan = new SpannableString(author.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, author.getEmojis(), userSpan, statusText.getResources().getDimensionPixelSize(R.dimen.item_status_icon_size));
|
||||
emojiLoader.execute(param, usernameResult);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -135,8 +135,10 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
|
|||
} else {
|
||||
lockedIcon.setVisibility(GONE);
|
||||
}
|
||||
if (user.getEmojis().length > 0) {
|
||||
if (user.getEmojis().length > 0 && !user.getUsername().trim().isEmpty() && settings.imagesEnabled()) {
|
||||
Spannable usernameSpan = new SpannableString(user.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, user.getEmojis(), usernameSpan, username.getResources().getDimensionPixelSize(R.dimen.item_user_icon_size));
|
||||
emojiLoader.execute(param, this);
|
||||
username.setText(EmojiUtils.removeTags(usernameSpan));
|
||||
} else {
|
||||
username.setText(user.getUsername());
|
||||
|
|
@ -148,11 +150,6 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
|
|||
} else {
|
||||
profileImg.setImageResource(0);
|
||||
}
|
||||
if (settings.imagesEnabled() && user.getEmojis().length > 0 && !user.getUsername().isEmpty()) {
|
||||
SpannableString userSpan = new SpannableString(user.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, user.getEmojis(), userSpan, username.getResources().getDimensionPixelSize(R.dimen.item_user_icon_size));
|
||||
emojiLoader.execute(param, this);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -133,8 +133,10 @@ public class UserlistHolder extends ViewHolder implements OnClickListener {
|
|||
if (owner != null) {
|
||||
screenname.setText(owner.getScreenname());
|
||||
String profileImageUrl = owner.getProfileImageThumbnailUrl();
|
||||
if (owner.getEmojis().length > 0) {
|
||||
Spannable usernameSpan = new SpannableString(owner.getUsername());
|
||||
if (owner.getEmojis().length > 0 && !owner.getUsername().trim().isEmpty() && settings.imagesEnabled()) {
|
||||
SpannableString usernameSpan = new SpannableString(owner.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, owner.getEmojis(), usernameSpan, username.getResources().getDimensionPixelSize(R.dimen.item_user_icon_size));
|
||||
emojiLoader.execute(param, usernameResult);
|
||||
username.setText(EmojiUtils.removeTags(usernameSpan));
|
||||
} else {
|
||||
username.setText(owner.getUsername());
|
||||
|
|
@ -176,11 +178,6 @@ public class UserlistHolder extends ViewHolder implements OnClickListener {
|
|||
} else {
|
||||
privateIcon.setVisibility(View.GONE);
|
||||
}
|
||||
if (settings.imagesEnabled() && owner != null && owner.getEmojis().length > 0 && !owner.getUsername().isEmpty()) {
|
||||
SpannableString userSpan = new SpannableString(owner.getUsername());
|
||||
EmojiParam param = new EmojiParam(tagId, owner.getEmojis(), userSpan, username.getResources().getDimensionPixelSize(R.dimen.item_user_icon_size));
|
||||
emojiLoader.execute(param, usernameResult);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<alpha
|
||||
android:startOffset="150"
|
||||
android:duration="250"
|
||||
android:fromAlpha="0.2"
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:toAlpha="1.0" />
|
||||
</set>
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
android:layout_height="0dp"
|
||||
android:layout_margin="@dimen/item_emoji_item_margin"
|
||||
tools:ignore="ContentDescription"
|
||||
android:stateListAnimator="@anim/emoji"
|
||||
app:layout_constraintDimensionRatio="1.0"
|
||||
app:layout_constraintWidth_percent="0.12"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<dimen name="page_status_textsize_locale">12sp</dimen>
|
||||
<dimen name="page_status_cards_list_margin">5dp</dimen>
|
||||
<dimen name="page_status_card_height">130sp</dimen>
|
||||
<dimen name="page_status_icon_size">14sp</dimen>
|
||||
<dimen name="page_status_icon_size">17sp</dimen>
|
||||
<integer name="page_status_text_max_lines">5</integer>
|
||||
|
||||
<!--dimens of page_profile.xml-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue