This app is open source and licensed under the GNU agplV3 license, the source code can be found here.
Resultservice and rankings provided by digital ROCK."
content: qsTrId("#aboutBluerockDisclaimer")
}
-
- QrCodeScanPopup {
- id: qrCodeScanPopup
- Material.theme: root.Material.theme
- }
-
}
diff --git a/resources/qml/qml.qrc b/resources/qml/qml.qrc
index 5fe014c..4393e01 100644
--- a/resources/qml/qml.qrc
+++ b/resources/qml/qml.qrc
@@ -29,6 +29,6 @@
Components/ColoredItemDelegate.qmlComponents/AlignedButton.qmlComponents/SharePopup.qml
- Components/QrCodeScanPopup.qml
+ Pages/QrCodeScanPage.qml
diff --git a/resources/translations/de.qm b/resources/translations/de.qm
index 0fa4d50..91dae98 100644
Binary files a/resources/translations/de.qm and b/resources/translations/de.qm differ
diff --git a/resources/translations/de.ts b/resources/translations/de.ts
index 7028d3e..577a7d5 100644
--- a/resources/translations/de.ts
+++ b/resources/translations/de.ts
@@ -4,34 +4,40 @@
-
+ Scan QR-CodeQR-Code scannen
-
+ Place the Code in the centerPositioniere den Code in der Mitte
-
- Camera permission denied!
+
+ Camera access required
+ Camera access denied
-
- This app requires access to your camera in order to scan QR-Codes. It will never record or store any photos or videos.
- This app requires access to your camera in order to scan QR-Codes. It will never record store any photos or videos.
+
+ blueROCK needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.
+ This app needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.
+
+
+
+
+ Allow access
-
+ Plase waitBitte warten
-
+ Invalid QR-CodeUngültiger QR-Code
@@ -112,17 +118,17 @@
Über blueROCK
-
+ Where are the IFSC results?Wo sind die IFSC Ergebnisse?
-
+ Unfortunately, the IFSC has restricted the access to their data and <b>is not willing to share results with blueROCK anymore</b>. Because of this, blueROCK is no longer able to access and display IFSC results.<br><br>You can find current IFSC results <a href="https://ifsc.results.info">over here</a> and on <a href="https://ifsc-climbing.org">their website</a>.Leider hat die IFSC den Zugang zu ihren Ergebnissen eingeschränkt<b>und ist nicht mehr bereit, Ergebnisse mit blueROCK zu teilen</b>. Daher ist blueROCK nicht länger in der Lage auf IFSC Ergebnisse zuzugriefen und diese anzuzeigen.<br><br>Aktuelle IFSC Ergebnisse finden sich <a href="https://ifsc.results.info">hier</a> und auf der <a href="https://ifsc-climbing.org">IFSC Webseite</a>.
-
+ This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.Diese App wurde unter Verwendung des <a href='https://qt.io'>Qt Frameworks</a> unter der <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 Lizenz</a> erstellt.<br><br>Diese App ist Open-source und lizensiert unter der <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 Lizenz</a>. Der Sourcecode findet sich <a href='https://itsblue.dev/dorian/blueROCK/'>hier</a>.Die Ergebnisse und Ranglisten werden von <a href='http://www.digitalROCK.de'>digital ROCK</a> zur Verfügung gestellt.
diff --git a/resources/translations/en.qm b/resources/translations/en.qm
index eb94bc0..cd69813 100644
Binary files a/resources/translations/en.qm and b/resources/translations/en.qm differ
diff --git a/resources/translations/en.ts b/resources/translations/en.ts
index 6689a06..883332c 100644
--- a/resources/translations/en.ts
+++ b/resources/translations/en.ts
@@ -4,34 +4,40 @@
-
+ Scan QR-Code
-
+ Place the Code in the center
-
- Camera permission denied!
+
+ Camera access required
+ Camera access denied
-
- This app requires access to your camera in order to scan QR-Codes. It will never record or store any photos or videos.
- This app requires access to your camera in order to scan QR-Codes. It will never record store any photos or videos.
+
+ blueROCK needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.
+ This app needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.
+
+
+
+
+ Allow access
-
+ Plase wait
-
+ Invalid QR-Code
@@ -108,17 +114,17 @@
-
+ Where are the IFSC results?
-
+ Unfortunately, the IFSC has restricted the access to their data and <b>is not willing to share results with blueROCK anymore</b>. Because of this, blueROCK is no longer able to access and display IFSC results.<br><br>You can find current IFSC results <a href="https://ifsc.results.info">over here</a> and on <a href="https://ifsc-climbing.org">their website</a>.
-
+ This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.
diff --git a/sources/bluerockbackend.cpp b/sources/bluerockbackend.cpp
index 6438387..9ebbd46 100644
--- a/sources/bluerockbackend.cpp
+++ b/sources/bluerockbackend.cpp
@@ -147,7 +147,7 @@ bool BlueRockBackend::isCameraPermissionGranted() {
QtAndroid::PermissionResult cameraAccess = QtAndroid::checkPermission("android.permission.CAMERA");
return cameraAccess == QtAndroid::PermissionResult::Granted;
#else
- return false;
+ return true;
#endif
}
@@ -204,7 +204,7 @@ bool BlueRockBackend::requestCameraPermission() {
return true;
#else
- return false;
+ return true;
#endif
}