[UX] Gesture manager: corner gestures (koreader#4878)

Adds configuration to the top corners as well as the additional gestures hold and two-finger tap.

Deprecates `DTAP_ZONE_FLIPPING` and `DTAP_ZONE_BOOKMARK`.

Fixes koreader#4877.

Author: Frenzie

.luacheckrc

@@ -37,6 +37,10 @@ read_globals = {
     "DTAP_ZONE_BACKWARD",
     "DTAP_ZONE_BOOKMARK",
     "DTAP_ZONE_FLIPPING",
+    "DTAP_ZONE_TOP_LEFT",
+    "DTAP_ZONE_TOP_RIGHT",
+    "DTAP_ZONE_BOTTOM_LEFT",
+    "DTAP_ZONE_BOTTOM_RIGHT",
     "DDOUBLE_TAP_ZONE_NEXT_CHAPTER",
     "DDOUBLE_TAP_ZONE_PREV_CHAPTER",
     "DCHANGE_WEST_SWIPE_TO_EAST",

defaults.lua

@@ -64,17 +64,21 @@ DOVERLAPPIXELS = 30
 FOLLOW_LINK_TIMEOUT = 0.5
 
 -- customizable tap zones(rectangles)
--- x: x coordinate of top left corner in proportion of screen width
--- y: y coordinate of top left corner in proportion of screen height
--- w: width of tap zone in proportion of screen width
--- h: height of tap zone in proportion of screen height
+-- x: x coordinate of top left corner in proportion to screen width
+-- y: y coordinate of top left corner in proportion to screen height
+-- w: tap zone width in proportion to screen width
+-- h: tap zone height in proportion to screen height
 DTAP_ZONE_MENU = {x = 1/8, y = 0, w = 3/4, h = 1/8}
 DTAP_ZONE_CONFIG = {x = 1/8, y = 7/8, w = 3/4, h = 1/8}
 DTAP_ZONE_MINIBAR = {x = 0, y = 31/32, w = 1, h = 1/32}
 DTAP_ZONE_FORWARD = {x = 1/4, y = 0, w = 3/4, h = 1}
 DTAP_ZONE_BACKWARD = {x = 0, y = 0, w = 1/4, h = 1}
-DTAP_ZONE_BOOKMARK = {x = 7/8, y = 0, w = 1/8, h = 1/8}
-DTAP_ZONE_FLIPPING = {x = 0, y = 0, w = 1/8, h = 1/8}
+-- DTAP_ZONE_BOOKMARK = {x = 7/8, y = 0, w = 1/8, h = 1/8} -- deprecated
+-- DTAP_ZONE_FLIPPING = {x = 0, y = 0, w = 1/8, h = 1/8} -- deprecated
+DTAP_ZONE_TOP_LEFT = {x = 0, y = 0, w = 1/8, h = 1/8}
+DTAP_ZONE_TOP_RIGHT = {x = 7/8, y = 0, w = 1/8, h = 1/8}
+DTAP_ZONE_BOTTOM_LEFT = {x = 0, y = 7/8, w = 1/8, h = 1/8}
+DTAP_ZONE_BOTTOM_RIGHT = {x = 7/8, y = 7/8, w = 1/8, h = 1/8}
 DDOUBLE_TAP_ZONE_NEXT_CHAPTER = {x = 6/8, y = 0, w = 2/8, h = 2/8}
 DDOUBLE_TAP_ZONE_PREV_CHAPTER = {x = 0, y = 0, w = 2/8, h = 2/8}
 

frontend/apps/filemanager/filemanager.lua

@@ -88,7 +88,7 @@ function FileManager:init()
         padding_left = Size.padding.large,
         padding_right = Size.padding.large,
         padding_bottom = 0,
-        callback = function() self:tapPlus() end,
+        callback = nil, -- top right corner callback handled by gesture manager
     }
 
     self.path_text = TextWidget:new{
@@ -404,6 +404,11 @@ function FileChooser:onBack()
     end
 end
 
+function FileManager:onShowPlusMenu()
+    self:tapPlus()
+    return true
+end
+
 function FileManager:tapPlus()
     local buttons = {
         {

frontend/apps/reader/modules/readerdogear.lua

@@ -1,11 +1,9 @@
 local Device = require("device")
-local Event = require("ui/event")
 local Geom = require("ui/geometry")
-local GestureRange = require("ui/gesturerange")
 local ImageWidget = require("ui/widget/imagewidget")
 local InputContainer = require("ui/widget/container/inputcontainer")
 local RightContainer = require("ui/widget/container/rightcontainer")
-local Screen = require("device").screen
+local Screen = Device.screen
 
 local ReaderDogear = InputContainer:new{}
 
@@ -70,30 +68,9 @@ end
 function ReaderDogear:resetLayout()
     local new_screen_width = Screen:getWidth()
     if new_screen_width == self._last_screen_width then return end
-    local new_screen_height = Screen:getHeight()
     self._last_screen_width = new_screen_width
 
     self[1].dimen.w = new_screen_width
-    if Device:isTouchDevice() then
-        self.ges_events = {
-            Tap = {
-                GestureRange:new{
-                    ges = "tap",
-                    range = Geom:new{
-                        x = new_screen_width*DTAP_ZONE_BOOKMARK.x,
-                        y = new_screen_height*DTAP_ZONE_BOOKMARK.y,
-                        w = new_screen_width*DTAP_ZONE_BOOKMARK.w,
-                        h = new_screen_height*DTAP_ZONE_BOOKMARK.h
-                    }
-                }
-            }
-        }
-    end
-end
-
-function ReaderDogear:onTap()
-    self.ui:handleEvent(Event:new("ToggleBookmark"))
-    return true
 end
 
 function ReaderDogear:onSetDogearVisibility(visible)

frontend/apps/reader/modules/readerflipping.lua

@@ -1,11 +1,8 @@
+local Geom = require("ui/geometry")
+local ImageWidget = require("ui/widget/imagewidget")
 local InputContainer = require("ui/widget/container/inputcontainer")
 local LeftContainer = require("ui/widget/container/leftcontainer")
-local ImageWidget = require("ui/widget/imagewidget")
-local GestureRange = require("ui/gesturerange")
-local Device = require("device")
-local Geom = require("ui/geometry")
 local Screen = require("device").screen
-local Event = require("ui/event")
 
 local ReaderFlipping = InputContainer:new{
     orig_reflow_mode = 0,
@@ -25,36 +22,9 @@ end
 function ReaderFlipping:resetLayout()
     local new_screen_width = Screen:getWidth()
     if new_screen_width == self._last_screen_width then return end
-    local new_screen_height = Screen:getHeight()
     self._last_screen_width = new_screen_width
 
     self[1].dimen.w = new_screen_width
-    if Device:isTouchDevice() then
-        self.ges_events = {
-            Tap = {
-                GestureRange:new{
-                    ges = "tap",
-                    range = Geom:new{
-                        x = new_screen_width*DTAP_ZONE_FLIPPING.x,
-                        y = new_screen_height*DTAP_ZONE_FLIPPING.y,
-                        w = new_screen_width*DTAP_ZONE_FLIPPING.w,
-                        h = new_screen_height*DTAP_ZONE_FLIPPING.h
-                    }
-                }
-            }
-        }
-    end
-end
-
-function ReaderFlipping:onTap()
-    if not self.ui.document.info.has_pages then
-        -- ReaderRolling has no support (yet) for onTogglePageFlipping,
-        -- so don't make that top left tap area unusable (and allow
-        -- taping on links there)
-        return false
-    end
-    self.ui:handleEvent(Event:new("TogglePageFlipping"))
-    return true
 end
 
 return ReaderFlipping