diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java similarity index 60% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java index 57b6b826c..4a14962a2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java @@ -1,9 +1,10 @@ package org.joinmastodon.android.api.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; +import java.util.List; -public class DeleteList extends MastodonAPIRequest { - public DeleteList(String listId){ +public class RemoveList extends MastodonAPIRequest { + public RemoveList(String listId){ super(HttpMethod.DELETE, "/lists/"+listId, Object.class); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java index bd1d32d3d..1005a9ecf 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java @@ -18,7 +18,6 @@ import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIRequest; 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.RemoveAccountsFromList; import org.joinmastodon.android.model.ListTimeline; @@ -33,7 +32,6 @@ import java.util.List; import java.util.Map; import me.grishka.appkit.Nav; -import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; import me.grishka.appkit.api.SimpleCallback; import me.grishka.appkit.fragments.BaseRecyclerFragment; @@ -182,8 +180,8 @@ public class ListTimelinesFragment extends BaseRecyclerFragment im } else { listToggle.setVisibility(View.GONE); } - edit.setOnClickListener(v -> this.editListName(item.id)); - delete.setOnClickListener(v -> this.deleteList(item.id)); +// edit.setOnClickListener(); +// delete.setOnClickListener(); } private void onClickToggle(View view) { @@ -195,35 +193,12 @@ public class ListTimelinesFragment extends BaseRecyclerFragment im UiUtils.openListTimeline(getActivity(), accountId, item); } - private void editListName(String listId){ - new M3AlertDialogBuilder(getActivity()) - .setTitle(R.string.edit_text_edited) +// private void editListName(){ +// new M3AlertDialogBuilder(getActivity()) +// .setTitle(R.string.edit_text_edited) // .setPositiveButton(R.string.discard, (dialog, which)-> ) - .setNegativeButton(R.string.cancel, null) - .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() { - - @Override - public void onSuccess(Object result) { - loadData(); - } - - @Override - public void onError(ErrorResponse error) { - error.showToast(getActivity()); - } - }); - } +// .setNegativeButton(R.string.cancel, null) +// .show(); +// } } } diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index 5febec930..a4ba9cd93 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -50,5 +50,4 @@ Material You Not supported on your device Lists picker - Delete list?