From 5d9b5a063bbda7a3825b6a0509d5e7c3777fc95f Mon Sep 17 00:00:00 2001
From: yausername <13ritvik@gmail.com>
Date: Sun, 29 Sep 2019 22:05:29 +0530
Subject: [PATCH] fix scrolling in video detail fragment. fixes #2627
---
app/build.gradle | 1 -
.../schabi/newpipe/about/AboutActivity.java | 1 -
.../list/comments/CommentsFragment.java | 2 +-
.../fragment_video_detail.xml | 28 +++++++++----------
.../main/res/layout/fragment_video_detail.xml | 25 ++++++++---------
5 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 614d49ac9..5c73c0936 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,7 +73,6 @@ dependencies {
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'de.hdodenhof:circleimageview:2.2.0'
- implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1'
implementation 'com.nononsenseapps:filepicker:4.2.1'
implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 0450290d2..6776b593b 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -36,7 +36,6 @@ public class AboutActivity extends AppCompatActivity {
new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
new SoftwareComponent("CircleImageView", "2014 - 2017", "Henning Dodenhof", "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
- new SoftwareComponent("ParalaxScrollView", "2014", "Nir Hartmann", "https://github.com/nirhart/ParallaxScroll", StandardLicenses.MIT),
new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam", "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2),
new SoftwareComponent("ExoPlayer", "2014-2017", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors", "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
index 956e6c1c8..481639a7c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
@@ -93,7 +93,7 @@ public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
public void handleResult(@NonNull CommentsInfo result) {
super.handleResult(result);
- AnimationUtils.slideUp(getView(),120, 96, 0.06f);
+ AnimationUtils.slideUp(getView(),120, 150, 0.06f);
if (!result.getErrors().isEmpty()) {
showSnackBarError(result.getErrors(), UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 15d6b7a17..a61660d0c 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -130,24 +130,24 @@
android:visibility="gone"
tools:text="12:38"
tools:visibility="visible" />
+
+ <org.schabi.newpipe.views.AnimatedProgressBar
+ android:id="@+id/position_view"
+ style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_gravity="bottom"
+ android:background="@android:color/transparent"
+ android:progressDrawable="?attr/progress_horizontal_drawable"
+ android:visibility="invisible"
+ tools:max="100"
+ tools:progress="40"
+ tools:visibility="visible" />
+
</FrameLayout>
</android.support.design.widget.CollapsingToolbarLayout>
- <org.schabi.newpipe.views.AnimatedProgressBar
- android:id="@+id/position_view"
- style="@style/Widget.AppCompat.ProgressBar.Horizontal"
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:layout_marginTop="-2dp"
- android:background="@android:color/transparent"
- android:progressDrawable="?attr/progress_horizontal_drawable"
- android:visibility="invisible"
- app:layout_scrollFlags="scroll"
- tools:max="100"
- tools:progress="40"
- tools:visibility="visible" />
-
<!-- CONTENT -->
<RelativeLayout
android:id="@+id/detail_content_root_layout"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 2139fd0cc..9b4bc67e8 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -128,23 +128,22 @@
tools:text="12:38"
tools:visibility="visible" />
+ <org.schabi.newpipe.views.AnimatedProgressBar
+ android:id="@+id/position_view"
+ style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_gravity="bottom"
+ android:progressDrawable="?attr/progress_horizontal_drawable"
+ android:visibility="invisible"
+ tools:max="100"
+ tools:progress="40"
+ tools:visibility="visible" />
+
</FrameLayout>
</android.support.design.widget.CollapsingToolbarLayout>
- <org.schabi.newpipe.views.AnimatedProgressBar
- android:id="@+id/position_view"
- style="@style/Widget.AppCompat.ProgressBar.Horizontal"
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:layout_marginTop="-2dp"
- android:progressDrawable="?attr/progress_horizontal_drawable"
- android:visibility="invisible"
- app:layout_scrollFlags="scroll"
- tools:max="100"
- tools:progress="40"
- tools:visibility="visible" />
-
<!-- CONTENT -->
<RelativeLayout
android:id="@+id/detail_content_root_layout"