QR code scanner (QML component) (#9464)

igor-sirotin · richard-ramos · web-flow · commit 7c1c178d37e8 · 2023-03-07T12:08:38.000-04:00
Co-authored-by: Richard Ramos &lt;info@richardramos.me&gt;
diff --git a/.gitmodules b/.gitmodules
@@ -116,3 +116,6 @@
 [submodule "vendor/nim-taskpools"]
 	path = vendor/nim-taskpools
 	url = https://github.com/status-im/nim-taskpools.git
+[submodule "ui/StatusQ/vendor/qzxing"]
+	path = ui/StatusQ/vendor/qzxing
+	url = https://github.com/status-im/qzxing.git
diff --git a/Info.dev.plist b/Info.dev.plist
@@ -37,5 +37,7 @@
         <integer>0</integer>
         <key>NSHighResolutionCapable</key>
         <string>True</string>
+        <key>NSCameraUsageDescription</key>
+        <string>Scan QR codes</string>
     </dict>
 </plist>
diff --git a/Info.plist b/Info.plist
@@ -37,5 +37,7 @@
         <integer>0</integer>
         <key>NSHighResolutionCapable</key>
         <string>True</string>
+        <key>NSCameraUsageDescription</key>
+        <string>Scan QR codes</string>
     </dict>
 </plist>
diff --git a/Makefile b/Makefile
@@ -149,7 +149,7 @@ endif
 
 MONITORING ?= false
 ifneq ($(MONITORING), false)
- DOTHERSIDE_CMAKE_PARAMS := ${DOTHERSIDE_CMAKE_PARAMS} -DMONITORING:BOOL=ON -DMONITORING_QML_ENTRY_POINT:STRING="/../monitoring/Main.qml"
+ DOTHERSIDE_CMAKE_PARAMS += -DMONITORING:BOOL=ON -DMONITORING_QML_ENTRY_POINT:STRING="/../monitoring/Main.qml"
 endif
 
 
@@ -175,18 +175,23 @@ ifneq ($(detected_OS),Windows)
    NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)"
   endif
  endif
+ # We manually link QZXing to Nim application,
+ # because static libraries are not compiled into other static libraries (DOtherSide).
+ QZXING := vendor/DOtherSide/build/qzxing/libqzxing.a
  DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a
  DOTHERSIDE_CMAKE_PARAMS += -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON
  # order matters here, due to "-Wl,-as-needed"
- NIM_PARAMS += --passL:"$(DOTHERSIDE)" --passL:"$(shell PKG_CONFIG_PATH="$(QT5_PCFILEDIR)" pkg-config --libs Qt5Core Qt5Qml Qt5Gui Qt5Quick Qt5QuickControls2 Qt5Widgets Qt5Svg Qt5Multimedia)"
+ NIM_PARAMS += --passL:"$(DOTHERSIDE)" --passL:"$(QZXING)" --passL:"$(shell PKG_CONFIG_PATH="$(QT5_PCFILEDIR)" pkg-config --libs Qt5Core Qt5Qml Qt5Gui Qt5Quick Qt5QuickControls2 Qt5Widgets Qt5Svg Qt5Multimedia)"
 else
  ifneq ($(QML_DEBUG), false)
+  QZXING := vendor/DOtherSide/build/qzxing/Debug/qzxing.lib
   DOTHERSIDE := vendor/DOtherSide/build/lib/Debug/DOtherSide.dll
  else
+  QZXING := vendor/DOtherSide/build/qzxing/Release/qzxing.lib
   DOTHERSIDE := vendor/DOtherSide/build/lib/Release/DOtherSide.dll
  endif
  DOTHERSIDE_CMAKE_PARAMS += -T"v141" -A x64 -DENABLE_DYNAMIC_LIBS=ON -DENABLE_STATIC_LIBS=OFF
- NIM_PARAMS += -L:$(DOTHERSIDE)
+ NIM_PARAMS += -L:$(DOTHERSIDE) -L:$(QZXING)
  NIM_EXTRA_PARAMS := --passL:"-lsetupapi -lhid"
 endif
 
@@ -238,6 +243,9 @@ $(DOTHERSIDE): | deps
 		cmake $(DOTHERSIDE_CMAKE_PARAMS)\
 			-DENABLE_DOCS=OFF \
 			-DENABLE_TESTS=OFF \
+			-DQZXING_USE_QML=ON \
+			-DQZXING_MULTIMEDIA=ON \
+			-DQZXING_USE_DECODER_QR_CODE=ON \
 			.. $(HANDLE_OUTPUT) && \
 		$(DOTHERSIDE_BUILD_CMD)
 
diff --git a/build-linux.sh b/build-linux.sh
@@ -13,5 +13,5 @@ docker run -it --rm \
   -u jenkins:$(getent group $(whoami) | cut -d: -f3) \
   -v "${PWD}:/status-desktop" \
   -w /status-desktop \
-  statusteam/nim-status-client-build:1.2.0-qt5.15.2 \
+  statusteam/nim-status-client-build:1.2.1-qt5.15.2 \
   ./docker-linux-app-image.sh
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -40,10 +40,10 @@ RUN apt update -yq && apt install -yq software-properties-common \
  && add-apt-repository -y ppa:git-core/ppa \
  && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
  && apt update -yq && apt full-upgrade -yq && apt install -yq --no-install-recommends --fix-missing  \
-    gnupg2 openssh-client ca-certificates locales sudo jq curl wget fuse s3cmdfile llvm tk-dev xz-utils \
+    gnupg2 openssh-client ca-certificates locales sudo jq curl wget fuse s3cmd file llvm tk-dev xz-utils \
     git make build-essential pkg-config cmake extra-cmake-modules gcc-9 g++-9 \
     libgl1-mesa-dev libsm6 libice6 libfontconfig1 libdbus-1-3 libssl-dev libz-dev \
-    zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev \
+    zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev unixodbc-dev libpq-dev \
     libncurses5-dev libncursesw5-dev libpcsclite-dev  libpcre3-dev libnss3 \
     gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \
     gstreamer1.0-libav gstreamer1.0-tools gstreamer1.0-alsa libpulse-mainloop-glib0 \
diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
@@ -7,7 +7,7 @@ pipeline {
   agent {
     docker {
       label 'linux'
-      image 'statusteam/nim-status-client-build:1.2.0-qt5.15.2'
+      image 'statusteam/nim-status-client-build:1.2.1-qt5.15.2'
       /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */
       args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse'
     }
diff --git a/ci/Jenkinsfile.tests-nim b/ci/Jenkinsfile.tests-nim
@@ -7,7 +7,7 @@ pipeline {
   agent {
     docker {
       label 'linux'
-      image 'statusteam/nim-status-client-build:1.2.0-qt5.15.2'
+      image 'statusteam/nim-status-client-build:1.2.1-qt5.15.2'
     }
   }
 
diff --git a/docker-linux-app-image.sh b/docker-linux-app-image.sh
@@ -4,7 +4,7 @@
 cp -R . ~/status-desktop
 cd ~/status-desktop
 
-git clean -dfx && rm -rf vendor/* && make -j4 V=1 update
+git clean -dfx && rm -rf vendor/* && git checkout vendor/DOtherSide && make -j4 V=1 update
 make V=1 pkg
 
 # Make AppImage build accessible to the docker host
diff --git a/scripts/ubuntu_build_setup.sh b/scripts/ubuntu_build_setup.sh
@@ -18,7 +18,7 @@ function check_version {
 function install_build_dependencies {
   echo "Install build dependencies"
   apt update
-  apt install -yq git build-essential pkg-config mesa-common-dev \
+  apt install -yq git build-essential pkg-config mesa-common-dev unixodbc-dev libpq-dev \
      libglu1-mesa-dev wget libpcsclite-dev libpcre3-dev libssl-dev libpulse-mainloop-glib0 \
      libxkbcommon-x11-dev extra-cmake-modules cmake
 }
diff --git a/ui/StatusQ/CMakeLists.txt b/ui/StatusQ/CMakeLists.txt
@@ -13,12 +13,18 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(QZXING_USE_QML ON)
+set(QZXING_MULTIMEDIA ON)
+set(QZXING_USE_DECODER_QR_CODE ON)
+
 # https://doc.qt.io/qtcreator/creator-qml-modules-with-plugins.html#importing-qml-modules
 set(QML_IMPORT_PATH
     ${CMAKE_SOURCE_DIR}/src;${QML_IMPORT_PATH}
     CACHE STRING "")
 
+
 add_subdirectory(vendor/SortFilterProxyModel)
+add_subdirectory(vendor/qzxing/src)
 add_subdirectory(sandbox)
 add_subdirectory(sanity_checker)
 add_subdirectory(tests)
diff --git a/ui/StatusQ/sandbox/CMakeLists.txt b/ui/StatusQ/sandbox/CMakeLists.txt
@@ -32,7 +32,8 @@ target_compile_definitions(${PROJECT_NAME}
                            PRIVATE SRC_DIR="${CMAKE_CURRENT_LIST_DIR}")
 target_link_libraries(
   ${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Quick Qt5::QuickControls2
-                          SortFilterProxyModel)
+                          SortFilterProxyModel
+                      qzxing)
 
 if (APPLE)
   find_library(AppKit AppKit)
diff --git a/ui/StatusQ/sandbox/demoapp/data/Models.qml b/ui/StatusQ/sandbox/demoapp/data/Models.qml
@@ -1198,6 +1198,17 @@ QtObject {
             hasNotification: false
             notificationsCount: 0
         }
+        ListElement {
+            sectionId: "demoApp"
+            sectionType: 103
+            name: "QR Scanner"
+            active: false
+            image: ""
+            icon: "qr-scan"
+            color: ""
+            hasNotification: false
+            notificationsCount: 0
+        }
     }
 
     property ListModel demoAppSectionsModel: ListModel {
diff --git a/ui/StatusQ/sandbox/main.qml b/ui/StatusQ/sandbox/main.qml
@@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13
 import QtQuick.Layouts 1.14
 import Qt.labs.settings 1.0
 import QtQml.Models 2.14
+import QtMultimedia 5.14
 
 import StatusQ 0.1
 
@@ -49,6 +50,7 @@ StatusWindow {
         readonly property int apiDocumentation: 100
         readonly property int examples: 101
         readonly property int demoApp: 102
+        readonly property int qrScanner: 103
     }
 
     function setActiveItem(sectionId) {
@@ -97,6 +99,10 @@ StatusWindow {
                     {
                         stackView.push(demoAppCmp)
                     }
+                    else if (model.sectionType === appSectionType.qrScanner)
+                    {
+                        stackView.push(qrScannerComponent)
+                    }
                     rootWindow.setActiveItem(model.sectionId)
                 }
             }
@@ -537,6 +543,50 @@ StatusWindow {
         }
     }
 
+    Component {
+        id: qrScannerComponent
+
+        Rectangle {
+            anchors.fill: parent
+            color: Theme.palette.baseColor3
+
+            ColumnLayout {
+                anchors.fill: parent
+                anchors.margins: 20
+                spacing: 10
+
+                StatusQrCodeScanner {
+                    id: qrScanner
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: width / sourceRatio
+                }
+
+                RowLayout {
+                    Layout.fillWidth: true
+                    spacing: 10
+
+                    StatusBaseText {
+                        text: qsTr("Last tag: ")
+                    }
+
+                    StatusInput {
+                        id: lastTagText
+                        Layout.fillWidth: true
+                        input.enabled: false
+                        text: qrScanner.lastTag
+                        input.rightPadding: 10
+                    }
+
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                }
+            }
+        }
+    }
+
     StatusMacTrafficLights {
         anchors.left: parent.left
         anchors.top: parent.top
diff --git a/ui/StatusQ/sandbox/sandboxapp.cpp b/ui/StatusQ/sandbox/sandboxapp.cpp
@@ -6,15 +6,17 @@
 #include <QDirIterator>
 
 #include "StatusQ/typesregistration.h"
+#include <QZXing.h>
 
 SandboxApp::SandboxApp(int &argc, char **argv)
     : QGuiApplication(argc, argv)
 {
+    QZXing::registerQMLTypes();
+
 #ifdef QT_DEBUG
-    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, [this](const QString&) {
+    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, [this](const QString&) {
         restartEngine();
     });
-
 #endif
 }
 
diff --git a/ui/StatusQ/sanity_checker/CMakeLists.txt b/ui/StatusQ/sanity_checker/CMakeLists.txt
@@ -23,7 +23,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${STATUSQ_DIR}/include)
 
 target_link_libraries(
   ${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Quick Qt5::QuickControls2
-                          SortFilterProxyModel)
+                          SortFilterProxyModel
+                          qzxing)
 
 if (APPLE)
   find_library(AppKit AppKit)
diff --git a/ui/StatusQ/sanity_checker/main.cpp b/ui/StatusQ/sanity_checker/main.cpp
@@ -5,6 +5,7 @@
 #include <QQmlEngine>
 
 #include "StatusQ/typesregistration.h"
+#include <QZXing>
 
 int main(int argc, char *argv[])
 {
@@ -16,6 +17,8 @@ int main(int argc, char *argv[])
 
     engine.addImportPath(QStringLiteral(":/"));
 
+    QZXing::registerQMLTypes();
+
     QDirIterator it(":", QDirIterator::Subdirectories);
     bool errorsFound = false;
 
diff --git a/ui/StatusQ/src/StatusQ/Components/StatusQrCodeScanner.qml b/ui/StatusQ/src/StatusQ/Components/StatusQrCodeScanner.qml
diff --git a/ui/StatusQ/src/StatusQ/Components/qmldir b/ui/StatusQ/src/StatusQ/Components/qmldir
diff --git a/ui/StatusQ/src/statusq.qrc b/ui/StatusQ/src/statusq.qrc
diff --git a/ui/StatusQ/vendor/qzxing b/ui/StatusQ/vendor/qzxing
diff --git a/vendor/DOtherSide/CMakeLists.txt b/vendor/DOtherSide/CMakeLists.txt
diff --git a/vendor/DOtherSide/lib/CMakeLists.txt b/vendor/DOtherSide/lib/CMakeLists.txt
diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pipeline {`
`7`	`7`	`agent {`
`8`	`8`	`docker {`
`9`	`9`	`label 'linux'`
`10`		`- image 'statusteam/nim-status-client-build:1.2.0-qt5.15.2'`
	`10`	`+ image 'statusteam/nim-status-client-build:1.2.1-qt5.15.2'`
`11`	`11`	`/* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */`
`12`	`12`	`args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse'`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ function check_version {`
`18`	`18`	`function install_build_dependencies {`
`19`	`19`	`echo "Install build dependencies"`
`20`	`20`	`apt update`
`21`		`- apt install -yq git build-essential pkg-config mesa-common-dev \`
	`21`	`+ apt install -yq git build-essential pkg-config mesa-common-dev unixodbc-dev libpq-dev \`
`22`	`22`	`libglu1-mesa-dev wget libpcsclite-dev libpcre3-dev libssl-dev libpulse-mainloop-glib0 \`
`23`	`23`	`libxkbcommon-x11-dev extra-cmake-modules cmake`
`24`	`24`	`}`