Merge branch 'master' into chore/windows-build
This commit is contained in:
commit
c62853a4da
|
@ -8,7 +8,7 @@ import QRCode from 'react-native-qrcode-svg';
|
||||||
import {defaults} from '../config/default';
|
import {defaults} from '../config/default';
|
||||||
import {BarCodeProps, ButtonProps, PrintingProps} from '../models/ElementProps';
|
import {BarCodeProps, ButtonProps, PrintingProps} from '../models/ElementProps';
|
||||||
import {Sample} from '../models/Sample';
|
import {Sample} from '../models/Sample';
|
||||||
import {labelLayouts} from './LabelLayout';
|
import {labelLayouts} from '../models/LabelLayout';
|
||||||
import {colors, styles} from './Styles';
|
import {colors, styles} from './Styles';
|
||||||
|
|
||||||
const qrcode = require('qrcode');
|
const qrcode = require('qrcode');
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
Then modify the values below to match the actual Firebase configuration.
|
Then modify the values below to match the actual Firebase configuration.
|
||||||
*/
|
*/
|
||||||
import {AppDefaults} from '../models/Default';
|
import {AppDefaults} from '../models/Default';
|
||||||
import {CameraType, LabelLayout} from '../models/ElementProps';
|
import {CameraType} from '../models/ElementProps';
|
||||||
|
import {LabelLayoutType} from '../models/LabelLayout';
|
||||||
|
|
||||||
// Firebase project config from https://console.firebase.google.com > Project Settings > General > Your apps > Web App
|
// Firebase project config from https://console.firebase.google.com > Project Settings > General > Your apps > Web App
|
||||||
export const firebaseConfig = {
|
export const firebaseConfig = {
|
||||||
|
@ -23,7 +24,7 @@ export const defaults: AppDefaults = {
|
||||||
dateEncodedFormat: 'yyyyMMddHHmm', // Format for dates when encoded in IDs for database records.
|
dateEncodedFormat: 'yyyyMMddHHmm', // Format for dates when encoded in IDs for database records.
|
||||||
dateDisplayFormat: 'MM/dd/yyyy, hh:mm aa', // Format for dates when displayed to user.
|
dateDisplayFormat: 'MM/dd/yyyy, hh:mm aa', // Format for dates when displayed to user.
|
||||||
numCopies: 2, // Default number of copies of labels to print. Can be overridden by user setting.
|
numCopies: 2, // Default number of copies of labels to print. Can be overridden by user setting.
|
||||||
labelLayout: 'round_32mm_1up' as LabelLayout, // Which label layout to use for printing. Can be overridden by user setting.
|
labelLayout: 'round_32mm_1up' as LabelLayoutType, // Which label layout to use for printing. Can be overridden by user setting.
|
||||||
cameraType: 'back' as CameraType, // Which camera to use for capturing bar codes. Can be overridden by user setting.
|
cameraType: 'back' as CameraType, // Which camera to use for capturing bar codes. Can be overridden by user setting.
|
||||||
locationId: '0000', // Default location ID. Can be overridden by user setting.
|
locationId: '0000', // Default location ID. Can be overridden by user setting.
|
||||||
lineCountRegex: /^[\d]{4}-[\d]{12}$/, // ID format for Line Count records.
|
lineCountRegex: /^[\d]{4}-[\d]{12}$/, // ID format for Line Count records.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import {BarCodeScannedCallback} from 'expo-barcode-scanner';
|
import {BarCodeScannedCallback} from 'expo-barcode-scanner';
|
||||||
import {LabelLayoutType} from '../components/LabelLayout';
|
import {LabelLayoutType} from './LabelLayout';
|
||||||
import {BarcodeScannerAppState} from './BarcodeScannerAppState';
|
import {BarcodeScannerAppState} from './BarcodeScannerAppState';
|
||||||
import * as firebase from 'firebase';
|
import * as firebase from 'firebase';
|
||||||
import 'firebase/firestore';
|
import 'firebase/firestore';
|
||||||
|
|
Loading…
Reference in New Issue