use cgb_

Author: RobertFlatt

setup.cfg

@@ -19,7 +19,7 @@ package_dir =
 packages = find:
 python_requires = >=3.6
 install_requires =
-    gestures4kivy >= 0.0.7
+    gestures4kivy >= 0.1.0
 
 [options.packages.find]
 where = src

src/camera4kivy/preview_camerax.py

@@ -179,12 +179,12 @@ def set_facing(self, facing):
 
     # CommonGestures Touch Events
     # tap for focus
-    def cg_tap(self, touch, x, y):
+    def cgb_primary(self, touch, x, y):
         if self._camera and self.enable_focus_gesture:
             self.focus(x, y)
 
     # pinch/spread for zoom
-    def cg_scale(self, touch0, touch1, scale, x, y):
+    def cgb_zoom(self, touch0, touch1, x, y, scale):
         if self._camera and self.enable_zoom_gesture:
             self.zoom_delta(scale)
 

src/camera4kivy/preview_kivycamera.py

@@ -145,7 +145,7 @@ def capture_photo(self, location = '.', subdir = '', name = ''):
     ##############################
 
     # pinch/spread for zoom
-    def cg_scale(self, touch0, touch1, scale, x, y):
+    def cgb_zoom(self, touch0, touch1, x, y, scale):
         if platform == 'ios':
             if self._camera and self.enable_zoom_gesture:
                 level = max(self.cg_zoom_level[self.index] * scale, 1)