From db0467c9f06c4a722d9ab9ac039116e9b1c7ea8c Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Thu, 28 Feb 2019 20:42:00 +0100
Subject: [PATCH] [UX] Introduce Taps & Gestures menu (#4677)

This more logically groups together various settings related to taps and gestures.

Cf. <https://github.com/koreader/koreader/pull/4655#issuecomment-466808273>.
---
 frontend/apps/reader/modules/readergesture.lua  |  2 +-
 .../ui/elements/common_settings_menu_table.lua  |  6 ++++++
 frontend/ui/elements/filemanager_menu_order.lua | 15 ++++++++++-----
 frontend/ui/elements/reader_menu_order.lua      | 17 +++++++++++------
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/frontend/apps/reader/modules/readergesture.lua b/frontend/apps/reader/modules/readergesture.lua
index 864779ca2..afbb468e1 100644
--- a/frontend/apps/reader/modules/readergesture.lua
+++ b/frontend/apps/reader/modules/readergesture.lua
@@ -137,7 +137,7 @@ function ReaderGesture:genMultiswipeSubmenu()
 end
 
 function ReaderGesture:addToMainMenu(menu_items)
-    menu_items.gesture = {
+    menu_items.gesture_manager = {
         text = _("Gesture manager"),
         sub_item_table = {
             {
diff --git a/frontend/ui/elements/common_settings_menu_table.lua b/frontend/ui/elements/common_settings_menu_table.lua
index 0d99285b9..179ca465c 100644
--- a/frontend/ui/elements/common_settings_menu_table.lua
+++ b/frontend/ui/elements/common_settings_menu_table.lua
@@ -159,6 +159,12 @@ if Device:isAndroid() then
     end
 end
 
+if Device:isTouchDevice() then
+    common_settings.taps_and_gestures = {
+        text = _("Taps and gestures"),
+    }
+end
+
 if Device:hasKeys() then
     common_settings.navigation = {
         text = _("Navigation"),
diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua
index 3c86e6440..2a4a9f2cb 100644
--- a/frontend/ui/elements/filemanager_menu_order.lua
+++ b/frontend/ui/elements/filemanager_menu_order.lua
@@ -27,8 +27,10 @@ local order = {
         "----------------------------",
         "network",
         "screen",
-        "document",
+        "----------------------------",
+        "taps_and_gestures",
         "navigation",
+        "document",
         "----------------------------",
         "language",
         "device",
@@ -37,7 +39,6 @@ local order = {
     device = {
         "time",
         "battery",
-        "gesture",
         "mass_storage_settings",
     },
     network = {
@@ -57,13 +58,18 @@ local order = {
         "screen_eink_opt",
         "color_rendering",
         "----------------------------",
-        "menu_activate",
-        "screen_disable_double_tab",
         "screen_toggle_gsensor",
         "----------------------------",
         "keep_screen_on",
         "fullscreen",
     },
+    taps_and_gestures = {
+        "gesture_manager",
+        "frontlight_gesture_controller",
+        "----------------------------",
+        "menu_activate",
+        "screen_disable_double_tab",
+    },
     tools = {
         "calibre_wireless_connection",
         "evernote",
@@ -83,7 +89,6 @@ local order = {
     },
     more_plugins = {
         "auto_frontlight",
-        "frontlight_gesture_controller",
         "battery_statistics",
         "synchronize_time",
         "keep_alive",
diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua
index dec01efa9..e34859855 100644
--- a/frontend/ui/elements/reader_menu_order.lua
+++ b/frontend/ui/elements/reader_menu_order.lua
@@ -46,9 +46,9 @@ local order = {
         "network",
         "screen",
         "----------------------------",
-        "document",
+        "taps_and_gestures",
         "navigation",
-        "follow_links",
+        "document",
         "----------------------------",
         "language",
         "device",
@@ -59,7 +59,6 @@ local order = {
     device = {
         "time",
         "battery",
-        "gesture",
         "mass_storage_settings",
     },
     network = {
@@ -79,13 +78,20 @@ local order = {
         "screen_eink_opt",
         "color_rendering",
         "----------------------------",
-        "menu_activate",
-        "screen_disable_double_tab",
         "screen_toggle_gsensor",
         "----------------------------",
         "keep_screen_on",
         "fullscreen",
     },
+    taps_and_gestures = {
+        "gesture_manager",
+        "frontlight_gesture_controller",
+        "----------------------------",
+        "follow_links",
+        "----------------------------",
+        "menu_activate",
+        "screen_disable_double_tab",
+    },
     tools = {
         "read_timer",
         "calibre_wireless_connection",
@@ -103,7 +109,6 @@ local order = {
     },
     more_plugins = {
         "auto_frontlight",
-        "frontlight_gesture_controller",
         "battery_statistics",
         "synchronize_time",
         "keep_alive",