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

don't show blocked_by status

Browse Source 
restoring fix for sk22#526
This commit is contained in:
sk
2023-08-27 13:38:33 +02:00
parent ad96031aeb
commit a85a0b7d78
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -747,9 +747,6 @@ public class UiUtils {
if(relationship.blocking){ if(relationship.blocking){
button.setText(R.string.button_blocked); button.setText(R.string.button_blocked);
styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error; styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
}else if(relationship.blockedBy){
button.setText(R.string.button_follow);
styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
}else if(relationship.requested){ }else if(relationship.requested){
button.setText(R.string.button_follow_pending); button.setText(R.string.button_follow_pending);
styleRes=R.style.Widget_Mastodon_M3_Button_Tonal; styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
@@ -761,7 +758,6 @@ public class UiUtils {
styleRes=R.style.Widget_Mastodon_M3_Button_Tonal; styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
} }
button.setEnabled(!relationship.blockedBy);
TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background}); TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
button.setBackground(ta.getDrawable(0)); button.setBackground(ta.getDrawable(0));
ta.recycle(); ta.recycle();