Skip to content

Commit

Permalink
fix(HashtagTimeline): update follow menu icon
Browse files Browse the repository at this point in the history
Fixes an issue, where the menu follow icon was not correctly updated,
and would always show the follow state.
  • Loading branch information
FineFindus committed Aug 31, 2024
1 parent 01225b0 commit cc64a1b
Showing 1 changed file with 8 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ private void updateMuteState(boolean newMute) {
muteMenuItem.setIcon(newMute ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
}

private void updateFollowState(boolean following) {
followMenuItem.setTitle(getString(following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
followMenuItem.setIcon(following ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
}

private void showMuteDialog(boolean mute) {
UiUtils.showConfirmationAlert(getContext(),
mute ? R.string.mo_unmute_hashtag : R.string.mo_mute_hashtag,
Expand Down Expand Up @@ -148,8 +153,6 @@ public void onError(ErrorResponse error){
}).exec(accountID);
}



@Override
protected TimelineDefinition makeTimelineDefinition() {
return TimelineDefinition.ofHashtag(hashtagName);
Expand Down Expand Up @@ -292,6 +295,7 @@ private void createOptionsMenu(){
followMenuItem=optionsMenu.findItem(R.id.follow_hashtag);
pinMenuItem=optionsMenu.findItem(R.id.pin);
followMenuItem.setVisible(toolbarContentVisible);
updateFollowState(hashtag.following);
// pinMenuItem.setShowAsAction(toolbarContentVisible ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_ALWAYS);
super.updatePinButton(pinMenuItem);

Expand Down Expand Up @@ -388,8 +392,7 @@ private void updateHeader(){
followButton.setTextVisible(true);
followProgress.setVisibility(View.GONE);
if(followMenuItem!=null){
followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
followMenuItem.setIcon(hashtag.following ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
updateFollowState(hashtag.following);
}
if(muteMenuItem!=null){
muteMenuItem.setTitle(getString(filter.isPresent() ? R.string.unmute_user : R.string.mute_user, "#" + hashtag));
Expand Down Expand Up @@ -429,6 +432,7 @@ public void onSuccess(Hashtag result){
return;
hashtag=result;
updateHeader();
updateFollowState(result.following);
followRequestRunning=false;
}

Expand Down

0 comments on commit cc64a1b

Please sign in to comment.