None-square emoji for reactions

LucasGGamerM · Aug 4, 2024 · 2021c33 · 2021c33
1 parent d121f14
commit 2021c33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/EmojiReaction.java b/mastodon/src/main/java/org/joinmastodon/android/model/EmojiReaction.java
@@ -38,7 +38,7 @@ public static EmojiReaction of(Emoji info, Account me){
  reaction.staticUrl=info.staticUrl;
  reaction.accounts=new ArrayList<>(Collections.singleton(me));
  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;
  }
 

diff --git a/...c/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java b/...c/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java
@@ -172,7 +172,7 @@ public void onBind(EmojiReactionsStatusDisplayItem item) {
  addButton.setSelected(false);
  AccountSession session=item.parentFragment.getSession();
  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);
  emojiKeyboard=new CustomEmojiPopupKeyboard(
  (Activity) item.parentFragment.getContext(),
@@ -342,7 +342,9 @@ public EmojiReactionViewHolder(Context context, RecyclerView list){
 
  @Override
  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);
  if(drawable instanceof Animatable) ((Animatable) drawable).start();
  }