reorder setting entries in reader menu

frontend/apps/filemanager/filemanagermenu.lua

@@ -84,6 +84,13 @@ function FileManagerMenu:setUpdateItemTable()
     if Device:hasFrontlight() then
         ReaderFrontLight:addToMainMenu(self.tab_item_table)
     end
+    table.insert(self.tab_item_table.setting, {
+        text = _("Screen settings"),
+        sub_item_table = {
+            Screen:getDPIMenuTable(),
+            UIManager:getRefreshMenuTable(),
+        },
+    })
     table.insert(self.tab_item_table.setting, {
         text = _("Night mode"),
         checked_func = function() return G_reader_settings:readSetting("night_mode") end,
@@ -93,13 +100,6 @@ function FileManagerMenu:setUpdateItemTable()
             G_reader_settings:saveSetting("night_mode", not night_mode)
         end
     })
-    table.insert(self.tab_item_table.setting, {
-        text = _("Screen"),
-        sub_item_table = {
-            Screen:getDPIMenuTable(),
-            UIManager:getRefreshMenuTable(),
-        },
-    })
     table.insert(self.tab_item_table.setting, Language:getLangMenuTable())
 
     -- info tab

frontend/apps/reader/modules/readermenu.lua

@@ -80,13 +80,14 @@ function ReaderMenu:setUpdateItemTable()
     end
 
     -- setting tab
+    -- FIXME: it's curious that if this 'Screen' menu is placed after the Language
+    -- menu submenu in 'Screen' won't be shown. Probably a bug in the touchmenu module.
     table.insert(self.tab_item_table.setting, {
-        text = _("Show advanced options"),
-        checked_func = function() return G_reader_settings:readSetting("show_advanced") end,
-        callback = function()
-            local show_advanced = G_reader_settings:readSetting("show_advanced") or false
-            G_reader_settings:saveSetting("show_advanced", not show_advanced)
-        end
+        text = _("Screen settings"),
+        sub_item_table = {
+            Screen:getDPIMenuTable(),
+            UIManager:getRefreshMenuTable(),
+        },
     })
     table.insert(self.tab_item_table.setting, {
         text = _("Night mode"),
@@ -97,16 +98,15 @@ function ReaderMenu:setUpdateItemTable()
             G_reader_settings:saveSetting("night_mode", not night_mode)
         end
     })
-    -- FIXME: it's curious that if this 'Screen' menu is placed after the Language
-    -- menu submenu in Advanced won't be shown. Probably a bug in the touchmenu module.
+    table.insert(self.tab_item_table.setting, Language:getLangMenuTable())
     table.insert(self.tab_item_table.setting, {
-        text = _("Screen"),
-        sub_item_table = {
-            Screen:getDPIMenuTable(),
-            UIManager:getRefreshMenuTable(),
-        },
+        text = _("Show advanced options"),
+        checked_func = function() return G_reader_settings:readSetting("show_advanced") end,
+        callback = function()
+            local show_advanced = G_reader_settings:readSetting("show_advanced") or false
+            G_reader_settings:saveSetting("show_advanced", not show_advanced)
+        end
     })
-    table.insert(self.tab_item_table.setting, Language:getLangMenuTable())
 
     -- info tab
     if Device:isKindle() or Device:isKobo() then