Better popup resizing with pinch gestures #3075

harshlele · 2020-02-11T05:45:40Z

I carefully read the contribution guidelines and agree to them.

The current popup window does resize with pinch gestures, but it's a bit weird. It resizes to the distance between the 2 fingers, and changes its position to one of the fingers. I changed it so that the window size scales to the pinch-in/out gesture and stays in the same position.

Fixes #515 fixes #2880 fixes #2918

APK:
app-debug.zip

Stypox

Thank you for this useful contribution!

Stypox · 2020-03-03T20:15:55Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

-            checkPopupPositionBounds();
-            updateScreenSize();
+                if(firstPointerMoveX > scaledTouchSlop ||firstPointerMoveY > scaledTouchSlop ||
+                        secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop){


Suggested change

secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop){

secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop) {

Stypox · 2020-03-03T20:16:08Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

+                    double currentPointerDistance = Math.sqrt(currentXDiff * currentXDiff + currentYDiff * currentYDiff);
+
+                    //scale popup width
+                    double scale = 1 + (currentPointerDistance - initPointerDistance)/ initPointerDistance;


This is algebraically equal to:

Suggested change

double scale = 1 + (currentPointerDistance - initPointerDistance)/ initPointerDistance;

double scale = currentPointerDistance / initPointerDistance;

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

Stypox · 2020-03-03T20:24:14Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

+                    float currentXDiff = event.getX(0) - event.getX(1);
+                    float currentYDiff = event.getY(0) - event.getY(1);
+                    double currentPointerDistance = Math.sqrt(currentXDiff * currentXDiff + currentYDiff * currentYDiff);


There is the Java Math.hypot() function that does exactly this

Suggested change

float currentXDiff = event.getX(0) - event.getX(1);

float currentYDiff = event.getY(0) - event.getY(1);

double currentPointerDistance = Math.sqrt(currentXDiff * currentXDiff + currentYDiff * currentYDiff);

double currentPointerDistance = Math.hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1));

Stypox · 2020-03-03T20:24:35Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

+                    }
+                    else{


Suggested change

}

else{

} else {

Stypox

Thank you, almost ready ;-)
When you are finished implementing these suggestions, could you provide another test apk, so that I can test on the latest changes? Thanks

Stypox · 2020-03-08T09:11:27Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

+                if(firstPointerMoveX > scaledTouchSlop ||firstPointerMoveY > scaledTouchSlop ||
+                        secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop) {


Suggested change

if(firstPointerMoveX > scaledTouchSlop ||firstPointerMoveY > scaledTouchSlop ||

secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop) {

if (firstPointerMoveX > scaledTouchSlop || firstPointerMoveY > scaledTouchSlop

|| secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop) {

Stypox · 2020-03-08T09:11:39Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -1082,25 +1105,47 @@ public boolean onTouch(View v, MotionEvent event) {
        private boolean handleMultiDrag(final MotionEvent event) {
            if (event.getPointerCount() != 2) return false;

-            final float firstPointerX = event.getX(0);
-            final float secondPointerX = event.getX(1);
+            if(initPointerDistance != -1){


Suggested change

if(initPointerDistance != -1){

if (initPointerDistance != -1) {

Hubcapp · 2020-03-08T12:09:42Z

I do prefer this behavior, but it seems that expanding isn't as smooth as it was with the weird "wherever your finger is" resize.

When i drag the popup box to the right side of the screen and expand, it remains the same size until I'm finished resizing it, (or for about that amount of time anyway...), but it moves the box over to the left.

For 4:3 video, you can see the black bars coming off the sides (why they need to be there at all for popup mode, i don't know, but it's an indicator that resizing is laggy)

ghost · 2020-03-08T17:03:05Z

@harshlele There is a little glitch during popup scaling, in practice animation doesn't correctly follow the fingers movements

ghost · 2020-03-08T17:04:06Z

Except this all working well.

harshlele · 2020-03-09T18:00:00Z

@Hubcapp @Oizaro im not sure how to solve that problem. i tried a few things but its always a bit stuttery.

harshlele · 2020-03-09T18:02:38Z

@Stypox is there like a linting test for the coding style so all these small coding style mistakes could be caught before I commit?

APK:
app-debug.zip

Stypox · 2020-03-09T19:04:44Z

@harshlele running Android Studio code refactoring on the files you changed should do the trick

Stypox · 2020-04-04T06:34:39Z

I tested this once again and could not find problems. I can't reproduce the issue pointed out by @Oizaro, but even if the bug exists I don't think it is really a big problem, compared to how clunky popup resizing is now.
So could you @harshlele rebase and fix checkstyle problems, so than it can then be merged? Sorry for the delay ;-)

Stypox

A few style issues, but this is ready :-D

Stypox · 2020-04-04T06:44:45Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

+                    //scale popup width
+                    double scale = currentPointerDistance / initPointerDistance;
+
+                    newWidth = (popupWidth * scale);


Remove the double newWidth = popupWidth; declaration above and put it directly here:

Suggested change

newWidth = (popupWidth * scale);

double newWidth = popupWidth * scale;

Stypox · 2020-04-04T06:45:36Z

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

+
+                    //change co-ordinates of popup so the center stays at the same position
+                    popupLayoutParams.x += (popupWidth - newWidth)/2;
+


Also remove some of these spaces and group similar/related statements toghether, to enhance readability

Also calculate differently the moved distance of a pointer: use euclidean and not manhattan geometry

Stypox

Thank you again for fixing this long-lasting issue! I pushed the style fixes myself, since they were very little changes, so this is now ready to be merged. I tested on Android 7.1, Android 4.4 and Android 10

TobiGr added the player Issues related to any player (main, popup and background) label Feb 11, 2020

Stypox requested changes Mar 3, 2020

View reviewed changes

Stypox self-assigned this Mar 3, 2020

Stypox requested changes Mar 8, 2020

View reviewed changes

This was referenced Mar 8, 2020

Resizing popup player #2918

Closed

{Add Feature}popup resize problem #2880

Closed

Popup window resize #515

Closed

Stypox requested changes Apr 4, 2020

View reviewed changes

Stypox added this to the 0.19.3 milestone Apr 10, 2020

harshlele and others added 4 commits April 10, 2020 22:10

changed popup resizing

9487b53

made formatting changes

fe18896

formatting changes

46918ee

Fix checkstyle issues and improve code formatting

a50e430

Also calculate differently the moved distance of a pointer: use euclidean and not manhattan geometry

Stypox force-pushed the better-popup-resizing branch from 2e59ed9 to a50e430 Compare April 10, 2020 20:17

Stypox approved these changes Apr 10, 2020

View reviewed changes

Stypox merged commit feab633 into TeamNewPipe:dev Apr 10, 2020

This was referenced Apr 24, 2020

Release 0.19.3 #3478

Merged

Release 0.19.3 #3479

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Better popup resizing with pinch gestures #3075

Better popup resizing with pinch gestures #3075

harshlele commented Feb 11, 2020 •

edited by Stypox

Stypox left a comment

Stypox Mar 3, 2020

Stypox Mar 3, 2020

Stypox Mar 3, 2020

Stypox Mar 3, 2020

Stypox left a comment

Stypox Mar 8, 2020

Stypox Mar 8, 2020

Hubcapp commented Mar 8, 2020 •

edited

ghost commented Mar 8, 2020

ghost commented Mar 8, 2020

harshlele commented Mar 9, 2020

harshlele commented Mar 9, 2020

Stypox commented Mar 9, 2020

Stypox commented Apr 4, 2020 •

edited

Stypox left a comment

Stypox Apr 4, 2020 •

edited

Stypox Apr 4, 2020

Stypox left a comment •

edited

	secPointerMoveX > scaledTouchSlop \|\| secPointerMoveY > scaledTouchSlop){
	secPointerMoveX > scaledTouchSlop \|\| secPointerMoveY > scaledTouchSlop) {

	double scale = 1 + (currentPointerDistance - initPointerDistance)/ initPointerDistance;
	double scale = currentPointerDistance / initPointerDistance;

		if(firstPointerMoveX > scaledTouchSlop \|\|firstPointerMoveY > scaledTouchSlop \|\|
		secPointerMoveX > scaledTouchSlop \|\| secPointerMoveY > scaledTouchSlop) {

	if(initPointerDistance != -1){
	if (initPointerDistance != -1) {

	newWidth = (popupWidth * scale);
	double newWidth = popupWidth * scale;


		//change co-ordinates of popup so the center stays at the same position
		popupLayoutParams.x += (popupWidth - newWidth)/2;

Better popup resizing with pinch gestures #3075

Better popup resizing with pinch gestures #3075

Conversation

harshlele commented Feb 11, 2020 • edited by Stypox

Stypox left a comment

Choose a reason for hiding this comment

Stypox Mar 3, 2020

Choose a reason for hiding this comment

Stypox Mar 3, 2020

Choose a reason for hiding this comment

Stypox Mar 3, 2020

Choose a reason for hiding this comment

Stypox Mar 3, 2020

Choose a reason for hiding this comment

Stypox left a comment

Choose a reason for hiding this comment

Stypox Mar 8, 2020

Choose a reason for hiding this comment

Stypox Mar 8, 2020

Choose a reason for hiding this comment

Hubcapp commented Mar 8, 2020 • edited

ghost commented Mar 8, 2020

ghost commented Mar 8, 2020

harshlele commented Mar 9, 2020

harshlele commented Mar 9, 2020

Stypox commented Mar 9, 2020

Stypox commented Apr 4, 2020 • edited

Stypox left a comment

Choose a reason for hiding this comment

Stypox Apr 4, 2020 • edited

Choose a reason for hiding this comment

Stypox Apr 4, 2020

Choose a reason for hiding this comment

Stypox left a comment • edited

Choose a reason for hiding this comment

harshlele commented Feb 11, 2020 •

edited by Stypox

Hubcapp commented Mar 8, 2020 •

edited

Stypox commented Apr 4, 2020 •

edited

Stypox Apr 4, 2020 •

edited

Stypox left a comment •

edited