Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Removing by long pressing no longer removes a random tab, but the pressed one.

This commit is contained in:
Somethingweirdhere 2018-06-19 15:13:38 +02:00 committed by Christian Schabesberger
parent 614bdb33b4
commit f29fa939ab
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMain.java
View File

@ -161,12 +161,12 @@ public class ContentSettingsMain extends Fragment {
itemTouchHelper = mItemTouchHelper; itemTouchHelper = mItemTouchHelper;
} }
public boolean swapItems(int fromPosition, int toPosition) { public void swapItems(int fromPosition, int toPosition) {
String temp = usedTabs.get(fromPosition); String temp = usedTabs.get(fromPosition);
usedTabs.set(fromPosition, usedTabs.get(toPosition)); usedTabs.set(fromPosition, usedTabs.get(toPosition));
usedTabs.set(toPosition, temp); usedTabs.set(toPosition, temp);
notifyItemMoved(fromPosition, toPosition); notifyItemMoved(fromPosition, toPosition);
return true; saveChanges();
} }
@Override @Override
@ -208,6 +208,8 @@ public class ContentSettingsMain extends Fragment {
handle.setImageResource(ThemeHelper.getIconByAttr(R.attr.drag_handle, getContext())); handle.setImageResource(ThemeHelper.getIconByAttr(R.attr.drag_handle, getContext()));
handle.setOnTouchListener(getOnTouchListener(holder)); handle.setOnTouchListener(getOnTouchListener(holder));
view.setOnLongClickListener(getOnLongClickListener(holder));
if(usedTabs.get(position).startsWith("6\t")) { if(usedTabs.get(position).startsWith("6\t")) {
String channelInfo[] = usedTabs.get(position).split("\t"); String channelInfo[] = usedTabs.get(position).split("\t");
String channelName = ""; String channelName = "";
@ -228,6 +230,16 @@ public class ContentSettingsMain extends Fragment {
return false; return false;
}; };
} }
private View.OnLongClickListener getOnLongClickListener(TabViewHolder holder) {
return (view) -> {
int position = holder.getAdapterPosition();
usedTabs.remove(position);
notifyItemRemoved(position);
saveChanges();
return false;
};
}
} }
} }
@ -255,9 +267,8 @@ public class ContentSettingsMain extends Fragment {
final int sourceIndex = source.getAdapterPosition(); final int sourceIndex = source.getAdapterPosition();
final int targetIndex = target.getAdapterPosition(); final int targetIndex = target.getAdapterPosition();
final boolean isSwapped = usedAdapter.swapItems(sourceIndex, targetIndex); usedAdapter.swapItems(sourceIndex, targetIndex);
if (isSwapped) saveChanges(); return true;
return isSwapped;
} }
@Override @Override