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

don't display blocked_by relationship

Browse Source 
closes sk22#526
This commit is contained in:
sk
2023-05-29 12:34:53 +02:00
parent 4c379b67a3
commit 6832bfb95c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,9 +634,9 @@ public class UiUtils {
if (relationship.blocking) { if (relationship.blocking) {
button.setText(R.string.button_blocked); button.setText(R.string.button_blocked);
secondaryStyle = true; secondaryStyle = true;
} else if (relationship.blockedBy) { // } else if (relationship.blockedBy) {
button.setText(R.string.button_follow); // button.setText(R.string.button_follow);
secondaryStyle = false; // secondaryStyle = false;
} else if (relationship.requested) { } else if (relationship.requested) {
button.setText(R.string.button_follow_pending); button.setText(R.string.button_follow_pending);
secondaryStyle = true; secondaryStyle = true;
@@ -650,7 +650,8 @@ public class UiUtils {
if (keepText) button.setText(textBefore); if (keepText) button.setText(textBefore);
button.setEnabled(!relationship.blockedBy); // https://github.com/sk22/megalodon/issues/526
// button.setEnabled(!relationship.blockedBy);
int attr = secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle; int attr = secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle;
TypedArray ta = button.getContext().obtainStyledAttributes(new int[]{attr}); TypedArray ta = button.getContext().obtainStyledAttributes(new int[]{attr});
int styleRes = ta.getResourceId(0, 0); int styleRes = ta.getResourceId(0, 0);