diff --git a/app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java b/app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java index b8641c92b..c64689775 100644 --- a/app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java +++ b/app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java @@ -55,7 +55,7 @@ public abstract class HistoryFragment extends BaseFragme private RecyclerView mRecyclerView; private HistoryEntryAdapter mHistoryAdapter; private ItemTouchHelper.SimpleCallback mHistoryItemSwipeCallback; - private int allowedSwipeToDeleteDirections = ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT; + // private int allowedSwipeToDeleteDirections = ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT; private HistoryDAO mHistoryDataSource; private PublishSubject> mHistoryEntryDeleteSubject; @@ -99,7 +99,11 @@ public abstract class HistoryFragment extends BaseFragme } }); - mHistoryItemSwipeCallback = new ItemTouchHelper.SimpleCallback(0, allowedSwipeToDeleteDirections) { + + } + + protected void historyItemSwipeCallback(int swipeDirection) { + mHistoryItemSwipeCallback = new ItemTouchHelper.SimpleCallback(0, swipeDirection) { @Override public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { return false; @@ -265,10 +269,6 @@ public abstract class HistoryFragment extends BaseFragme mRecyclerViewState = mRecyclerView.getLayoutManager().onSaveInstanceState(); } - public void setAllowedSwipeToDeleteDirections(int allowedSwipeToDeleteDirections) { - this.allowedSwipeToDeleteDirections = allowedSwipeToDeleteDirections; - } - /** * Called when history enabled flag is changed. * diff --git a/app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java b/app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java index 888086a83..91e2cecff 100644 --- a/app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java +++ b/app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java @@ -1,9 +1,12 @@ package org.schabi.newpipe.history; import android.content.Context; +import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.helper.ItemTouchHelper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,11 +20,19 @@ import org.schabi.newpipe.util.NavigationHelper; public class SearchHistoryFragment extends HistoryFragment { + private static int allowedSwipeToDeleteDirections = ItemTouchHelper.RIGHT; + @NonNull public static SearchHistoryFragment newInstance() { return new SearchHistoryFragment(); } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + historyItemSwipeCallback(allowedSwipeToDeleteDirections); + } + @NonNull @Override protected SearchHistoryAdapter createAdapter() { diff --git a/app/src/main/java/org/schabi/newpipe/history/WatchedHistoryFragment.java b/app/src/main/java/org/schabi/newpipe/history/WatchedHistoryFragment.java index 086528af7..d898bf353 100644 --- a/app/src/main/java/org/schabi/newpipe/history/WatchedHistoryFragment.java +++ b/app/src/main/java/org/schabi/newpipe/history/WatchedHistoryFragment.java @@ -7,6 +7,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.helper.ItemTouchHelper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -26,6 +27,8 @@ import org.schabi.newpipe.util.NavigationHelper; public class WatchedHistoryFragment extends HistoryFragment { + private static int allowedSwipeToDeleteDirections = ItemTouchHelper.LEFT; + @NonNull public static WatchedHistoryFragment newInstance() { return new WatchedHistoryFragment(); @@ -34,7 +37,7 @@ public class WatchedHistoryFragment extends HistoryFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + historyItemSwipeCallback(allowedSwipeToDeleteDirections); } @StringRes