mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-13 14:34:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1505 commits 6 branches 32 tags 331 MiB
Commit graph

1505 commits

This branch
This branch
All branches
Author SHA1 Message Date
vikrama c003d96b89 1. Set up all strings in res/*/strings.xml rather than as string 
literals.
2. Using a very handy script for this purpose, and checking it
   into utils/ since it saved me some headache.
3. Turned tabs -> spaces for WifiResultHandler.
4. Better error handling on network types: look for exact matches
   rather than substrings.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1456 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 06:00:57 +00:00
vikrama c2e3604aea 1. Instead of killing the activity when done, load up a URL in a browser instead. 
2. More error checking:
   a. Missing SSID
   b. Incorrect network type (hey, it's just a string, and the user could get creative)

TODOs:
1. Localize the strings this is introducing.
2. Errors not handled:
   a. Tell if network not found.
   b. Incorrect SSID codes still crash the app: WIFI:S:winders;T:WPA;P:secret;badjunk;;
   c. For an open network, giving a password crashes:  WIFI:S:winders;T:nopass;P:secret;;
3. When connected, it should say, "Connected to <ssid>".



git-svn-id: https://zxing.googlecode.com/svn/trunk@1455 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 04:08:35 +00:00
luizcroc dc9fcff5cb Fixing some issues in C++ port regarding 1D barcode readers 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1454 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 03:05:34 +00:00
vikrama 6943578c18 Do not broadcast the intent 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1453 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 03:01:43 +00:00
srowen b3993e7d51 Remove use of methods not in J2ME 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1452 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-22 06:23:20 +00:00
srowen 296bd49474 Blacklist Evo too for camera issue 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1451 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-21 23:24:13 +00:00
srowen d066265213 Danish fixes from rasmussch 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1450 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-20 23:00:37 +00:00
rpechayr 211b24a454 [iphone][ScanTest] updated after update of ZingWidgetController 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1449 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-19 16:58:19 +00:00
rpechayr 32bbefc1d2 [iphone][ZXingWidgetController] delegate API changed to conform to standard delagate APIs, bug fixed regarding status bar displaying upon success of scanning 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1448 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-19 16:57:05 +00:00
dswitkin@google.com b94d44c5a1 - Made sure barcode scanning always restarts when the activity is resumed. 
- Fixed a potential ANR - we can never sleep on the main thread.
- Bumped the version number.
- Minor cleanup and 100 columns fixes.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1447 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-18 16:17:12 +00:00
srowen 7255ac8443 Issues 155.2 -- add %f for format 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1445 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-18 12:58:57 +00:00
rpechayr b8453900ed [iphone] updated README to clearly advise to make .mm files whenever including files from ZXing 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1444 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-17 18:16:53 +00:00
srowen edd6ed8e7a Add bulk scan mode with preference (and rearrange prefs a bit). Reorder main strings file, add new pref string and remove probably-incorrect ellipses from Asian language translations 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1443 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-17 12:26:41 +00:00
srowen 02f090dd34 Add auto-translation tool to help update strings with Google Translate. Let it reorder (but not change) existing translations alphabetically by key. Add bulk-scan strings along the way as a test. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1442 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-17 10:55:00 +00:00
vikrama b9f47fdc59 Escape the semicolons: this was easier than I imagined. Tested with an ssid containing multiple semicolons. Also some minor code cleanups. 
Still to be done:
1. Rename 'nopass' to something cleaner, so it looks crisp in Android's Barcode Scanner UI.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1441 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-17 05:24:42 +00:00
vikrama 737fee3e69 Add the nopass handling in the Android client. 
TODO:
1. Document the encoding.
2. Test out the interaction with appspot.com with escaped semicolons and colons



git-svn-id: https://zxing.googlecode.com/svn/trunk@1440 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-17 04:33:59 +00:00
vikrama c938a5d196 Initial checkin of wifi generator. 
TODO:
1. Semicolons need to be escaped
2. In the android code, need much better error checking.  Incorrect barcodes crash Barcode Scanner!
3. Add network type NOPASS to the android code.  This is ready, and will be a separate checkin.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1439 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-17 04:31:26 +00:00
srowen 2d7b4138ab Display possible country origin info on product scan 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1438 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-16 21:13:47 +00:00
srowen 627cd6cab0 Avoid possible AIOOBE on bad input 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1437 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-16 21:12:43 +00:00
srowen 8cbe558ec3 Add support for UPC/EAN +5 extensions, plus basic tests, and display the content in Android client as metadata 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1436 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-16 19:49:22 +00:00
vikrama 2223a5cf42 Adding strings converted using Google Translate. Feeling bad about all the Engrish jokes I made in the past. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1435 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-16 04:11:54 +00:00
rpechayr 9e5e997e96 [iphone] updated README 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1434 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 22:10:23 +00:00
srowen 8e142f1f24 Oops remove bar again 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1433 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 22:08:02 +00:00
rpechayr 6ede7ed564 [iphone] now decoders need to be injected into ZXingWidgetController to enhance performance when only a few readers are needed. One exc bad access bug solved. A few minor bugs remain in ScanTest. 1st status bar does not reappear when success of scan. this one should be easy to fix. 2nd ScanTest does not display the results when scan success for the first time, but only second time. This second bug is strange 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1432 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 22:01:04 +00:00
srowen d8233b3ce1 ... and roll back a bit more to old status view, smaller text again 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1431 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 21:53:48 +00:00
srowen b238eb22a0 ... and put back status text, in a simplified form? 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1430 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 19:56:32 +00:00
srowen bda97f7c84 Back to white backgrounds, somewhat smaller text in the result screen, shorter Toast popup and doesn't interfere with help screen 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1429 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 18:43:10 +00:00
srowen b7d6fcef1d Style-related changes 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1428 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 16:25:24 +00:00
srowen 6f0f67682b Fix a formatting problem on smaller device 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1427 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 13:13:27 +00:00
srowen d7a841bc2b Rest of cosmetic changes -- simpler, black theme with easier-to-touch buttons and consistent sizing, icons 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1426 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 13:04:18 +00:00
vikrama fb1e512208 Android activity to add a network, and all associated code for dealing 
with WIFI: schemes on the Android side.

 Things to be done:
1. Much more testing.
2. Implement SB and test it well.
3. Clean up the UI to make it beautiful.
4. Figure out what to do when the network is connected: exit the
   Barcode Scanner?  Currently, the activity kills itself, restoring
   camera capture.
5. Publicize the WIFI: scheme.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1425 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-15 03:49:49 +00:00
srowen 93cd6265ea Better tweak to last change -- scale text size dynamically 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1424 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-14 13:03:02 +00:00
srowen 64373435b7 Prettify scan result screen, I think 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1423 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-14 10:59:24 +00:00
vikrama 58fefb095c Core library changes to include wifi type. One measly test included as well. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1421 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-10 03:49:18 +00:00
srowen 69c3af2ef0 Handle empty string as null in many cases 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1420 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-09 10:21:41 +00:00
srowen ac32515cdd Need to not generate debug info in Android as well now in order to satisfy new Proguard and dex releases? 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1419 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-08 23:05:28 +00:00
srowen 1851520440 Make font sizes more consistent in the app 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1418 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-08 22:52:12 +00:00
srowen f3f321dac9 Better handling of empty/incomplete content stream 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1417 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-08 22:39:49 +00:00
srowen 51970aa020 Issue 439: be more lax and don't look for END 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1416 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-08 05:20:00 +00:00
rpechayr 7cceeec2f8 [iphone][ScanTest] now builds again. Had some minor small problems 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1415 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-06 13:34:02 +00:00
rpechayr 52907d46ad [iphone] [ZXingWidget] removed llvm dependency for device. Now seems to build 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1414 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-06 13:15:13 +00:00
rpechayr bde9762bdc [iphone] ZXingWidget minor fix so that it just builds without any problem 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1413 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-06 12:58:04 +00:00
rpechayr cfd495a61a [iphone] added known issues in README when including ZXingWidget into your project, Modified ZXingWidgetController so that it know hosts a UIImagePickerController instead of SubClassing it. Please let me know if anything is broken 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1412 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-06 12:42:31 +00:00
srowen f42a6d26fe Issue 432 fix UMT definition 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1411 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-03 21:59:41 +00:00
srowen 6308c2322e Tack on a little more logging for debugging assistance 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1410 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-03 20:59:23 +00:00
rpechayr a7081d7d00 [iphone] updated README to include exportList .. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1409 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-02 19:15:03 +00:00
rpechayr a9c9ab8c09 [iphone] README added with steps to include ZXingWidget into your project 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1408 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-02 19:09:03 +00:00
bas5winkel d818288177 Changed validation method in order to prevent false positives on other 1D barcodes 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1407 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-01 14:39:24 +00:00
bas5winkel 97060619fe Renamed Codabar files and added text files for testing purposes 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1406 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-01 14:35:38 +00:00
rpechayr e99e231c23 [iphone] BarCodes partially fixed. Now builds with warnings. Unit Test are not fixed yet 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1405 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-01 06:48:27 +00:00