From 9e5b5c78e25ce0f7c1237a558a538a9ee0c246d1 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sun, 10 Oct 2021 22:12:31 +0800
Subject: [PATCH] Refresh in WebViewActivity.

---
 .../infinityforreddit/activities/WebViewActivity.java  |  9 +++------
 app/src/main/res/menu/web_view_activity.xml            | 10 ++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/WebViewActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/WebViewActivity.java
index 54106401..8945e758 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/WebViewActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/WebViewActivity.java
@@ -22,7 +22,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.google.android.material.appbar.AppBarLayout;
-import com.r0adkll.slidr.Slidr;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -33,7 +32,6 @@ import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.customviews.LollipopBugFixedWebView;
-import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class WebViewActivity extends BaseActivity {
@@ -74,10 +72,6 @@ public class WebViewActivity extends BaseActivity {
 
         applyCustomTheme();
 
-        if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
-            Slidr.attach(this);
-        }
-
         setSupportActionBar(toolbar);
 
         webView.getSettings().setJavaScriptEnabled(true);
@@ -131,6 +125,9 @@ public class WebViewActivity extends BaseActivity {
         if (item.getItemId() == android.R.id.home) {
             finish();
             return true;
+        } else if (item.getItemId() == R.id.action_refresh_web_view_activity) {
+            webView.reload();
+            return true;
         } else if (item.getItemId() == R.id.action_share_link_web_view_activity) {
             try {
                 Intent intent = new Intent(Intent.ACTION_SEND);
diff --git a/app/src/main/res/menu/web_view_activity.xml b/app/src/main/res/menu/web_view_activity.xml
index ad064161..217c6ca0 100644
--- a/app/src/main/res/menu/web_view_activity.xml
+++ b/app/src/main/res/menu/web_view_activity.xml
@@ -2,14 +2,20 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_share_link_web_view_activity"
+        android:id="@+id/action_refresh_web_view_activity"
         android:orderInCategory="1"
+        android:title="@string/action_refresh"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_share_link_web_view_activity"
+        android:orderInCategory="2"
         android:title="@string/action_share_link"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/action_copy_link_web_view_activity"
-        android:orderInCategory="2"
+        android:orderInCategory="3"
         android:title="@string/action_copy_link"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file