Merge branch 'dev' into playback_state_list

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

@@ -46,6 +46,7 @@ import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
@@ -400,6 +401,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         private ImageButton playPauseButton;
         private ImageButton playPreviousButton;
         private ImageButton playNextButton;
+        private Button closeButton;
 
         private RelativeLayout queueLayout;
         private ImageButton itemsListCloseButton;
@@ -441,6 +443,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             this.playPauseButton = rootView.findViewById(R.id.playPauseButton);
             this.playPreviousButton = rootView.findViewById(R.id.playPreviousButton);
             this.playNextButton = rootView.findViewById(R.id.playNextButton);
+            this.closeButton = rootView.findViewById(R.id.closeButton);
 
             this.moreOptionsButton = rootView.findViewById(R.id.moreOptionsButton);
             this.secondaryControls = rootView.findViewById(R.id.secondaryControls);
@@ -488,6 +491,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             playPauseButton.setOnClickListener(this);
             playPreviousButton.setOnClickListener(this);
             playNextButton.setOnClickListener(this);
+            closeButton.setOnClickListener(this);
 
             moreOptionsButton.setOnClickListener(this);
             shareButton.setOnClickListener(this);
@@ -655,6 +659,9 @@ public final class MainVideoPlayer extends AppCompatActivity
             } else if (v.getId() == switchBackgroundButton.getId()) {
                 onPlayBackgroundButtonClicked();
 
+            } else if (v.getId() == closeButton.getId()) {
+                onPlaybackShutdown();
+                return;
             }
 
             if (getCurrentState() != STATE_COMPLETED) {
@@ -788,6 +795,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             super.onBlocked();
             playPauseButton.setImageResource(R.drawable.ic_pause_white);
             animatePlayButtons(false, 100);
+            animateView(closeButton, false, DEFAULT_CONTROLS_DURATION);
             getRootView().setKeepScreenOn(true);
         }
 
@@ -803,6 +811,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
                 playPauseButton.setImageResource(R.drawable.ic_pause_white);
                 animatePlayButtons(true, 200);
+                animateView(closeButton, false, DEFAULT_CONTROLS_DURATION);
             });
 
             getRootView().setKeepScreenOn(true);
@@ -814,6 +823,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
                 playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
                 animatePlayButtons(true, 200);
+                animateView(closeButton, false, DEFAULT_CONTROLS_DURATION);
             });
 
             showSystemUi();
@@ -833,8 +843,8 @@ public final class MainVideoPlayer extends AppCompatActivity
             animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, () -> {
                 playPauseButton.setImageResource(R.drawable.ic_replay_white);
                 animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
+                animateView(closeButton, true, DEFAULT_CONTROLS_DURATION);
             });
-
             getRootView().setKeepScreenOn(false);
             super.onCompleted();
         }

app/src/main/res/layout-large-land/activity_main_player.xml

@@ -477,6 +477,22 @@
             android:src="@drawable/exo_controls_next"
             tools:ignore="ContentDescription"/>
 
+        <Button
+            android:id="@+id/closeButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/playPauseButton"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="10dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/close"
+            android:textAllCaps="true"
+            android:textColor="@color/white"
+            android:visibility="invisible" />
+
     </RelativeLayout>
 
 

app/src/main/res/layout/activity_main_player.xml

@@ -475,6 +475,22 @@
             android:src="@drawable/exo_controls_next"
             tools:ignore="ContentDescription"/>
 
+        <Button
+            android:id="@+id/closeButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/playPauseButton"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="10dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/close"
+            android:textAllCaps="true"
+            android:textColor="@color/white"
+            android:visibility="invisible" />
+
     </RelativeLayout>
 
 

app/src/main/res/values-ru/strings.xml

@@ -474,4 +474,5 @@
     <string name="error_http_no_content">Не удалось получить данные с сервера</string>
     <string name="error_postprocessing_failed">Пост-обработка не удалась</string>
     <string name="pause_downloads_on_mobile">Останавливать скачивание при переходе на мобильную сеть</string>
+    <string name="close">Закрыть</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -604,5 +604,6 @@
     <string name="max_retry_desc">Maximum number of attempts before canceling the download</string>
     <string name="pause_downloads_on_mobile">Pause on switching to mobile data</string>
     <string name="pause_downloads_on_mobile_desc">Downloads that can not be paused will be restarted</string>
+    <string name="close">Close</string>
 
 </resources>