mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@773 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-12-02 20:26:21 +00:00
parent c74735c1b4
commit 271c9b2dde
8 changed files with 49 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/assets/html/about1d.html
View file

@ -1,15 +1,16 @@
<html> <html>
<title>About 1D Barcodes</title> <title>About 1D barcodes</title>
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>About 1D Barcodes</center></h3> <h3><center>About 1D barcodes</center></h3>
<p>Traditional barcodes are also known as one dimensional barcodes. There are several varieties, <p>Traditional barcodes, such as those printed on product packaging, are also known as <em>one
including UPC and EAN in common use. Most look similar to this:</p> dimensional barcodes</em>. There are several types commonly used, including UPC and EAN. Most look
similar to this:</p>
<center><p><img src="../images/big-1d.png"></p></center> <center><p><img src="../images/big-1d.png"></p></center>
<p>These 1D barcodes contain a unique code which typically describes a product, like a CD or a book. <p>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.</p> You can look this code up on the internet to find prices, reviews, and more.</p>
<p>If you scan a book, you can also search the contents of the book for a word or phrase, and find <p>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:</p> all the pages where it appears:</p>
<center><p><img src="../images/search-book-contents.jpg"></p></center> <center><p><img src="../images/search-book-contents.png"></p></center>
</body> </body>
</html> </html>

8
android/assets/html/about2d.html
View file

@ -1,10 +1,10 @@
<html> <html>
<title>About 2D Barcodes</title> <title>About 2D barcodes</title>
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>About 2D Barcodes</center></h3> <h3><center>About 2D barcodes</center></h3>
<p><b>Barcode Scanner</b> also understands how to read two dimensional barcodes called QR Codes. For <p><b>Barcode Scanner</b> also understands how to read two dimensional barcodes, called <em>QR
example, the QR Code below contains a hyperlink to the ZXing Project home page:</p> Codes</em>. For example, the QR Code below contains a hyperlink to the ZXing Project home page:</p>
<center><p><img src="../images/big-qr.png"></p></center> <center><p><img src="../images/big-qr.png"></p></center>
<p>You can also represent contact information in a QR Code, and put it on a business card or web <p>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:</p> site. When you scan it, the results screen provides a choice of actions:</p>

18
android/assets/html/index.html
View file

@ -3,17 +3,17 @@
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>Welcome to Barcode Scanner</center></h3> <h3><center>Welcome to Barcode Scanner</center></h3>
<p><b>Barcode Scanner</b> lets you use your Android camera phone to read barcodes, then look up <p><b>Barcode Scanner</b> uses the camera on your phone to read barcodes and look up product
product information such as prices and reviews.</p> information such as prices and reviews.</p>
<center><p><img src="../images/scan-example.png"></p></center> <center><p><img src="../images/scan-example.png"></p></center>
<p>It can also read 2D barcodes called QR Codes, which can contain links to web sites, contact <p>It also reads <strong>2D barcodes</strong>, called <em>QR Codes</em>, which can contain links to
info like phone number and email, and more. Click below to learn more.</p> web sites, contact information such as phone numbers and email addresses, map locations and more.</p>
<ul> <ul>
<li><a href="whatsnew.html">What's New</a></li> <li><a href="whatsnew.html">What's new in this version</a></li>
<li><a href="scanning.html">How To Scan</a></li> <li><a href="scanning.html">How to scan</a></li>
<li><a href="about1d.html">About 1D Barcodes</a></li> <li><a href="about1d.html">About 1D barcodes</a></li>
<li><a href="about2d.html">About 2D Barcodes</a></li> <li><a href="about2d.html">About 2D barcodes</a></li>
<li><a href="sharing.html">How To Share Data With Friends</a></li> <li><a href="sharing.html">How to use QR Codes to share information</a></li>
</ul> </ul>
</body> </body>
</html> </html>

21
android/assets/html/scanning.html
View file

@ -1,21 +1,20 @@
<html> <html>
<title>How To Scan</title> <title>How to scan</title>
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>How To Scan</center></h3> <h3><center>How to scan</center></h3>
<p>Scanning a barcode is fast and easy. <b>Barcode Scanner</b> continuously scans the viewfinder <p>Barcode Scanner continuously scans a square region shown on your screen &mdash; just line up the
rectangle, so there's no need to press the shutter button. Just move the phone until the barcode phone so the barcode is completely inside the viewfinder rectangle:</p>
is completely inside:</p>
<center><p> <center><p>
<img src="../images/demo-yes.png">&nbsp;&nbsp;&nbsp;<img src="../images/demo-no.png"> <img src="../images/demo-yes.png">&nbsp;&nbsp;&nbsp;<img src="../images/demo-no.png">
</p></center> </p></center>
<p>If you're having trouble, make sure to hold the phone steady. If the camera is unable to focus, <p>When a barcode is read, a beep sound will play and you'll see the results of the scan, a
try moving further back from the barcode.</p> description of what the barcode contains, and options to take action on the contents.</p>
<p>When a barcode is found, the phone will beep and take you to the results screen, which describes <p>If you're having trouble scanning, make sure to hold the phone steady. If the camera is unable to
what you found, and offers a choice of actions. Learn more:</p> focus, try moving the phone further or closer from the barcode.</p>
<ul> <ul>
<li><a href="about1d.html">About 1D Barcodes</a></li> <li><a href="about1d.html">About 1D barcodes</a></li>
<li><a href="about2d.html">About 2D Barcodes</a></li> <li><a href="about2d.html">About 2D barcodes</a></li>
</ul> </ul>
</body> </body>
</html> </html>

4
android/assets/html/sharing.html
View file

@ -1,8 +1,8 @@
<html> <html>
<title>How To Share</title> <title>How to share</title>
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>How To Share</center></h3> <h3><center>How to share</center></h3>
<p>In addition to <a href="about2d.html">scanning 2D barcodes</a>, <b>Barcode Scanner</b> can also <p>In addition to <a href="about2d.html">scanning 2D barcodes</a>, <b>Barcode Scanner</b> can also
generate a QR Code and display it on your screen. Then you can show it to a friend, and let them 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:</p> scan the barcode with their phone:</p>

16
android/assets/html/whatsnew.html
View file

@ -1,20 +1,20 @@
<html> <html>
<title>What's New</title> <title>What's new in this version</title>
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>What's New</center></h3> <h3><center>What's new in this version</center></h3>
<p>New in version 2.4, you can <a href="sharing.html">share information with your friends</a> using <p>New in version 2.4, you can <a href="sharing.html">share information with your friends</a> using
barcodes:</p> barcodes:</p>
<center><p><img src="../images/scan-from-phone.png"></p></center> <center><p><img src="../images/scan-from-phone.png"></p></center>
<p>There are lots of other improvements too:</p> <p>Other improvements include:</p>
<ul> <ul>
<li>Scanning is now twice as fast</li> <li>Scanning is now twice as fast</li>
<li>Contact info can now contain URLs, birthdays, and more</li> <li>Contact info QR Codes can now contain URLs, birthdays, and more</li>
<li>Calendar events can be read from QR Codes, and added to your calendar</li> <li>Calendar events can be read from QR Codes and added to your calendar</li>
<li>Improved support for reading Japanese characters in QR Codes</li> <li>Improved support for reading Japanese characters in QR Codes</li>
<li>Searching Google will now use the phone's locale and go to the local site, instead of always <li>Searching Google will now use the phone's locale for local results instead of always using
using google.com</li> google.com</li>
<li>This new HTML help system</li> <li>New HTML help system</li>
</ul> </ul>
</body> </body>
</html> </html>

13
android/res/layout/help.xml
View file

@ -23,25 +23,30 @@
<WebView android:id="@+id/help_contents" <WebView android:id="@+id/help_contents"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"/> android:layout_weight="1"
android:fadingEdge="vertical"
android:fadingEdgeLength="16dip"/>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="right" android:gravity="center"
android:padding="8px" android:padding="8px"
android:weightSum="1"
android:background="@color/help_button_view"> android:background="@color/help_button_view">
<Button android:id="@+id/back_button" <Button android:id="@+id/back_button"
android:layout_width="100px" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.35"
android:text="@string/button_back"/> android:text="@string/button_back"/>
<Button android:id="@+id/done_button" <Button android:id="@+id/done_button"
android:layout_width="100px" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.35"
android:text="@string/button_done"/> android:text="@string/button_done"/>
</LinearLayout> </LinearLayout>

2
android/res/values/colors.xml
View file

@ -18,7 +18,7 @@
<color name="contents_text">#ff000000</color> <color name="contents_text">#ff000000</color>
<color name="encode_view">#ffffffff</color> <color name="encode_view">#ffffffff</color>
<color name="help_button_view">#ffcccccc</color> <color name="help_button_view">#ffcccccc</color>
<color name="help_view">#ffffffff</color> <color name="help_view">#ff404040</color>
<color name="result_image_border">#ffffffff</color> <color name="result_image_border">#ffffffff</color>
<color name="result_minor_text">#ffc0c0c0</color> <color name="result_minor_text">#ffc0c0c0</color>
<color name="result_points">#c000ff00</color> <color name="result_points">#c000ff00</color>