aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_view_video.xml5
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/xml/gestures_and_buttons_preferences.xml6
3 files changed, 11 insertions, 2 deletions
diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index bc828a7c..bd314ccc 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -10,7 +10,8 @@
app:dragUpEnabled="true"
tools:application="ml.docilealligator.infinityforreddit.activities.ViewVideoActivity">
- <androidx.core.widget.NestedScrollView
+ <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">
@@ -45,6 +46,6 @@
</androidx.coordinatorlayout.widget.CoordinatorLayout>
- </androidx.core.widget.NestedScrollView>
+ </app.futured.hauler.LockableNestedScrollView>
</app.futured.hauler.HaulerView> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f7e8f98..85c90a0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -613,6 +613,8 @@
<string name="settings_link_handler_value_custom_tab">Custom Tab</string>
<string name="settings_link_handler_value_internal_browser">Internal Browser</string>
<string name="settings_legacy_autoplay_video_controller_ui_title">Legacy Video Controller UI</string>
+ <string name="settings_pinch_to_zoom_video_title">Pinch to Zoom Video</string>
+ <string name="settings_experimental_feature">Experimental feature</string>
<string name="no_link_available">Cannot get the link</string>
diff --git a/app/src/main/res/xml/gestures_and_buttons_preferences.xml b/app/src/main/res/xml/gestures_and_buttons_preferences.xml
index fd49d4c0..2784977a 100644
--- a/app/src/main/res/xml/gestures_and_buttons_preferences.xml
+++ b/app/src/main/res/xml/gestures_and_buttons_preferences.xml
@@ -54,6 +54,12 @@
app:key="swipe_between_posts"
app:title="@string/settings_swipe_between_posts_title" />
+ <SwitchPreference
+ app:defaultValue="false"
+ app:key="pinch_to_zoom_video"
+ app:title="@string/settings_pinch_to_zoom_video_title"
+ app:summary="@string/settings_experimental_feature" />
+
<Preference
app:title="@string/settings_swipe_action_title"
app:fragment="ml.docilealligator.infinityforreddit.settings.SwipeActionPreferenceFragment" />