mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-27 02:52:01 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

New icon from Roman Nurik, and help system tweaks.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1346 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com 2010-05-10 14:57:40 +00:00
parent 5e026d8535
commit 9bf3b2a3ef
11 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -36,6 +36,7 @@ Paul Hackenberger
Randy Shen (Acer) Randy Shen (Acer)
Rasmus Schrøder Sørensen Rasmus Schrøder Sørensen
Richard Hřivňák Richard Hřivňák
Roman Nurik (Google)
Ryan Alford Ryan Alford
Sanford Squires Sanford Squires
Sean Owen (Google) Sean Owen (Google)

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

@ -2,7 +2,6 @@
<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>
<p>Traditional barcodes, such as those printed on product packaging, are also known as <em>one <p>Traditional barcodes, such as those printed on product packaging, are also known as <em>one
dimensional barcodes</em>. There are several types commonly used, including UPC and EAN. Most look dimensional barcodes</em>. There are several types commonly used, including UPC and EAN. Most look
similar to this:</p> similar to this:</p>

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

@ -2,7 +2,6 @@
<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>
<p><b>Barcode Scanner</b> also understands how to read two dimensional barcodes, called <em>QR <p><b>Barcode Scanner</b> also understands how to read two dimensional barcodes, called <em>QR
Codes</em>. For 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>

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

@ -2,13 +2,12 @@
<title>Barcode Scanner Help</title> <title>Barcode Scanner Help</title>
<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>
<p><b>Barcode Scanner</b> uses the camera on your phone to read barcodes and look up product <p><b>Barcode Scanner</b> uses the camera on your phone to read barcodes and look up 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 also reads <strong>2D barcodes</strong>, called <em>QR Codes</em>, which can contain links to <p>It also reads <strong>2D barcodes</strong>, called <em>QR Codes</em>, which can contain links to
web sites, contact information such as phone numbers and email addresses, map locations and more.</p> web sites, contact information such as phone numbers and email addresses, map locations and more.</p>
<ul> <ul class="touchable">
<li><a href="whatsnew.html">What's new in this version</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>
@ -16,4 +15,4 @@
<li><a href="sharing.html">How to use QR Codes to share information</a></li> <li><a href="sharing.html">How to use QR Codes to share information</a></li>
</ul> </ul>
</body> </body>
</html> </html>

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

@ -2,7 +2,6 @@
<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>
<p>Barcode Scanner continuously scans a square region shown on your screen &mdash; just line up the <p>Barcode Scanner continuously scans a square region shown on your screen &mdash; just line up the
phone so the barcode is completely inside the viewfinder rectangle:</p> phone so the barcode is completely inside the viewfinder rectangle:</p>
<center><p> <center><p>

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

@ -2,7 +2,6 @@
<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>
<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>

4
android/assets/html/style.css
View file

@ -4,3 +4,7 @@ body {
font-family: arial; font-family: arial;
font-size: 16; font-size: 16;
} }
ul.touchable li {
padding-top:8px;
padding-bottom:8px;
}

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

@ -2,15 +2,15 @@
<title>What's new in this version</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 in this version</center></h3>
<p>New in version 3.3:</p> <p>New in version 3.3:</p>
<ul> <ul>
<li>Added support for RSS-14 barcodes.</li> <li>Added support for RSS-14 barcodes.</li>
<li>Turned off the flash on the Behold II.</li> <li>Diabled the flash on the Behold II.</li>
<li>Added the ability to send a QR Code generated with the Share feature.</li> <li>Added the ability to send a QR Code generated with the Share feature.</li>
<li>Forced the beep sound off if the phone is in silent mode.</li> <li>Forced the beep sound off if the phone is in silent mode.</li>
<li>Allowed web sites to start Barcode Scanner and choose the URL the result is sent to.</li> <li>Allowed web sites to start Barcode Scanner and choose the URL the result is sent to.</li>
<li>Added Portuguese and Danish translations.</li> <li>Added Portuguese and Danish translations.</li>
<li>New Eclair-style icon.</li>
</ul> </ul>
</body> </body>
</html> </html>

BIN
android/res/drawable-hdpi/launcher_icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
android/res/drawable/launcher_icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

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

@ -33,20 +33,20 @@
android:layout_weight="0" android:layout_weight="0"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center" android:gravity="center"
android:padding="6dip" android:padding="4dip"
android:weightSum="1" 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="0dip" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.35" android:layout_weight="0.5"
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="0dip" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.35" android:layout_weight="0.5"
android:text="@string/button_done"/> android:text="@string/button_done"/>
</LinearLayout> </LinearLayout>