Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix background color #135

Closed
wants to merge 4 commits into from
Closed

Fix background color #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5ab767
insert cameraView at index 0
cgodley Oct 7, 2017
f1dbaf3
refactor(build): build to allow adding directly from git
cgodley Oct 8, 2017
d058b41
fix(ios): background: clear / not opaque. Fixes plugins that require …
cgodley Oct 8, 2017
dae667c
fix(android): makeOpaque(): use Color.TRANSPARENT
cgodley Oct 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ node_modules/
# generated files
dist/
src/browser/plugin.min.js
www/www.min.js
2 changes: 1 addition & 1 deletion src/android/QRScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ private void makeOpaque() {
this.cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
webView.getView().setBackgroundColor(Color.WHITE);
webView.getView().setBackgroundColor(Color.TRANSPARENT);
}
});
showing = false;
Expand Down
6 changes: 3 additions & 3 deletions src/ios/QRScanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class QRScanner : CDVPlugin, AVCaptureMetadataOutputObjectsDelegate {
}
do {
if (captureSession?.isRunning != true){
cameraView.backgroundColor = UIColor.white
cameraView.backgroundColor = UIColor.clear
self.webView!.superview!.insertSubview(cameraView, belowSubview: self.webView!)
let availableVideoDevices = AVCaptureDevice.devices(withMediaType: AVMediaTypeVideo)
for device in availableVideoDevices as! [AVCaptureDevice] {
Expand Down Expand Up @@ -195,8 +195,8 @@ class QRScanner : CDVPlugin, AVCaptureMetadataOutputObjectsDelegate {
}

func makeOpaque(){
self.webView?.isOpaque = true
self.webView?.backgroundColor = UIColor.white
self.webView?.isOpaque = false
self.webView?.backgroundColor = UIColor.clear
}

func boolToNumberString(bool: Bool) -> String{
Expand Down
342 changes: 342 additions & 0 deletions www/www.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,342 @@
// This file is generated by `npm run build`.

/*global exports:false*/
/*jshint unused:false */
// remap parameter names from cordova.define
// see `externals` in webpack.cordova.config.js
var cordovaRequire = require;
var cordovaExports = exports;
var cordovaModule = module;
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // identity function for calling harmony imports with the correct context
/******/ __webpack_require__.i = function(value) { return value; };
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 18);
/******/ })
/************************************************************************/
/******/ ({

/***/ 1:
/***/ (function(module, exports) {

module.exports = cordovaModule;

/***/ }),

/***/ 18:
/***/ (function(module, exports, __webpack_require__) {

var globalCordova = __webpack_require__(4);
var cordovaModule = __webpack_require__(1);

var createQRScannerAdapter = __webpack_require__(3);

// pass in global cordova object to expose cordova.exec
var QRScannerAdapter = createQRScannerAdapter(globalCordova);
cordovaModule.exports = QRScannerAdapter;


/***/ }),

/***/ 3:
/***/ (function(module, exports) {

module.exports = function createQRScanner(cordova){
// The native implementations should return their status as ['string':'string']
// dictionaries. Boolean values are encoded to '0' and '1', respectively.
function stringToBool(string) {
switch (string) {
case '1':
return true;
case '0':
return false;
default:
throw new Error('QRScanner plugin returned an invalid boolean number-string: ' + string);
}
}

// Converts the returned ['string':'string'] dictionary to a status object.
function convertStatus(statusDictionary) {
return {
authorized: stringToBool(statusDictionary.authorized),
denied: stringToBool(statusDictionary.denied),
restricted: stringToBool(statusDictionary.restricted),
prepared: stringToBool(statusDictionary.prepared),
scanning: stringToBool(statusDictionary.scanning),
previewing: stringToBool(statusDictionary.previewing),
showing: stringToBool(statusDictionary.showing),
lightEnabled: stringToBool(statusDictionary.lightEnabled),
canOpenSettings: stringToBool(statusDictionary.canOpenSettings),
canEnableLight: stringToBool(statusDictionary.canEnableLight),
canChangeCamera: stringToBool(statusDictionary.canChangeCamera),
currentCamera: parseInt(statusDictionary.currentCamera)
};
}

// Simple utility method to ensure the background is transparent. Used by the
// plugin to force re-rendering immediately after the native webview background
// is made transparent.
function clearBackground() {
var body = document.body;
if (body.style) {
body.style.backgroundColor = 'rgba(0,0,0,0.01)';
body.style.backgroundImage = '';
setTimeout(function() {
body.style.backgroundColor = 'transparent';
}, 1);
if (body.parentNode && body.parentNode.style) {
body.parentNode.style.backgroundColor = 'transparent';
body.parentNode.style.backgroundImage = '';
}
}
}

function errorCallback(callback) {
if (!callback) {
return null;
}
return function(error) {
var errorCode = parseInt(error);
var QRScannerError = {};
switch (errorCode) {
case 0:
QRScannerError = {
name: 'UNEXPECTED_ERROR',
code: 0,
_message: 'QRScanner experienced an unexpected error.'
};
break;
case 1:
QRScannerError = {
name: 'CAMERA_ACCESS_DENIED',
code: 1,
_message: 'The user denied camera access.'
};
break;
case 2:
QRScannerError = {
name: 'CAMERA_ACCESS_RESTRICTED',
code: 2,
_message: 'Camera access is restricted.'
};
break;
case 3:
QRScannerError = {
name: 'BACK_CAMERA_UNAVAILABLE',
code: 3,
_message: 'The back camera is unavailable.'
};
break;
case 4:
QRScannerError = {
name: 'FRONT_CAMERA_UNAVAILABLE',
code: 4,
_message: 'The front camera is unavailable.'
};
break;
case 5:
QRScannerError = {
name: 'CAMERA_UNAVAILABLE',
code: 5,
_message: 'The camera is unavailable.'
};
break;
case 6:
QRScannerError = {
name: 'SCAN_CANCELED',
code: 6,
_message: 'Scan was canceled.'
};
break;
case 7:
QRScannerError = {
name: 'LIGHT_UNAVAILABLE',
code: 7,
_message: 'The device light is unavailable.'
};
break;
case 8:
// Open settings is only available on iOS 8.0+.
QRScannerError = {
name: 'OPEN_SETTINGS_UNAVAILABLE',
code: 8,
_message: 'The device is unable to open settings.'
};
break;
default:
QRScannerError = {
name: 'UNEXPECTED_ERROR',
code: 0,
_message: 'QRScanner returned an invalid error code.'
};
break;
}
callback(QRScannerError);
};
}

function successCallback(callback) {
if (!callback) {
return null;
}
return function(statusDict) {
callback(null, convertStatus(statusDict));
};
}

function doneCallback(callback, clear) {
if (!callback) {
return null;
}
return function(statusDict) {
if (clear) {
clearBackground();
}
callback(convertStatus(statusDict));
};
}

return {
prepare: function(callback) {
cordova.exec(successCallback(callback), errorCallback(callback), 'QRScanner', 'prepare', []);
},
destroy: function(callback) {
cordova.exec(doneCallback(callback, true), null, 'QRScanner', 'destroy', []);
},
scan: function(callback) {
if (!callback) {
throw new Error('No callback provided to scan method.');
}
var success = function(result) {
callback(null, result);
};
cordova.exec(success, errorCallback(callback), 'QRScanner', 'scan', []);
},
cancelScan: function(callback) {
cordova.exec(doneCallback(callback), null, 'QRScanner', 'cancelScan', []);
},
show: function(callback) {
cordova.exec(doneCallback(callback, true), null, 'QRScanner', 'show', []);
},
hide: function(callback) {
cordova.exec(doneCallback(callback, true), null, 'QRScanner', 'hide', []);
},
pausePreview: function(callback) {
cordova.exec(doneCallback(callback), null, 'QRScanner', 'pausePreview', []);
},
resumePreview: function(callback) {
cordova.exec(doneCallback(callback), null, 'QRScanner', 'resumePreview', []);
},
enableLight: function(callback) {
cordova.exec(successCallback(callback), errorCallback(callback), 'QRScanner', 'enableLight', []);
},
disableLight: function(callback) {
cordova.exec(successCallback(callback), errorCallback(callback), 'QRScanner', 'disableLight', []);
},
useCamera: function(index, callback) {
cordova.exec(successCallback(callback), errorCallback(callback), 'QRScanner', 'useCamera', [index]);
},
useFrontCamera: function(callback) {
var frontCamera = 1;
if (callback) {
this.useCamera(frontCamera, callback);
} else {
cordova.exec(null, null, 'QRScanner', 'useCamera', [frontCamera]);
}
},
useBackCamera: function(callback) {
var backCamera = 0;
if (callback) {
this.useCamera(backCamera, callback);
} else {
cordova.exec(null, null, 'QRScanner', 'useCamera', [backCamera]);
}
},
openSettings: function(callback) {
if (callback) {
cordova.exec(successCallback(callback), errorCallback(callback), 'QRScanner', 'openSettings', []);
} else {
cordova.exec(null, null, 'QRScanner', 'openSettings', []);
}
},
getStatus: function(callback) {
if (!callback) {
throw new Error('No callback provided to getStatus method.');
}
cordova.exec(doneCallback(callback), null, 'QRScanner', 'getStatus', []);
}
};
};


/***/ }),

/***/ 4:
/***/ (function(module, exports) {

module.exports = cordova;

/***/ })

/******/ });