mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-21 05:57:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
1248 commits 5 branches 32 tags 330 MiB
Commit graph

346 commits

Author SHA1 Message Date
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
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
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 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
srowen 8b60886e41 Go ahead and enable Code 93 in android 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1402 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-31 12:47:27 +00:00
dswitkin c6f29f2ebc Created Barcode Scanner 3.31 final. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1394 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-28 15:30:48 +00:00
srowen b789f32c71 More logging, care with parsing vCard? 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1393 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-27 11:52:49 +00:00
srowen 1ef423bf68 More encoding related changes for encoding Chinese chars in QR codes 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1392 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-27 11:25:00 +00:00
dswitkin a0ecb24f54 Created Barcode Scanner 3.31 beta 1. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1391 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-26 16:58:15 +00:00
srowen 217e7fd92d Safer check for Build SDK; restrict Behold II workaround to Cupcake, per Samsung 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1390 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-26 07:01:58 +00:00
dswitkin ddc082b956 Arabic translation from Randy Shen. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1389 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-25 12:34:58 +00:00
srowen 26d3441a9d Actually add subject/body per GeoSixPack 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1374 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-19 18:29:45 +00:00
dswitkin 2f7ca668fc More translation fixes from Randy Shen. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1369 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-17 13:01:48 +00:00
srowen 95a2b88990 Commit good fix for race condition Daniel noted 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1366 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-15 11:28:43 +00:00
srowen 391626bb76 Reinstate more optimization, but avoid disagreement with dex by properly disabling the controversial optimizations: field and method merging, mostly 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1365 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-15 11:28:01 +00:00
srowen 78100ee871 Backing out this change for the Droid on suspicion that it's interfering with at least one other device 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1363 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-15 10:19:23 +00:00
dswitkin@google.com 8af8dea749 Final change for Barcode Scanner 3.3. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1348 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-10 17:14:21 +00:00
dswitkin@google.com 7bbc03bdb5 Another translation fix from Randy Shen. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1347 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-10 15:11:35 +00:00
dswitkin@google.com 9bf3b2a3ef New icon from Roman Nurik, and help system tweaks. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1346 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-10 14:57:40 +00:00
srowen 0e7aedd046 One more time -- rationalize log levels, mostly downward, and pull out 1-2 more statements 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1342 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-07 08:07:39 +00:00
dswitkin 2407314d99 Updated translations from Randy Shen. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1340 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-06 14:13:04 +00:00
srowen c462988c61 OK a little too much logging, roll some back 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1338 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-05 21:43:58 +00:00
srowen 49adf3b556 Added some log statement to help track down Acer issue 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1337 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-05 17:05:11 +00:00
srowen 6adefb84dd Unblacklist the Behold 2 since I think we're working around its problem; list the Desire due to busted Contact app 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1331 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-03 21:12:57 +00:00
dswitkin 8976d86915 Bumped the version to 3.3 beta 2. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1329 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-03 15:54:37 +00:00
srowen a071c20c1a Danish translation from Rasmus 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1327 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-02 11:57:11 +00:00
srowen 816d6b81e0 Replace tabs with spaces ( part of accepting another big patch); fix one failing test due to typo 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1326 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-02 06:49:18 +00:00
srowen 1109e2aecf Fixed XML typo in Polish translation file 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1325 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-04-30 11:33:03 +00:00
srowen ed7f1b83aa Slight tweak to last change -- parse MODE value even when there's no SCAN_FORMATS. Also be extra paranoid about other call to String.split() 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1324 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-04-29 22:18:25 +00:00
dswitkin 43dfd0053f Fixed a crash with using SCAN_FORMATS - Pattern.split() does not like null as an argument. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1323 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-04-29 22:07:11 +00:00
dswitkin 10116044ec Added the external storage permission to fix SD card writing issues and bumped the version to 3.3 beta 1. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-04-28 19:52:17 +00:00