notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

None-square emoji for reactions

Browse source
This commit is contained in:
Jacocococo 2024-02-12 21:16:13 +01:00 • committed by LucasGGamerM
parent d121f14d30
commit 2021c335ac
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/model/EmojiReaction.java
View file

@ -38,7 +38,7 @@ public class EmojiReaction {
reaction.staticUrl=info.staticUrl; reaction.staticUrl=info.staticUrl;
reaction.accounts=new ArrayList<>(Collections.singleton(me)); reaction.accounts=new ArrayList<>(Collections.singleton(me));
reaction.accountIds=new ArrayList<>(Collections.singleton(me.id)); reaction.accountIds=new ArrayList<>(Collections.singleton(me.id));
reaction.request=new UrlImageLoaderRequest(info.url, V.sp(24), V.sp(24)); reaction.request=new UrlImageLoaderRequest(info.url, 0, V.sp(24));
return reaction; return reaction;
} }

6
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java
View file

@ -172,7 +172,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
addButton.setSelected(false); addButton.setSelected(false);
AccountSession session=item.parentFragment.getSession(); AccountSession session=item.parentFragment.getSession();
item.status.reactions.forEach(r->r.request=r.getUrl(item.playGifs)!=null item.status.reactions.forEach(r->r.request=r.getUrl(item.playGifs)!=null
? new UrlImageLoaderRequest(r.getUrl(item.playGifs), V.sp(24), V.sp(24)) ? new UrlImageLoaderRequest(r.getUrl(item.playGifs), 0, V.sp(24))
: null); : null);
emojiKeyboard=new CustomEmojiPopupKeyboard( emojiKeyboard=new CustomEmojiPopupKeyboard(
(Activity) item.parentFragment.getContext(), (Activity) item.parentFragment.getContext(),
@ -342,7 +342,9 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
@Override @Override
public void setImage(int index, Drawable drawable){ public void setImage(int index, Drawable drawable){
drawable.setBounds(0, 0, V.sp(24), V.sp(24)); int height=V.sp(24);
int width=drawable.getIntrinsicWidth()*height/drawable.getIntrinsicHeight();
drawable.setBounds(0, 0, width, height);
btn.setCompoundDrawablesRelative(drawable, null, null, null); btn.setCompoundDrawablesRelative(drawable, null, null, null);
if(drawable instanceof Animatable) ((Animatable) drawable).start(); if(drawable instanceof Animatable) ((Animatable) drawable).start();
} }