From e4f25cc8281f1033c2aad49f44c5ad7062d666d2 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 22 May 2021 23:19:51 +0800
Subject: Version 4.3.1. Restore changes in ViewVideoActivity to fix a bug that
 video continues playing in the background after exiting. Rename Swipe
 Vertically to Go Back From Media to Swipe Vertically to Go Back From Image
 and Gif.

---
 .../infinityforreddit/activities/ViewVideoActivity.java    | 14 +++++---------
 app/src/main/res/values/strings.xml                        |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
index 7e44ba9f..61a12366 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
@@ -204,15 +204,11 @@ public class ViewVideoActivity extends AppCompatActivity {
             }
         }
 
-        if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_VERTICALLY_TO_GO_BACK_FROM_MEDIA, true)) {
-            haulerView.setOnDragDismissedListener(dragDirection -> {
-                int slide = dragDirection == DragDirection.UP ? R.anim.slide_out_up : R.anim.slide_out_down;
-                finish();
-                overridePendingTransition(0, slide);
-            });
-        } else {
-            haulerView.setDragEnabled(false);
-        }
+        haulerView.setOnDragDismissedListener(dragDirection -> {
+            int slide = dragDirection == DragDirection.UP ? R.anim.slide_out_up : R.anim.slide_out_down;
+            finish();
+            overridePendingTransition(0, slide);
+        });
 
         Intent intent = getIntent();
         postTitle = intent.getStringExtra(EXTRA_POST_TITLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fe4e5a9..118d8002 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -398,7 +398,7 @@
     <string name="settings_swap_tap_and_long_title">Swap Tap and Long Press in Comments</string>
     <string name="settings_swipe_to_go_back_title">Swipe Right to Go Back</string>
     <string name="settings_swipe_to_go_back_summary">Does Not Apply to All Pages</string>
-    <string name="settings_swipe_vertically_to_go_back_from_media_title">Swipe Vertically to Go Back From Media</string>
+    <string name="settings_swipe_vertically_to_go_back_from_media_title">Swipe Vertically to Go Back From Image and Gif</string>
     <string name="settings_lock_jump_to_next_top_level_comment_button_title">Lock Jump to Next Top-level Comment Button</string>
     <string name="settings_lock_bottom_app_bar_title">Lock Bottom Navigation Bar</string>
     <string name="settings_swipe_up_to_hide_jump_to_next_top_level_comment_button_title">Swipe Up to Hide Jump to Next Top-level Comment Button</string>
-- 
cgit v1.2.3