mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 13:37:34 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
1380 commits 5 branches 32 tags 330 MiB
Commit graph

385 commits

Author SHA1 Message Date
srowen fd3c38bf70 Another minor change to WhiteRectangleDetector and update "about" screen in Android to mention Data Matrix 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1586 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-09-13 09:12:02 +00:00
dswitkin@google.com 4c01e8897d Fixed the Google Shopper button remaining visible after scanning a product, and bumped the version to 3.5 beta 1. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1583 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-09-10 21:02:33 +00:00
srowen fa10404128 Issue 549, Make slightly more consistent by changing value of as-yet-unused key ENCODE_FORMAT 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-09-10 08:24:51 +00:00
srowen ce3d27ed69 Turn on Data Matrix, including separate scan option in Android 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1579 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-09-09 07:30:57 +00:00
srowen 8d5559050b Turkish translation from Acer 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1577 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-09-07 23:20:40 +00:00
srowen c34f284041 Issue 465, remove reference to libs/ as it is not used 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1569 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-29 20:31:47 +00:00
srowen e3bd36499c Translation updates from Morgan Courbet 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1557 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-24 19:17:48 +00:00
srowen 8f1401656a Slovenian translation 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1555 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-23 16:41:15 +00:00
srowen 273d2eea97 Issue 521, avoid an NPE 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1552 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-22 21:58:11 +00:00
srowen eee9068f2a Weird, Android doesn't have TimeUnit.MINUTES 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1532 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-14 19:00:54 +00:00
srowen 5951e1dac3 Issue 460, auto timeout of CaptureActivity after inactivity, for testing. Also break out some code from CaptureActivity to reduce its size. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1529 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-13 17:18:53 +00:00
srowen 09b0039530 Add result points for UPC EAN metadata extension 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1519 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-11 13:59:48 +00:00
dswitkin 8f5201949e Updated Dutch translation from Sven Klinkhamer. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1504 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-02 17:02:49 +00:00
dswitkin@google.com 63a5cd3055 Added a Google Shopper icon to the result buton for products and ISBNs. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1492 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-21 23:15:23 +00:00
dswitkin@google.com e95e16698a Final Barcode Scanner 3.4 changes: 
- Cleaned up the sharing UI
- Removed a piece of black artwork
- Fixed the Froyo bug with the Help screen appearing blank
- Made external URLs in Help launch in the Browser
- Updated some help text

git-svn-id: https://zxing.googlecode.com/svn/trunk@1491 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-20 22:43:38 +00:00
srowen f53c7573db Break out click listener class and make duplicate scans always result in new entry at top 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1490 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-19 21:28:57 +00:00
srowen 0b0c051d5f Issue 475, comment fix 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1487 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-17 10:39:34 +00:00
dswitkin@google.com 6e675714c0 Updated the version to 3.4 beta 3, and removed the reinstall target, making the install target do either. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1486 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-16 21:10:37 +00:00
srowen ec4c7a14b4 Remove unused string 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1485 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-15 15:55:09 +00:00
srowen 3cdba67bf6 Remove progress dialog to avoid rare exception 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1484 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-15 15:18:31 +00:00
srowen 4ed7e4ac96 Make sure checkboxes are enabled correctly on first load 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1479 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-13 10:34:13 +00:00
srowen e46c6f1e9f Add WAKE_LOCK for wifi as it appears necessary on older Android 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1478 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-13 07:56:52 +00:00
srowen 04a62c6879 Style bits on wi-fi code 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1476 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-10 05:59:14 +00:00
dswitkin@google.com 426636cea4 Updated the version to 3.4 beta 2. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1475 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-09 21:36:59 +00:00
vikrama b5619824c8 Fixed: pause -> onPause, resume -> onResume 
Make sure the ssid we are connected to is not null.  This happens when
a network has been updated/removed while we are still connected to it.

Make errorCount an instance variable.




git-svn-id: https://zxing.googlecode.com/svn/trunk@1474 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-09 17:14:04 +00:00
vikrama 9e1dbf07d9 Renamed the receiver, but forgot in the previous commit. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1471 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-09 05:55:08 +00:00
vikrama 77207acb31 Some error checking put in. When a new network is created and the 
connection fails, an alert message is displayed, and connection
attempts cease.  Retrying with a correct barcode works.  Not perfect
yet, but in my testing I have found this version much better than the
previous setup: at least errors are detected and the user is informed.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1470 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-09 05:49:42 +00:00
vikrama 983d29eb62 Removed some commented code, and general code cleanup. Turned many 
variables into finals.  Change the UI to display network name and type
more clearly.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1469 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-08 05:12:51 +00:00
vikrama b8f4061c39 Bug Fix: 
When a 64 bit hex password is entered, wpa_supplicant fails with the
error:

 "wpa_supplicant (pid) Line 0: Invalid passphrase length 64 (expected:
  8..63)"

The fix is to not quote 64 char long hexadecimal passwords.  Tested
dd-wrt on a 64 char hex password.




git-svn-id: https://zxing.googlecode.com/svn/trunk@1468 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-07-05 22:25:20 +00:00
srowen 4a623428c1 Make sure cancel is handled properly in a few cases, where app must exit after dialog 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1466 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-30 08:07:05 +00:00
dswitkin@google.com f70d7e51bf - Bumped version to 3.4 beta 1. 
- Fixed two crashes on low DPI devices because of missing/stale views in layout-ldpi/capture.xml.
- Added support for apps on SD card on Froyo.
- Updated SDK to 8.
- Tweaked some font sizes.
- Updated the What's New page.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1464 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-29 21:11:27 +00:00
vikrama a55b3b0491 Connected, turned into a resource 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1460 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 22:26:43 +00:00
vikrama b237d3d34f Change another string to a resource. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1459 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 22:16:53 +00:00
srowen e4c28d95da Small style things 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1457 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-06-23 10:23:09 +00:00
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
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 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
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
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 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
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 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
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
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