From 803e66f999ca3b7dc354e95cc7feb0cdbef631a5 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sun, 7 Jul 2024 10:02:27 -0300 Subject: [PATCH] fix(heart-icon): use heart icon in all places Fixes #446 --- .../org/joinmastodon/android/fragments/ProfileFragment.java | 2 ++ .../ui/displayitems/ExtendedFooterStatusDisplayItem.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index e404f241a..42d89fcb6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -821,6 +821,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList if(isOwnProfile) { 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; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java index 8d623262a..616edd0d2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java @@ -3,6 +3,7 @@ package org.joinmastodon.android.ui.displayitems; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.text.SpannableStringBuilder; @@ -94,6 +95,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{ public void onBind(ExtendedFooterStatusDisplayItem item){ Status s=item.status; 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)); if(s.editedAt!=null){ editHistory.setVisibility(View.VISIBLE);