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

refactor: use isRemote instead of reloadWhenClicked

Browse Source 
Why are my variable naming abilities be so awful?
This commit is contained in:
LucasGGamerM
2023-06-10 10:44:56 -03:00
parent fb78ac1243
commit 33d725acb4
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class CustomLocalTimelineFragment extends StatusListFragment implements P
result.stream().forEach(status -> { result.stream().forEach(status -> {
status.account.acct += "@"+domain; status.account.acct += "@"+domain;
status.mentions.forEach(mention -> mention.id = null); status.mentions.forEach(mention -> mention.id = null);
status.reloadWhenClicked = true; status.isRemote = true;
}); });
onDataLoaded(result, !result.isEmpty()); onDataLoaded(result, !result.isEmpty());

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

@@ -67,7 +67,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
Status status=getContentStatusByID(id); Status status=getContentStatusByID(id);
if(status==null) if(status==null)
return; return;
if(status.reloadWhenClicked){ if(status.isRemote){
UiUtils.lookupStatus(getContext(), status, accountID, null, status1 -> { UiUtils.lookupStatus(getContext(), status, accountID, null, status1 -> {
status1.filterRevealed = true; status1.filterRevealed = true;
Bundle args=new Bundle(); Bundle args=new Bundle();

1
mastodon/src/main/java/org/joinmastodon/android/model/Account.java
View File

@@ -136,7 +136,6 @@ public class Account extends BaseModel implements Searchable{
public Instant muteExpiresAt; public Instant muteExpiresAt;
public List<Role> roles; public List<Role> roles;
public boolean reloadWhenClicked;
public @Nullable String fqn; // akkoma has this, mastodon't public @Nullable String fqn; // akkoma has this, mastodon't

1
mastodon/src/main/java/org/joinmastodon/android/model/Status.java
View File

@@ -84,7 +84,6 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
public transient boolean hasGapAfter; public transient boolean hasGapAfter;
public transient TranslatedStatus translation; public transient TranslatedStatus translation;
public transient boolean translationShown; public transient boolean translationShown;
public boolean reloadWhenClicked;
private transient String strippedText; private transient String strippedText;
@Override @Override

10
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
View File

@@ -199,7 +199,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
} }
private void onReplyClick(View v){ private void onReplyClick(View v){
if(item.status.reloadWhenClicked){ if(item.status.isRemote){
UiUtils.lookupStatus(v.getContext(), UiUtils.lookupStatus(v.getContext(),
item.status, item.accountID, null, item.status, item.accountID, null,
status -> { status -> {
@@ -240,7 +240,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
onBoostLongClick(v); onBoostLongClick(v);
return; return;
} }
if(item.status.reloadWhenClicked){ if(item.status.isRemote){
UiUtils.lookupStatus(v.getContext(), UiUtils.lookupStatus(v.getContext(),
item.status, item.accountID, null, item.status, item.accountID, null,
status -> { status -> {
@@ -269,7 +269,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
Consumer<StatusPrivacy> doReblog = (visibility) -> { Consumer<StatusPrivacy> doReblog = (visibility) -> {
v.startAnimation(opacityOut); v.startAnimation(opacityOut);
if(item.status.reloadWhenClicked){ if(item.status.isRemote){
UiUtils.lookupStatus(v.getContext(), UiUtils.lookupStatus(v.getContext(),
item.status, item.accountID, null, item.status, item.accountID, null,
status -> { status -> {
@@ -357,7 +357,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
} }
private void onFavoriteClick(View v){ private void onFavoriteClick(View v){
if(item.status.reloadWhenClicked){ if(item.status.isRemote){
UiUtils.lookupStatus(v.getContext(), UiUtils.lookupStatus(v.getContext(),
item.status, item.accountID, null, item.status, item.accountID, null,
status -> { status -> {
@@ -402,7 +402,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
} }
private void onBookmarkClick(View v){ private void onBookmarkClick(View v){
if(item.status.reloadWhenClicked){ if(item.status.isRemote){
UiUtils.lookupStatus(v.getContext(), UiUtils.lookupStatus(v.getContext(),
item.status, item.accountID, null, item.status, item.accountID, null,
status -> { status -> {

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

@@ -450,7 +450,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
return; return;
} }
Bundle args=new Bundle(); Bundle args=new Bundle();
if(item.status != null && item.status.reloadWhenClicked){ if(item.status != null && item.status.isRemote){
UiUtils.lookupAccount(v.getContext(), item.status.account, item.accountID, null, account -> { UiUtils.lookupAccount(v.getContext(), item.status.account, item.accountID, null, account -> {
args.putString("account", item.accountID); args.putString("account", item.accountID);
args.putParcelable("profileAccount", Parcels.wrap(account)); args.putParcelable("profileAccount", Parcels.wrap(account));

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

@@ -207,7 +207,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
translateButton.setClickable(false); translateButton.setClickable(false);
translateButton.animate().alpha(0.5f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start(); translateButton.animate().alpha(0.5f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
if(item.status.reloadWhenClicked){ if(item.status.isRemote){
UiUtils.lookupStatus(item.parentFragment.getContext(), UiUtils.lookupStatus(item.parentFragment.getContext(),
item.status, item.status,
item.parentFragment.getAccountID(), item.parentFragment.getAccountID(),