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

improve adding/removing users from lists

Browse Source
This commit is contained in:
sk
2022-11-12 20:20:45 +01:00
parent 625134605b
commit 5c593a1025
7 changed files with 61 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
View File

@@ -3,6 +3,8 @@ package org.joinmastodon.android.fragments;
import android.app.Activity;
import android.media.MediaRouter;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
@@ -33,6 +35,13 @@ public class ListTimelineFragment extends StatusListFragment {
listID=getArguments().getString("listID");
listTitle=getArguments().getString("listTitle");
setTitle(listTitle);
setHasOptionsMenu(true);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
// inflater.inflate(R.menu.list, menu);
}
@Override

75
mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
View File

@@ -58,7 +58,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
profileAccountId=args.getString("profileAccount");
profileDisplayUsername=args.getString("profileDisplayUsername");
setTitle(getString(R.string.lists_with_user, profileDisplayUsername));
setHasOptionsMenu(true);
// setHasOptionsMenu(true);
}
}
@@ -69,54 +69,29 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
loadData();
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
Button saveButton=new Button(getActivity());
saveButton.setText(R.string.save);
saveButton.setOnClickListener(this::onSaveClick);
LinearLayout wrap=new LinearLayout(getActivity());
wrap.setOrientation(LinearLayout.HORIZONTAL);
wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
wrap.setClipToPadding(false);
MenuItem item=menu.add(R.string.save);
item.setActionView(wrap);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
// @Override
// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
// Button saveButton=new Button(getActivity());
// saveButton.setText(R.string.save);
// saveButton.setOnClickListener(this::onSaveClick);
// LinearLayout wrap=new LinearLayout(getActivity());
// wrap.setOrientation(LinearLayout.HORIZONTAL);
// wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
// wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
// wrap.setClipToPadding(false);
// MenuItem item=menu.add(R.string.save);
// item.setActionView(wrap);
// item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
// }
private void onSaveClick(View view) {
List<String> addUserToLists = new ArrayList<>();
List<String> removeUserFromLists = new ArrayList<>();
for (Map.Entry<String, Boolean> entry : userInList.entrySet()) {
Boolean changedValue = entry.getValue();
String id = entry.getKey();
if (changedValue != null && !changedValue.equals(userInListBefore.get(id))) {
(changedValue ? addUserToLists : removeUserFromLists).add(id);
}
}
private void saveListMembership(String listId, boolean isMember) {
userInList.put(listId, isMember);
List<String> accountIdList = Collections.singletonList(profileAccountId);
for (String listId : addUserToLists) {
inProgress++;
new AddAccountsToList(listId, accountIdList).setCallback(new SimpleCallback<>(this) {
@Override
public void onSuccess(Object o) { onRequestComplete(); }
@Override
public void onError(ErrorResponse error) { super.onError(error); onSuccess(null); }
}).exec(accountId);
}
for (String listId : removeUserFromLists) {
inProgress++;
new RemoveAccountsFromList(listId, accountIdList).setCallback(new SimpleCallback<>(this) {
@Override
public void onSuccess(Object o) { onRequestComplete(); }
@Override
public void onError(ErrorResponse error) { super.onError(error); onSuccess(null); }
}).exec(accountId);
}
}
private void onRequestComplete() {
if (--inProgress == 0) reload();
MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
req.setCallback(new SimpleCallback<>(this) {
@Override
public void onSuccess(Object o) {}
}).exec(accountId);
}
@Override
@@ -129,7 +104,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
public void onSuccess(List<ListTimeline> lists) {
for (ListTimeline l : lists) userInListBefore.put(l.id, true);
userInList.putAll(userInListBefore);
onDataLoaded(lists, false);
if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
if (profileAccountId == null) return;
currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListTimelinesFragment.this) {
@@ -202,9 +177,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
}
private void onClickToggle(View view) {
if (view instanceof CheckBox cb) {
userInList.put(item.id, cb.isChecked());
}
saveListMembership(item.id, listToggle.isChecked());
}
@Override

6
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -532,10 +532,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
if(relationship.following)
if(relationship.following) {
menu.findItem(R.id.hide_boosts).setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
else
}else {
menu.findItem(R.id.hide_boosts).setVisible(false);
menu.findItem(R.id.manage_user_lists).setVisible(false);
}
if(!account.isLocal())
menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
else