From 2ce6196f75aa5ce1e6d1605b38edb0403026bff3 Mon Sep 17 00:00:00 2001 From: surbhicis Date: Wed, 15 Jul 2020 14:42:37 +0530 Subject: [PATCH] fix conflict regarding qrscanner for desktop version --- src/bitmessagekivy/main.kv | 2 +- src/bitmessagekivy/mpybit.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv index a924d04e..d52de7da 100644 --- a/src/bitmessagekivy/main.kv +++ b/src/bitmessagekivy/main.kv @@ -16,7 +16,7 @@ #:import MDScrollViewRefreshLayout kivymd.uix.refreshlayout.MDScrollViewRefreshLayout #:import MDSpinner kivymd.uix.spinner.MDSpinner #:import MDTabsBase kivymd.uix.tab.MDTabsBase -##:import ZBarSymbol pyzbar.pyzbar.ZBarSymbol +#:import ZBarSymbol pyzbar.pyzbar.ZBarSymbol #:set color_button (0.784, 0.443, 0.216, 1) # brown diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index 58da3082..36f888f5 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -138,7 +138,8 @@ from datetime import datetime from kivymd.uix.behaviors.elevation import RectangularElevationBehavior from kivymd.uix.bottomsheet import MDCustomBottomSheet from kivy.effects.dampedscroll import DampedScrollEffect - +from kivy_garden.zbarcam import ZBarCam +from pyzbar.pyzbar import ZBarSymbol if platform != "android": from kivy.config import Config