Merge pull request #528 from chrox/master

code refactoring

frontend/ui/reader/readerfrontlight.lua

@@ -41,9 +41,8 @@ function ReaderFrontLight:onAdjust(arg, ges)
     local powerd = Device:getPowerDevice()
     if powerd.flIntensity ~= nil then
         DEBUG("frontlight intensity", powerd.flIntensity)
-        local rel_proportion = ges.distance / Screen:getWidth()
-        local delta_int = self.steps[math.ceil(#self.steps*rel_proportion)] or self.steps[#self.steps]
-        local msg = nil
+        local step = math.ceil(#self.steps * ges.distance / Screen:getWidth())
+        local delta_int = self.steps[step] or self.steps[0]
         if ges.direction == "north" then
             powerd:setIntensity(powerd.flIntensity + delta_int)
         elseif ges.direction == "south" then
@@ -61,6 +60,7 @@ function ReaderFrontLight:onShowIntensity()
             timeout = 1.0,
         })
     end
+    return true
 end
 
 function ReaderFrontLight:onSwipe(arg, ges)

frontend/ui/readerui.lua

@@ -183,6 +183,12 @@ function ReaderUI:init()
 			ui = self,
 			document = self.document,
 		})
+		-- paging controller
+		table.insert(self, ReaderPaging:new{
+			dialog = self.dialog,
+			view = self[1],
+			ui = self
+		})
 		-- zooming controller
 		local zoom = ReaderZooming:new{
 			dialog = self.dialog,
@@ -190,12 +196,6 @@ function ReaderUI:init()
 			ui = self
 		}
 		table.insert(self, zoom)
-		-- paging controller
-		table.insert(self, ReaderPaging:new{
-			dialog = self.dialog,
-			view = self[1],
-			ui = self
-		})
 		-- panning controller
 		table.insert(self, ReaderPanning:new{
 			dialog = self.dialog,