From 31d6669587f24ada6275922c1c261d03b55b48e2 Mon Sep 17 00:00:00 2001 From: Isky Date: Wed, 12 Jun 2024 22:22:45 +0800 Subject: [PATCH] debug icon for hardcoding data to handleTestScan --- package-lock.json | 103 ++---------------------------------- screens/QRScannerScreen.tsx | 27 ++++++++-- 2 files changed, 27 insertions(+), 103 deletions(-) diff --git a/package-lock.json b/package-lock.json index e384865..3657542 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "name": "safeqr", "version": "1.0.0", "dependencies": { - "@expo/metro-runtime": "~3.2.1", "@expo/vector-icons": "^14.0.2", "@react-navigation/bottom-tabs": "^6.5.20", "@react-navigation/native": "^6.1.17", @@ -17,13 +16,9 @@ "expo-camera": "~15.0.10", "expo-image-picker": "~15.0.5", "expo-status-bar": "~1.12.1", - "jsqr": "^1.4.0", "react": "18.2.0", - "react-dom": "18.2.0", "react-native": "0.74.2", - "react-native-safe-area-context": "^4.10.4", - "react-native-screens": "^3.31.1", - "react-native-web": "~0.19.10" + "react-native-safe-area-context": "^4.10.4" }, "devDependencies": { "@babel/core": "^7.20.0", @@ -2895,14 +2890,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@expo/metro-runtime": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@expo/metro-runtime/-/metro-runtime-3.2.1.tgz", - "integrity": "sha512-L7xNo5SmK+rcuXDm/+VBBImpA7FZsVB+m/rNr3fNl5or+1+yrZe99ViF7LZ8DOoVqAqcb4aCAXvGrP2JNYo1/Q==", - "peerDependencies": { - "react-native": "*" - } - }, "node_modules/@expo/osascript": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@expo/osascript/-/osascript-2.1.3.tgz", @@ -6846,14 +6833,6 @@ "node": ">=8" } }, - "node_modules/css-in-js-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz", - "integrity": "sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==", - "dependencies": { - "hyphenate-style-name": "^1.0.3" - } - }, "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", @@ -7750,11 +7729,6 @@ "node": ">=8.6.0" } }, - "node_modules/fast-loops": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.3.tgz", - "integrity": "sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==" - }, "node_modules/fast-xml-parser": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz", @@ -8440,11 +8414,6 @@ "node": ">=10.17.0" } }, - "node_modules/hyphenate-style-name": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.5.tgz", - "integrity": "sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw==" - }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -8542,15 +8511,6 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, - "node_modules/inline-style-prefixer": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz", - "integrity": "sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==", - "dependencies": { - "css-in-js-utils": "^3.1.0", - "fast-loops": "^1.1.3" - } - }, "node_modules/internal-ip": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", @@ -9599,11 +9559,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsqr": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz", - "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" - }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -11496,11 +11451,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" - }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -11806,30 +11756,11 @@ } } }, - "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" - }, - "peerDependencies": { - "react": "^18.2.0" - } - }, - "node_modules/react-dom/node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "dependencies": { - "loose-envify": "^1.1.0" - } - }, "node_modules/react-freeze": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.4.tgz", "integrity": "sha512-r4F0Sec0BLxWicc7HEyo2x3/2icUTrRmDjaaRyzzn+7aDyFZliszMDOgLVwSnQnYENOlL1o569Ze2HZefk8clA==", + "peer": true, "engines": { "node": ">=10" }, @@ -11914,6 +11845,7 @@ "version": "3.31.1", "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.31.1.tgz", "integrity": "sha512-8fRW362pfZ9y4rS8KY5P3DFScrmwo/vu1RrRMMx0PNHbeC9TLq0Kw1ubD83591yz64gLNHFLTVkTJmWeWCXKtQ==", + "peer": true, "dependencies": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" @@ -11923,30 +11855,6 @@ "react-native": "*" } }, - "node_modules/react-native-web": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.19.12.tgz", - "integrity": "sha512-o2T0oztoVDQjztt4YksO9S1XRjoH/AqcSvifgWLrPJgGVbMWsfhILgl6lfUdEamVZzZSVV/2gqDVMAk/qq7mZw==", - "dependencies": { - "@babel/runtime": "^7.18.6", - "@react-native/normalize-colors": "^0.74.1", - "fbjs": "^3.0.4", - "inline-style-prefixer": "^6.0.1", - "memoize-one": "^6.0.0", - "nullthrows": "^1.1.1", - "postcss-value-parser": "^4.2.0", - "styleq": "^0.1.3" - }, - "peerDependencies": { - "react": "^18.0.0", - "react-dom": "^18.0.0" - } - }, - "node_modules/react-native-web/node_modules/memoize-one": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", - "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" - }, "node_modules/react-native/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -12976,11 +12884,6 @@ "resolved": "https://registry.npmjs.org/structured-headers/-/structured-headers-0.4.1.tgz", "integrity": "sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg==" }, - "node_modules/styleq": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/styleq/-/styleq-0.1.3.tgz", - "integrity": "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA==" - }, "node_modules/sucrase": { "version": "3.34.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", diff --git a/screens/QRScannerScreen.tsx b/screens/QRScannerScreen.tsx index 15ddfd1..e9ef245 100644 --- a/screens/QRScannerScreen.tsx +++ b/screens/QRScannerScreen.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useContext } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Button } from 'react-native'; import { Camera, CameraView } from 'expo-camera'; import { QRCodeContext } from '../types'; import axios from 'axios'; // For URL calls @@ -153,6 +153,11 @@ const QRScannerScreen: React.FC = ({ clearScanData }) => { setEnableTorch((prev) => !prev); }; + // This is hardcoded function for testing + const handleTestScan = () => { + handleQRCodeScanned({ type: 'TEST', data: 'TEST123' }); + }; + // For Splash, for some reason nedd to be near the end of the function... // or else permission for camera is not asked @@ -183,7 +188,7 @@ const QRScannerScreen: React.FC = ({ clearScanData }) => { {/* Banner section */} - SafeQR v0.66 + SafeQR v0.66.t {/* Welcome Text */} Welcome to SafeQR code Scanner @@ -197,11 +202,18 @@ const QRScannerScreen: React.FC = ({ clearScanData }) => { enableTorch={enableTorch} /> - {/* the torch icon inside the CameraView */} + {/* the torch icon floating above the camerView */} {enableTorch} + + + {enableTorch} + + + + {/* The CONTENT , the popup for the scanned data */} @@ -344,6 +356,15 @@ const styles = StyleSheet.create({ marginVertical: 10, color: 'black', }, + testButton: { + position: 'absolute', + bottom: 1, + alignSelf: 'stretch', + backgroundColor: '#000', + padding: 10, + borderRadius: 5, + // Ensure the button appears above other elements + } }); export default QRScannerScreen;