Revert "The placeholders are better. But the api thing isnt working"
This reverts commit a3267f6cd3.
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
package org.joinmastodon.android.api.requests.lists;
|
package org.joinmastodon.android.api.requests.lists;
|
||||||
|
|
||||||
import org.joinmastodon.android.api.MastodonAPIRequest;
|
import org.joinmastodon.android.api.MastodonAPIRequest;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class DeleteList extends MastodonAPIRequest<Object> {
|
public class RemoveList extends MastodonAPIRequest<Object> {
|
||||||
public DeleteList(String listId){
|
public RemoveList(String listId){
|
||||||
super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
|
super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,6 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||||||
import org.joinmastodon.android.R;
|
import org.joinmastodon.android.R;
|
||||||
import org.joinmastodon.android.api.MastodonAPIRequest;
|
import org.joinmastodon.android.api.MastodonAPIRequest;
|
||||||
import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
|
import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
|
||||||
import org.joinmastodon.android.api.requests.lists.DeleteList;
|
|
||||||
import org.joinmastodon.android.api.requests.lists.GetLists;
|
import org.joinmastodon.android.api.requests.lists.GetLists;
|
||||||
import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
|
import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
|
||||||
import org.joinmastodon.android.model.ListTimeline;
|
import org.joinmastodon.android.model.ListTimeline;
|
||||||
@@ -33,7 +32,6 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import me.grishka.appkit.Nav;
|
import me.grishka.appkit.Nav;
|
||||||
import me.grishka.appkit.api.Callback;
|
|
||||||
import me.grishka.appkit.api.ErrorResponse;
|
import me.grishka.appkit.api.ErrorResponse;
|
||||||
import me.grishka.appkit.api.SimpleCallback;
|
import me.grishka.appkit.api.SimpleCallback;
|
||||||
import me.grishka.appkit.fragments.BaseRecyclerFragment;
|
import me.grishka.appkit.fragments.BaseRecyclerFragment;
|
||||||
@@ -182,8 +180,8 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
|
|||||||
} else {
|
} else {
|
||||||
listToggle.setVisibility(View.GONE);
|
listToggle.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
edit.setOnClickListener(v -> this.editListName(item.id));
|
// edit.setOnClickListener();
|
||||||
delete.setOnClickListener(v -> this.deleteList(item.id));
|
// delete.setOnClickListener();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onClickToggle(View view) {
|
private void onClickToggle(View view) {
|
||||||
@@ -195,35 +193,12 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
|
|||||||
UiUtils.openListTimeline(getActivity(), accountId, item);
|
UiUtils.openListTimeline(getActivity(), accountId, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void editListName(String listId){
|
// private void editListName(){
|
||||||
new M3AlertDialogBuilder(getActivity())
|
// new M3AlertDialogBuilder(getActivity())
|
||||||
.setTitle(R.string.edit_text_edited)
|
// .setTitle(R.string.edit_text_edited)
|
||||||
// .setPositiveButton(R.string.discard, (dialog, which)-> )
|
// .setPositiveButton(R.string.discard, (dialog, which)-> )
|
||||||
.setNegativeButton(R.string.cancel, null)
|
// .setNegativeButton(R.string.cancel, null)
|
||||||
.show();
|
// .show();
|
||||||
}
|
// }
|
||||||
|
|
||||||
private void deleteList(String listId){
|
|
||||||
new M3AlertDialogBuilder(getActivity())
|
|
||||||
.setTitle(R.string.sk_delete_list_dialog_title)
|
|
||||||
.setPositiveButton(R.string.delete, (dialog, which)-> new DeleteList(listId))
|
|
||||||
.setNegativeButton(R.string.cancel, null)
|
|
||||||
.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void actuallyDeleteList(String listId){
|
|
||||||
new DeleteList(listId).setCallback(new Callback<Object>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSuccess(Object result) {
|
|
||||||
loadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(ErrorResponse error) {
|
|
||||||
error.showToast(getActivity());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,5 +50,4 @@
|
|||||||
<string name="sk_color_theme_material_you">Material You</string>
|
<string name="sk_color_theme_material_you">Material You</string>
|
||||||
<string name="sk_not_supported">Not supported on your device</string>
|
<string name="sk_not_supported">Not supported on your device</string>
|
||||||
<string name="sk_lists_timeline">Lists picker</string>
|
<string name="sk_lists_timeline">Lists picker</string>
|
||||||
<string name="sk_delete_list_dialog_title">Delete list?</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user