Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Fix News scroll issue #12865

Merged
merged 7 commits into from
Apr 14, 2022
Merged

[Android] Fix News scroll issue #12865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9624a2d
Android Fix News scroll issue
tapanmodh Apr 1, 2022
87df789
Android Fix News scroll issue
tapanmodh Apr 1, 2022
3538f27
Android Fix News scroll issue
tapanmodh Apr 1, 2022
d3dc975
nested scrollview full viewport
tapanmodh Apr 4, 2022
25cde1b
nested scrollview full viewport
tapanmodh Apr 13, 2022
32239c1
replace scrollview references to NestedScrollView
tapanmodh Apr 13, 2022
40f1d7f
Resolve formatting error
deeppandya Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ScrollView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
import androidx.core.widget.NestedScrollView;

import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.supplier.Supplier;
Expand Down Expand Up @@ -41,7 +41,7 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
private FrameLayout mRootView;

// Own members.
private @Nullable ScrollView mScrollViewForPolicy;
private @Nullable NestedScrollView mScrollViewForPolicy;

public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
WindowAndroid windowAndroid, @Nullable SnapScrollHelper snapScrollHelper,
Expand Down Expand Up @@ -71,7 +71,9 @@ public void createScrollViewForPolicy() {
// Remove all previously added views.
mRootView.removeAllViews();

mScrollViewForPolicy = new ScrollView(mActivity);
mScrollViewForPolicy = new NestedScrollView(mActivity);
mScrollViewForPolicy.setLayoutParams(new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
mScrollViewForPolicy.setBackgroundColor(
ApiCompatibilityUtils.getColor(mActivity.getResources(), R.color.default_bg_color));
mScrollViewForPolicy.setVerticalScrollBarEnabled(false);
Expand All @@ -88,11 +90,12 @@ public void createScrollViewForPolicy() {
mScrollViewForPolicy.addView(mNtpHeader);
}
mRootView.addView(mScrollViewForPolicy);
mScrollViewForPolicy.setOverScrollMode(View.OVER_SCROLL_NEVER);
mScrollViewForPolicy.setFillViewport(true);
mScrollViewForPolicy.requestFocus();
}

public ScrollView getScrollViewForPolicy() {
public NestedScrollView getScrollViewForPolicy() {
return mScrollViewForPolicy;
}

Expand Down
5 changes: 3 additions & 2 deletions android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
package org.chromium.chrome.browser.feed;

import android.content.Context;
import android.widget.ScrollView;

import androidx.annotation.Nullable;
import androidx.core.widget.NestedScrollView;

import org.chromium.chrome.browser.feed.sort_ui.FeedOptionsCoordinator;
import org.chromium.ui.modelutil.PropertyModel;
Expand Down Expand Up @@ -38,7 +38,8 @@ void updateContent() {
return;
}

ScrollView view = ((BraveFeedSurfaceCoordinator) mCoordinator).getScrollViewForPolicy();
NestedScrollView view =
((BraveFeedSurfaceCoordinator) mCoordinator).getScrollViewForPolicy();
if (view != null) {
return;
}
Expand Down
6 changes: 3 additions & 3 deletions android/java/org/chromium/chrome/browser/app/BraveActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.ScrollView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

Expand Down Expand Up @@ -746,8 +746,8 @@ public void setBackground(Bitmap bgWallpaper) {
if (compositorView != null) {
ViewGroup root = (ViewGroup) compositorView.getChildAt(1);

if (root.getChildAt(0) instanceof ScrollView) {
ScrollView scrollView = (ScrollView) root.getChildAt(0);
if (root.getChildAt(0) instanceof NestedScrollView) {
NestedScrollView scrollView = (NestedScrollView) root.getChildAt(0);

DisplayMetrics displayMetrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
Expand Down
16 changes: 8 additions & 8 deletions android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.cardview.widget.CardView;
import androidx.core.widget.ImageViewCompat;
import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.LinearLayoutManager;
Expand Down Expand Up @@ -198,7 +198,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout implements Connectio
private TextView mLoading;
private View mLoadingView;
private View mFeedSpinner;
private ScrollView mParentScrollView;
private NestedScrollView mParentScrollView;
private ViewGroup mImageCreditLayout;
private ViewGroup mSettingsBar;
private ViewGroup mNewContentButton;
Expand Down Expand Up @@ -764,7 +764,7 @@ private void initNews() {
mRecyclerView.setLayoutManager(
new LinearLayoutManagerWrapper(mActivity, LinearLayoutManager.VERTICAL, false));

mParentScrollView = (ScrollView) mNtpContent.getParent();
mParentScrollView = (NestedScrollView) mNtpContent.getParent();

ViewGroup rootView = (ViewGroup) mParentScrollView.getParent();
mCompositorView = (ViewGroup) rootView.getParent();
Expand Down Expand Up @@ -953,7 +953,7 @@ public void onClick(View v) {
public boolean onDoubleTap(MotionEvent e) {
correctPosition(false);
mParentScrollView.fullScroll(
ScrollView.FOCUS_UP);
NestedScrollView.FOCUS_UP);
mRecyclerView.scrollToPosition(0);
return super.onDoubleTap(e);
}
Expand Down Expand Up @@ -1161,7 +1161,7 @@ public void onClick(View v) {
sharedPreferencesEditor.putBoolean(BraveNewsPreferences.PREF_SHOW_OPTIN, false);
sharedPreferencesEditor.apply();
correctPosition(false);
mParentScrollView.fullScroll(ScrollView.FOCUS_UP);
mParentScrollView.fullScroll(NestedScrollView.FOCUS_UP);
mImageCreditLayout.setAlpha(1.0f);
mOptinLayout.setVisibility(View.GONE);
}
Expand Down Expand Up @@ -1196,7 +1196,7 @@ public void onClick(View v) {
}

getFeed();
mParentScrollView.fullScroll(ScrollView.FOCUS_UP);
mParentScrollView.fullScroll(NestedScrollView.FOCUS_UP);
mRecyclerView.scrollToPosition(0);
}
});
Expand Down Expand Up @@ -1399,7 +1399,7 @@ public void updateNTPImage() {
initilizeSponsoredTab();
}
checkAndShowNTPImage(false);
mParentScrollView = (ScrollView) mNtpContent.getParent();
mParentScrollView = (NestedScrollView) mNtpContent.getParent();
ViewGroup rootView = (ViewGroup) mParentScrollView.getParent();
CompositorViewHolder compositorView = (CompositorViewHolder) rootView.getParent();
final int childCount = compositorView.getChildCount();
Expand Down Expand Up @@ -1450,7 +1450,7 @@ public void bgWallpaperRetrieved(Bitmap bgWallpaper) {
BraveActivity.getBraveActivity().setBackground(bgWallpaper);
}
try {
mParentScrollView = (ScrollView) mNtpContent.getParent();
mParentScrollView = (NestedScrollView) mNtpContent.getParent();
if (mParentScrollView != null) {
ViewGroup rootView = (ViewGroup) mParentScrollView.getParent();

Expand Down
1 change: 1 addition & 0 deletions android/java/res/layout/new_tab_page_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
android:id="@+id/newsRecycler"
android:layout_width="match_parent"
android:layout_height="750dp"
android:overScrollMode="never"
android:visibility="gone"
/>

Expand Down