[chore, UX] Migrate Screen menu to MenuSorter & put Screensaver under Screen (#4675)

Doing more of this is the general purpose of MenuSorter, after all.

This is making some space for a new `Taps and gestures` menu, see <https://github.com/koreader/koreader/pull/4655#issuecomment-466808273>.

frontend/ui/elements/common_settings_menu_table.lua

@@ -123,21 +123,18 @@ NetworkMgr:getMenuTable(common_settings)
 
 common_settings.screen = {
     text = _("Screen"),
-    sub_item_table = {
-        require("ui/elements/screen_dpi_menu_table"),
-        require("ui/elements/screen_eink_opt_menu_table"),
-        require("ui/elements/menu_activate"),
-        require("ui/elements/screen_disable_double_tap_table"),
-    },
 }
+common_settings.screen_dpi = require("ui/elements/screen_dpi_menu_table")
+common_settings.screen_eink_opt = require("ui/elements/screen_eink_opt_menu_table")
+common_settings.menu_activate = require("ui/elements/menu_activate")
+common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table")
+
 if Device:canToggleGSensor() then
-    table.insert(common_settings.screen.sub_item_table, require("ui/elements/screen_toggle_gsensor"))
+    common_settings.screen_toggle_gsensor = require("ui/elements/screen_toggle_gsensor")
 end
+
 if Screen.isColorScreen() then
-    table.insert(common_settings.screen.sub_item_table, 3, require("ui/elements/screen_color_menu_table"))
+    common_settings.color_rendering = require("ui/elements/screen_color_menu_table")
-    common_settings.screen.sub_item_table[3].separator = true
-else
-    common_settings.screen.sub_item_table[2].separator = true
 end
 
 if Device:isAndroid() then
@@ -146,21 +143,19 @@ if Device:isAndroid() then
     if not isAndroid then return end
 
     -- keep screen on
-    table.insert(common_settings.screen.sub_item_table,
+    common_settings.keep_screen_on = {
-        {
+        text = _("Keep screen on"),
-            text = _("Keep screen on"),
+        checked_func = function() return G_reader_settings:isTrue("enable_android_wakelock") end,
-            checked_func = function() return G_reader_settings:isTrue("enable_android_wakelock") end,
+        callback = function() require("ui/elements/screen_android"):toggleWakelock() end,
-            callback = function() require("ui/elements/screen_android"):toggleWakelock() end,
+    }
-        })
 
     -- fullscreen
     if Device.firmware_rev <= 16 then
-        table.insert(common_settings.screen.sub_item_table,
+        common_settings.fullscreen = {
-            {
+            text = _("Fullscreen"),
-                text = _("Fullscreen"),
+            checked_func = function() return android.isFullscreen() end,
-                checked_func = function() return android.isFullscreen() end,
+            callback = function() require("ui/elements/screen_android"):toggleFullscreen() end,
-                callback = function() require("ui/elements/screen_android"):toggleFullscreen() end,
+        }
-            })
     end
 end
 

frontend/ui/elements/filemanager_menu_order.lua

@@ -27,7 +27,6 @@ local order = {
         "----------------------------",
         "network",
         "screen",
-        "screensaver",
         "document",
         "navigation",
         "----------------------------",
@@ -51,6 +50,20 @@ local order = {
         "----------------------------",
         "ssh",
     },
+    screen = {
+        "screensaver",
+        "----------------------------",
+        "screen_dpi",
+        "screen_eink_opt",
+        "color_rendering",
+        "----------------------------",
+        "menu_activate",
+        "screen_disable_double_tab",
+        "screen_toggle_gsensor",
+        "----------------------------",
+        "keep_screen_on",
+        "fullscreen",
+    },
     tools = {
         "calibre_wireless_connection",
         "evernote",

frontend/ui/elements/reader_menu_order.lua

@@ -45,7 +45,6 @@ local order = {
         "----------------------------",
         "network",
         "screen",
-        "screensaver",
         "----------------------------",
         "document",
         "navigation",
@@ -73,6 +72,20 @@ local order = {
         "----------------------------",
         "ssh",
     },
+    screen = {
+        "screensaver",
+        "----------------------------",
+        "screen_dpi",
+        "screen_eink_opt",
+        "color_rendering",
+        "----------------------------",
+        "menu_activate",
+        "screen_disable_double_tab",
+        "screen_toggle_gsensor",
+        "----------------------------",
+        "keep_screen_on",
+        "fullscreen",
+    },
     tools = {
         "read_timer",
         "calibre_wireless_connection",