Commit Graph

104 Commits

Author SHA1 Message Date
Bar Tsoury
5c144a7961 update so files to be compatible with android M (23) 2016-01-11 14:50:40 +02:00
TJ Woon
e9e4394250 Fixed incorrect plugin installation command in README... 2015-05-20 10:54:55 +08:00
TJ Woon
32cc5d6f48 Updated plugin version to 1.3.1 2015-05-20 10:45:00 +08:00
TJ Woon
0b114a85db Made Android AUTOFOCUS feature optional to improve device compatibility (#1) 2015-05-20 10:44:50 +08:00
TJ Woon
c79a87e441 Added thanks to @nickgerman for Pull Request #16 2015-04-20 00:00:12 +08:00
TJ Woon
1e1eff966f Updated README - with continuous autofocus added in d4d062c, I don't expect the quirky flash behaviour with interval autofocus to remain 2015-04-19 23:59:53 +08:00
TJ Woon
a70a9bcb03 Pull Request cleanup (#16): Reinstated old interval autofocus bahaviour on Android API Level < 14 (plus minor blank line formatting) 2015-04-19 23:58:45 +08:00
TJ Woon
fc6e2ff07c Pull Request cleanup (#16): Removed redundant BarcodeFormat class 2015-04-19 23:54:40 +08:00
TJ Woon
d4d062cccc Merge pull request #16 from nickgerman/master
Added continuous autofocus on Android if the API Level supports it + added explicit enabling of all ZBar barcode formats
2015-04-19 23:51:24 +08:00
Nick German
2b738063ef renamed BarcodeFormat to ZBarcodeFormat, fixed indentation and added sdk check for continuous focus 2015-04-13 10:27:24 +10:00
Nick German
80a3632a15 Merge branch 'master' of https://github.com/nickgerman/csZBar
Conflicts:
	android/ZBarScannerActivity.java
	android/res/layout/cszbarscanner.xml
	plugin.xml
2015-03-26 07:27:36 +10:00
Nick German
bb3b82aace Android now uses auto focus, assigns and enables all barcode types 2015-03-26 07:22:39 +10:00
TJ Woon
e3d04f0637 Updated plugin version to 1.3.0 2015-02-27 19:04:33 +08:00
TJ Woon
a08b27b683 Added Thanks section to the README 2015-02-27 19:04:06 +08:00
TJ Woon
3c5e5b5eb4 Merge branch 'pr/11' 2015-02-27 18:57:48 +08:00
TJ Woon
2b66fec6eb Fixed tab indentation in plugin.xml 2015-02-27 18:57:04 +08:00
TJ Woon
ff4c716e46 Re-added Paolo's Android autofocus crash fix (see 633b5f7) 2015-02-27 18:56:31 +08:00
TJ Woon
bc944fea99 Restore/update the hack for hiding ZBar scanner Info button on iOS 2015-02-27 18:41:44 +08:00
TJ Woon
2a8a237a97 Reverted Android layout and Activity changes back to original with addition of simple sight line
There was no need to completely change our implementation and remove
the top and bottom text views
2015-02-27 18:28:16 +08:00
TJ Woon
cc404e0314 Changed drawSight option to a boolean and fixed inconsistent formatting in README 2015-02-27 18:27:19 +08:00
TJ Woon
07d7329040 Version bump to 1.2.2 2015-02-16 19:02:16 +08:00
TJ Woon
e258629c7b Fix incorrect upperlower-casing of zbar.js file (pt2 of 2) 2015-02-16 19:01:57 +08:00
TJ Woon
4b37aaeec9 Fix incorrect upperlower-casing of zbar.js file (pt1 of 2) 2015-02-16 19:01:24 +08:00
TJ Woon
1137f45248 Version bump to 1.2.1 2015-02-16 18:50:11 +08:00
TJ Woon
d6ecab472e Fixed: Incorrect upper/lower-casing for ZBar .jar filename caused the plugin to fail to install on really case-sensitive systems 2015-02-16 16:30:19 +08:00
PaoloMessina
633b5f7b54 Manage onAutoFocus Android
Manage onAutoFocus Android
2015-02-03 10:43:31 +01:00
PaoloMessina
7ec413e5bc Commi plugin.xml
Commi plugin.xml
2015-01-30 10:47:48 +01:00
PaoloMessina
354eb7e85a iOS default drawSight = true
iOS default drawSight = true
2015-01-23 14:32:25 +01:00
PaoloMessina
6ae4faaf3a Android default drawSight = true
Android default drawSight = true
2015-01-23 14:31:50 +01:00
PaoloMessina
98cf6c7bec Android bugfix
android bugfix
2015-01-23 11:49:57 +01:00
PaoloMessina
817b5d0ffa Commit relative layout
Commit relative layout
2015-01-23 11:20:12 +01:00
PaoloMessina
dc04869ae1 iOS adding landscape sight
Adding landscape sight for iOS terminal, bug fix on iPad
2015-01-23 10:36:49 +01:00
PaoloMessina
0d9a53e476 Android, line sight landscape
Adding a line sight landscape
2015-01-23 10:02:38 +01:00
PaoloMessina
76630c9c45 android autofocus fix
Adding camera.cancelAutoFocus(); some devices crashes
2015-01-21 14:26:33 +01:00
PaoloMessina
2d02b70c07 Android fix
Fix android release
2015-01-16 15:44:36 +01:00
PaoloMessina
790704f750 Commit Android
Commit Android Label and rect sight removing
2015-01-16 12:12:39 +01:00
PaoloMessina
9d94500548 Bug fix
Continuos auto focus fix for sony device
2014-12-23 16:06:44 +01:00
PaoloMessina
cc4343209f Bug fix
Cynogen camera auto focus bug
2014-12-23 15:27:24 +01:00
PaoloMessina
58e2da4f24 iOS sight missing
iOS sight missing
2014-12-22 15:51:57 +01:00
PaoloMessina
76246b80ed iOS & Android fix and upgrade
iOS:
- x86_64 header fixing
- sight adding

Android:
- Bug fix no params NullPointerException
- sight adding
2014-12-22 14:59:52 +01:00
TJ Woon
0f8fe5b1f7 Fixed: plugin.xml still says v1.1.0... 2014-12-13 18:10:05 +08:00
Woon Tien Jing
5ca1e07d9e Documented Android flash:"on" quirk after finding out that setting focus mode to CONTINUOUS_PICTURE or CONTINUOUS_VIDEO actually gave poorer results (flash only turned on during the first autofocus attempt, if at all - may be device dependent) 2014-12-06 17:32:54 +08:00
Woon Tien Jing
0b0699f7b4 Added an option for camera flash to be on/off/auto during QR code scanning 2014-12-06 16:58:46 +08:00
Woon Tien Jing
889be2cc3a Removed all whitespace-only lines from the source code to stop myself from going crazy... 2014-12-06 16:40:14 +08:00
Woon Tien Jing
4ef4dfb51f Added front/back camera option 2014-12-06 16:38:00 +08:00
Woon Tien Jing
40e48e6c7c Updated plugin version to v1.1.0 2014-12-06 15:45:09 +08:00
Woon Tien Jing
1d22b1d6f8 Clarified the Android-only and OPTIONAL status of the optional text_title and text_instructions parameters (see 8d0261b6) 2014-12-06 15:44:44 +08:00
Woon Tien Jing
8d0261b650 Added text_title and text_instructions parameters for customising the scanner view's title and instructions texts (Android only in this commit) 2014-12-06 15:40:17 +08:00
TJ Woon
9fb4a6a23c Added installation instructions and brief license info to README 2014-09-12 10:08:18 +08:00
TJ Woon
9673bafefa Added iOS implementation (tested on iOS7, iPhone 4S...) 2014-09-12 01:45:17 +08:00