diff options
| author | Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> | 2023-05-03 15:26:19 +0000 |
|---|---|---|
| committer | Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> | 2023-05-03 15:26:19 +0000 |
| commit | 39837030337b472b52ab1d85688472a69fe13e2f (patch) | |
| tree | 693c25e118ff911a0d69bbac70ced2ee6066887e /app/src/main/res | |
| parent | c3cd1620929aa6c92e064e5e313046bd47d2df90 (diff) | |
| download | infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.tar infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.tar.gz infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.tar.bz2 infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.tar.lz infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.tar.xz infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.tar.zst infinity-for-reddit-39837030337b472b52ab1d85688472a69fe13e2f.zip | |
Do not render ZoomSurfaceView when pinch to to zoom video is disabled.
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_view_video.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_view_video_zoomable.xml | 52 |
2 files changed, 55 insertions, 13 deletions
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 |