Skip to content

Commit

Permalink
Fix scrolling in main screen grid
Browse files Browse the repository at this point in the history
GridLayoutManager is buggy - https://issuetracker.google.com/issues/37067220:
it randomly loses or incorrectly assigns focus when being scrolled via
direction-based navigation. This commit reimplements onFocusSearchFailed()
on top of scrollBy() to work around that problem.

Ordinary touch-based navigation should not be affected.
  • Loading branch information
Alexander committed Oct 7, 2019
1 parent 40e4839 commit 3c4d62c
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.schabi.newpipe.util.StateSaver;
import org.schabi.newpipe.util.StreamDialogEntry;
import org.schabi.newpipe.views.SuperScrollLayoutManager;
import org.schabi.newpipe.views.FixedGridLayoutManager;

import java.util.List;
import java.util.Queue;
Expand Down Expand Up @@ -156,7 +157,7 @@ protected RecyclerView.LayoutManager getGridLayoutManager() {
int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
width += (24 * resources.getDisplayMetrics().density);
final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
final GridLayoutManager lm = new FixedGridLayoutManager(activity, spanCount);
lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
return lm;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.schabi.newpipe.R;
import org.schabi.newpipe.fragments.BaseStateFragment;
import org.schabi.newpipe.fragments.list.ListViewContract;
import org.schabi.newpipe.views.FixedGridLayoutManager;

import static org.schabi.newpipe.util.AnimationUtils.animateView;

Expand Down Expand Up @@ -95,7 +96,7 @@ protected RecyclerView.LayoutManager getGridLayoutManager() {
int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
width += (24 * resources.getDisplayMetrics().density);
final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
final GridLayoutManager lm = new FixedGridLayoutManager(activity, spanCount);
lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
return lm;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import org.schabi.newpipe.util.ShareUtils;
import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.CollapsibleView;
import org.schabi.newpipe.views.FixedGridLayoutManager;

import java.io.File;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -192,7 +193,7 @@ protected RecyclerView.LayoutManager getGridLayoutManager() {
int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
width += (24 * resources.getDisplayMetrics().density);
final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
final GridLayoutManager lm = new FixedGridLayoutManager(activity, spanCount);
lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
return lm;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (C) Eltex ltd 2019 <[email protected]>
* FixedGridLayoutManager.java is part of NewPipe.
*
* NewPipe is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* NewPipe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/
package org.schabi.newpipe.views;

import android.content.Context;
import android.util.AttributeSet;
import android.view.FocusFinder;
import android.view.View;
import android.view.ViewGroup;

import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

// Version of GridLayoutManager that works around https://issuetracker.google.com/issues/37067220
public class FixedGridLayoutManager extends GridLayoutManager {
public FixedGridLayoutManager(Context context, int spanCount) {
super(context, spanCount);
}

public FixedGridLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}

public FixedGridLayoutManager(Context context, int spanCount, int orientation, boolean reverseLayout) {
super(context, spanCount, orientation, reverseLayout);
}

@Override
public View onFocusSearchFailed(View focused, int focusDirection, RecyclerView.Recycler recycler, RecyclerView.State state) {
FocusFinder ff = FocusFinder.getInstance();

View result = ff.findNextFocus((ViewGroup) focused.getParent(), focused, focusDirection);
if (result != null) {
return super.onFocusSearchFailed(focused, focusDirection, recycler, state);
}

if (focusDirection == View.FOCUS_DOWN) {
scrollVerticallyBy(10, recycler, state);
return null;
}

return super.onFocusSearchFailed(focused, focusDirection, recycler, state);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* Copyright (C) Eltex ltd 2019 <[email protected]>
* NewPipeRecyclerView.java is part of NewPipe.
*
* NewPipe is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* NewPipe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/
package org.schabi.newpipe.views;

import android.content.Context;
import android.util.AttributeSet;
import android.view.View;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;

public class NewPipeRecyclerView extends RecyclerView {
private static final String TAG = "FixedRecyclerView";

public NewPipeRecyclerView(@NonNull Context context) {
super(context);
}

public NewPipeRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
}

public NewPipeRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}

@Override
public View focusSearch(int direction) {
return null;
}

@Override
public View focusSearch(View focused, int direction) {
return null;
}

@Override
public boolean dispatchUnhandledMove(View focused, int direction) {
View found = super.focusSearch(focused, direction);
if (found != null) {
found.requestFocus(direction);
return true;
}

if (direction == View.FOCUS_UP) {
if (canScrollVertically(-1)) {
scrollBy(0, -10);
return true;
}

return false;
}

return super.dispatchUnhandledMove(focused, direction);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.schabi.newpipe.settings.NewPipeSettings;
import org.schabi.newpipe.util.FilePickerActivityHelper;
import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.FixedGridLayoutManager;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -108,7 +109,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
mList = v.findViewById(R.id.mission_recycler);

// Init layouts managers
mGridManager = new GridLayoutManager(getActivity(), SPAN_SIZE);
mGridManager = new FixedGridLayoutManager(getActivity(), SPAN_SIZE);
mGridManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@Override
public int getSpanSize(int position) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_kiosk.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.recyclerview.widget.RecyclerView
<org.schabi.newpipe.views.NewPipeRecyclerView
android:id="@+id/items_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down

0 comments on commit 3c4d62c

Please sign in to comment.