From d7a841bc2bb6e9b11880f333e0d3117faf82a0bd Mon Sep 17 00:00:00 2001 From: srowen Date: Tue, 15 Jun 2010 13:04:18 +0000 Subject: [PATCH] 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 --- android/assets/html/about1d.html | 6 +- android/assets/html/about2d.html | 8 +- android/assets/html/index.html | 6 +- android/assets/html/scanning.html | 12 +-- android/assets/html/sharing.html | 6 +- android/assets/html/style.css | 11 ++- android/assets/html/whatsnew.html | 4 +- .../assets/images/contact-results-screen.jpg | Bin 24822 -> 21220 bytes android/res/drawable/zxing_icon.png | Bin 5894 -> 0 bytes android/res/layout-land/share.xml | 85 +++++++++--------- android/res/layout/capture.xml | 34 ------- android/res/layout/share.xml | 49 +++++----- android/res/values/colors.xml | 4 +- .../zxing/client/android/CaptureActivity.java | 23 ++--- 14 files changed, 107 insertions(+), 141 deletions(-) delete mode 100755 android/res/drawable/zxing_icon.png diff --git a/android/assets/html/about1d.html b/android/assets/html/about1d.html index 992f3ba8b..a733fca4c 100644 --- a/android/assets/html/about1d.html +++ b/android/assets/html/about1d.html @@ -1,11 +1,13 @@ + About 1D barcodes + + -

Traditional barcodes, such as those printed on product packaging, are also known as one dimensional barcodes. There are several types commonly used, including UPC and EAN. Most look similar to this:

-

+

These 1D barcodes contain a unique code which typically describes a product, like a CD or a book. You can look this code up on the internet to find prices, reviews, and more.

If you scan a book, you can also search the contents of the book for a word or phrase, and find diff --git a/android/assets/html/about2d.html b/android/assets/html/about2d.html index 59133d530..224234f84 100644 --- a/android/assets/html/about2d.html +++ b/android/assets/html/about2d.html @@ -1,13 +1,15 @@ + About 2D barcodes + + -

Barcode Scanner also understands how to read two dimensional barcodes, called QR Codes. For example, the QR Code below contains a hyperlink to the ZXing Project home page:

-

+

QR code

You can also represent contact information in a QR Code, and put it on a business card or web site. When you scan it, the results screen provides a choice of actions:

-

+

Contact results screen

Besides URLs and contact info, QR Codes can also contain: