From 39837030337b472b52ab1d85688472a69fe13e2f Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Wed, 3 May 2023 23:26:19 +0800
Subject: Do not render ZoomSurfaceView when pinch to to zoom video is
 disabled.

---
 app/src/main/res/layout/activity_view_video.xml    | 16 ++-----
 .../res/layout/activity_view_video_zoomable.xml    | 52 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_view_video_zoomable.xml

(limited to 'app/src/main')

diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index cd98291d..ff60ca5f 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -22,21 +22,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <com.otaliastudios.zoom.ZoomSurfaceView
-                android:id="@+id/zoom_surface_view_view_video_activity"
+            <com.google.android.exoplayer2.ui.PlayerView
+                android:id="@+id/player_view_view_video_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:horizontalPanEnabled="true"
-                app:verticalPanEnabled="true"
-                app:zoomEnabled="true" />
-
-            <com.google.android.exoplayer2.ui.PlayerControlView
-                android:id="@+id/player_control_view_view_video_activity"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                app:controller_layout_id="@layout/exo_playback_control_view"
-                app:show_timeout="1500" />
+                app:controller_layout_id="@layout/exo_playback_control_view"/>
 
             <ProgressBar
                 android:id="@+id/progress_bar_view_video_activity"
diff --git a/app/src/main/res/layout/activity_view_video_zoomable.xml b/app/src/main/res/layout/activity_view_video_zoomable.xml
new file mode 100644
index 00000000..cd98291d
--- /dev/null
+++ b/app/src/main/res/layout/activity_view_video_zoomable.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<app.futured.hauler.HaulerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/hauler_view_view_video_activity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#000000"
+    android:keepScreenOn="true"
+    app:dragUpEnabled="true"
+    tools:application="ml.docilealligator.infinityforreddit.activities.ViewVideoActivity">
+
+    <app.futured.hauler.LockableNestedScrollView
+        android:id="@+id/lockable_nested_scroll_view_view_video_activity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/coordinator_layout_view_video_activity"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.otaliastudios.zoom.ZoomSurfaceView
+                android:id="@+id/zoom_surface_view_view_video_activity"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:horizontalPanEnabled="true"
+                app:verticalPanEnabled="true"
+                app:zoomEnabled="true" />
+
+            <com.google.android.exoplayer2.ui.PlayerControlView
+                android:id="@+id/player_control_view_view_video_activity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                app:controller_layout_id="@layout/exo_playback_control_view"
+                app:show_timeout="1500" />
+
+            <ProgressBar
+                android:id="@+id/progress_bar_view_video_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone" />
+
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    </app.futured.hauler.LockableNestedScrollView>
+
+</app.futured.hauler.HaulerView>
\ No newline at end of file
-- 
cgit v1.2.3