From e4eca08e69c4192f9a8872af28454498d3c6656e Mon Sep 17 00:00:00 2001 From: dswitkin Date: Tue, 2 Dec 2008 20:26:21 +0000 Subject: [PATCH] New HTML edits from Joseph, and added a fading edge to the WebView to make it more obvious that there is more content the user can scroll to. git-svn-id: http://zxing.googlecode.com/svn/trunk@773 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/assets/html/about1d.html | 11 ++++++----- android/assets/html/about2d.html | 8 ++++---- android/assets/html/index.html | 18 +++++++++--------- android/assets/html/scanning.html | 21 ++++++++++----------- android/assets/html/sharing.html | 4 ++-- android/assets/html/whatsnew.html | 16 ++++++++-------- android/res/layout/help.xml | 13 +++++++++---- android/res/values/colors.xml | 2 +- 8 files changed, 49 insertions(+), 44 deletions(-) diff --git a/android/assets/html/about1d.html b/android/assets/html/about1d.html index b457e70d..5fc6fa97 100644 --- a/android/assets/html/about1d.html +++ b/android/assets/html/about1d.html @@ -1,15 +1,16 @@ -About 1D Barcodes +About 1D barcodes -

About 1D Barcodes

-

Traditional barcodes are also known as one dimensional barcodes. There are several varieties, - including UPC and EAN in common use. Most look similar to this:

+

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 all the pages where it appears:

-

+

\ No newline at end of file diff --git a/android/assets/html/about2d.html b/android/assets/html/about2d.html index 6cc00464..ab2343ae 100644 --- a/android/assets/html/about2d.html +++ b/android/assets/html/about2d.html @@ -1,10 +1,10 @@ -About 2D Barcodes +About 2D barcodes -

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:

+

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:

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:

diff --git a/android/assets/html/index.html b/android/assets/html/index.html index bab02817..e00afd7e 100644 --- a/android/assets/html/index.html +++ b/android/assets/html/index.html @@ -3,17 +3,17 @@

Welcome to Barcode Scanner

-

Barcode Scanner lets you use your Android camera phone to read barcodes, then look up - product information such as prices and reviews.

+

Barcode Scanner uses the camera on your phone to read barcodes and look up product + information such as prices and reviews.

-

It can also read 2D barcodes called QR Codes, which can contain links to web sites, contact - info like phone number and email, and more. Click below to learn more.

+

It also reads 2D barcodes, called QR Codes, which can contain links to + web sites, contact information such as phone numbers and email addresses, map locations and more.

\ No newline at end of file diff --git a/android/assets/html/scanning.html b/android/assets/html/scanning.html index ca444e4b..45899d99 100644 --- a/android/assets/html/scanning.html +++ b/android/assets/html/scanning.html @@ -1,21 +1,20 @@ -How To Scan +How to scan -

How To Scan

-

Scanning a barcode is fast and easy. Barcode Scanner continuously scans the viewfinder - rectangle, so there's no need to press the shutter button. Just move the phone until the barcode - is completely inside:

+

How to scan

+

Barcode Scanner continuously scans a square region shown on your screen — just line up the + phone so the barcode is completely inside the viewfinder rectangle:

   

-

If you're having trouble, make sure to hold the phone steady. If the camera is unable to focus, - try moving further back from the barcode.

-

When a barcode is found, the phone will beep and take you to the results screen, which describes - what you found, and offers a choice of actions. Learn more:

+

When a barcode is read, a beep sound will play and you'll see the results of the scan, a + description of what the barcode contains, and options to take action on the contents.

+

If you're having trouble scanning, make sure to hold the phone steady. If the camera is unable to + focus, try moving the phone further or closer from the barcode.

\ No newline at end of file diff --git a/android/assets/html/sharing.html b/android/assets/html/sharing.html index 57940c34..81bc1124 100644 --- a/android/assets/html/sharing.html +++ b/android/assets/html/sharing.html @@ -1,8 +1,8 @@ -How To Share +How to share -

How To Share

+

How to share

In addition to scanning 2D barcodes, Barcode Scanner can also generate a QR Code and display it on your screen. Then you can show it to a friend, and let them scan the barcode with their phone:

diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 55ff8fe7..95539479 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -1,20 +1,20 @@ -What's New +What's new in this version -

What's New

+

What's new in this version

New in version 2.4, you can share information with your friends using barcodes:

-

There are lots of other improvements too:

+

Other improvements include:

\ No newline at end of file diff --git a/android/res/layout/help.xml b/android/res/layout/help.xml index e1e69e2a..062ff68b 100644 --- a/android/res/layout/help.xml +++ b/android/res/layout/help.xml @@ -23,25 +23,30 @@ + android:layout_weight="1" + android:fadingEdge="vertical" + android:fadingEdgeLength="16dip"/>