owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(heart-icon): use heart icon in all places

Browse Source 
Fixes #446
This commit is contained in:
LucasGGamerM
2024-07-07 10:02:27 -03:00
parent ed22d3b4ed
commit 803e66f999
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -821,6 +821,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
if(isOwnProfile) { if(isOwnProfile) {
if (isInstancePixelfed()) menu.findItem(R.id.scheduled).setVisible(false); if (isInstancePixelfed()) menu.findItem(R.id.scheduled).setVisible(false);
menu.findItem(R.id.favorites).setIcon(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular);
UiUtils.insetPopupMenuIcon(getContext(), menu.findItem(R.id.favorites));
return; return;
} }

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
View File

@@ -3,6 +3,7 @@ package org.joinmastodon.android.ui.displayitems;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@@ -94,6 +95,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
public void onBind(ExtendedFooterStatusDisplayItem item){ public void onBind(ExtendedFooterStatusDisplayItem item){
Status s=item.status; Status s=item.status;
favorites.setText(getFormattedPlural(R.plurals.x_favorites, item.status.favouritesCount)); favorites.setText(getFormattedPlural(R.plurals.x_favorites, item.status.favouritesCount));
favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0);
reblogs.setText(getFormattedPlural(R.plurals.x_reblogs, item.status.reblogsCount)); reblogs.setText(getFormattedPlural(R.plurals.x_reblogs, item.status.reblogsCount));
if(s.editedAt!=null){ if(s.editedAt!=null){
editHistory.setVisibility(View.VISIBLE); editHistory.setVisibility(View.VISIBLE);