From b1940eb4d634e316fa06d487f90b5e0b4d1e2bf9 Mon Sep 17 00:00:00 2001
From: hius07 <62179190+hius07@users.noreply.github.com>
Date: Tue, 31 Dec 2024 08:54:05 +0200
Subject: [PATCH] End of document menu: minor fix (#12962)

---
 .../ui/elements/common_settings_menu_table.lua     | 14 ++++++++++++--
 frontend/ui/elements/filemanager_menu_order.lua    |  2 +-
 frontend/ui/elements/reader_menu_order.lua         |  2 +-
 .../elements/screen_disable_double_tap_table.lua   | 14 --------------
 4 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 frontend/ui/elements/screen_disable_double_tap_table.lua

diff --git a/frontend/ui/elements/common_settings_menu_table.lua b/frontend/ui/elements/common_settings_menu_table.lua
index 3df123cf9..d974f0cda 100644
--- a/frontend/ui/elements/common_settings_menu_table.lua
+++ b/frontend/ui/elements/common_settings_menu_table.lua
@@ -283,7 +283,16 @@ if Device:isTouchDevice() then
             UIManager:broadcastEvent(Event:new("IgnoreHoldCorners"))
         end,
     }
-    common_settings.screen_disable_double_tab = dofile("frontend/ui/elements/screen_disable_double_tap_table.lua")
+    common_settings.screen_disable_double_tap = {
+        text = _("Disable double tap"),
+        checked_func = function()
+            return G_reader_settings:nilOrTrue("disable_double_tap")
+        end,
+        callback = function()
+            G_reader_settings:flipNilOrTrue("disable_double_tap")
+            UIManager:askForRestart()
+        end,
+    }
     common_settings.menu_activate = dofile("frontend/ui/elements/menu_activate.lua")
 end
 
@@ -685,7 +694,8 @@ common_settings.document_end_action = {
         {
             text = _("Open next file"),
             enabled_func = function()
-                return G_reader_settings:readSetting("collate") ~= "access"
+                local collate = G_reader_settings:readSetting("collate")
+                return collate ~= "access" and collate ~= "date"
             end,
             checked_func = function()
                 return G_reader_settings:readSetting("end_document_action") == "next_file"
diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua
index 0f6f49f36..e78dd019b 100644
--- a/frontend/ui/elements/filemanager_menu_order.lua
+++ b/frontend/ui/elements/filemanager_menu_order.lua
@@ -111,7 +111,7 @@ local order = {
         "gesture_intervals",
         "----------------------------",
         "ignore_hold_corners",
-        "screen_disable_double_tab",
+        "screen_disable_double_tap",
         "----------------------------",
         "menu_activate",
     },
diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua
index bf7ac0cd6..c86cf284d 100644
--- a/frontend/ui/elements/reader_menu_order.lua
+++ b/frontend/ui/elements/reader_menu_order.lua
@@ -161,7 +161,7 @@ local order = {
         "gesture_intervals",
         "----------------------------",
         "ignore_hold_corners",
-        "screen_disable_double_tab",
+        "screen_disable_double_tap",
         "----------------------------",
         "follow_links",
         "----------------------------",
diff --git a/frontend/ui/elements/screen_disable_double_tap_table.lua b/frontend/ui/elements/screen_disable_double_tap_table.lua
deleted file mode 100644
index ea06a2709..000000000
--- a/frontend/ui/elements/screen_disable_double_tap_table.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local UIManager = require("ui/uimanager")
-local _ = require("gettext")
-
-return {
-    text = _("Disable double tap"),
-    checked_func = function()
-        return G_reader_settings:nilOrTrue("disable_double_tap")
-    end,
-    callback = function()
-        local disabled = G_reader_settings:nilOrTrue("disable_double_tap")
-        G_reader_settings:saveSetting("disable_double_tap", not disabled)
-        UIManager:askForRestart()
-    end,
-}