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

- Bumped version to 3.4 beta 1.

Browse source 
- Fixed two crashes on low DPI devices because of missing/stale views in layout-ldpi/capture.xml.
- Added support for apps on SD card on Froyo.
- Updated SDK to 8.
- Tweaked some font sizes.
- Updated the What's New page.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1464 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com 2010-06-29 21:11:27 +00:00
parent 73bb0192a3
commit f70d7e51bf
10 changed files with 63 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/AndroidManifest.xml
View file

@ -20,8 +20,9 @@ version to be published. The next versionCode will be 7, regardless of whether t
versionName is 2.31, 2.4, or 3.0. --> versionName is 2.31, 2.4, or 3.0. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="3.32 beta 1" android:versionName="3.4 beta 1"
android:versionCode="54"> android:versionCode="55"
android:installLocation="auto">
<!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. --> <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
<uses-sdk android:minSdkVersion="3" <uses-sdk android:minSdkVersion="3"
android:targetSdkVersion="4"/> android:targetSdkVersion="4"/>

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

@ -4,24 +4,17 @@
<link rel="stylesheet" href="style.css" type="text/css"/> <link rel="stylesheet" href="style.css" type="text/css"/>
</head> </head>
<body> <body>
<p><b>New in version 3.31:</b></p> <p><b>New in version 3.4:</b></p>
<ul> <ul>
<li>Fixed a bug which caused some devices not to scan from time to time.</li> <li>Added suppport for WiFi base station creditials in QR Codes.</li>
<li>Added Arabic translation.</li> <li>Added Code 93 support.</li>
<li>Improved scanning speed.</li> <li>Added recognition of 5 digit UPC/EAN extensions.</li>
<li>Added RSS Expanded support.</li> <li>Added bulk scan mode to the preferences.</li>
<li>Fixed a crash in the QR Code reader.</li> <li>Allowed the app to be moved to the SD card on Froyo devices.</li>
<li>Improved Chinese character support in QR Codes.</li> <li>Fixed a problem where scanning would not work when resuming the app.</li>
</ul> <li>Made Calendar event parsing more lenient.</li>
<p><b>New in version 3.3:</b></p> <li>Fixed crashes in the QR Encoder with missing data.</li>
<ul> <li>Updated the UI appearance a bit.</li>
<li>Added support for RSS-14 barcodes.</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>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>Added Portuguese and Danish translations.</li>
<li>New Eclair-style icon.</li>
</ul> </ul>
</body> </body>
</html> </html>

20
android/build.xml
View file

@ -20,7 +20,7 @@ limitations under the License.
to find the SDK location, I've removed it and pointed us at the global ZXing build.properties. --> to find the SDK location, I've removed it and pointed us at the global ZXing build.properties. -->
<property file="../build.properties"/> <property file="../build.properties"/>
<!-- Parts of the Android build system insist on the name 'sdk-location', so alias it. --> <!-- Parts of the Android build system insist on the name 'sdk-location', so alias it. -->
<property name="sdk-location" value="${android-home}"/> <property name="sdk.dir" value="${android-home}"/>
<!-- The build.properties file can be created by you and is never touched <!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the default property values by the 'android' tool. This is the place to change some of the default property values
@ -52,11 +52,11 @@ limitations under the License.
<!-- Custom Android task to deal with the project target, and import the proper rules. <!-- Custom Android task to deal with the project target, and import the proper rules.
This requires ant 1.6.0 or above. --> This requires ant 1.6.0 or above. -->
<path id="android.antlibs"> <path id="android.antlibs">
<pathelement path="${sdk-location}/tools/lib/anttasks.jar" /> <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
<pathelement path="${sdk-location}/tools/lib/sdklib.jar" /> <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
<pathelement path="${sdk-location}/tools/lib/androidprefs.jar" /> <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
<pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" /> <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
<pathelement path="${sdk-location}/tools/lib/jarutils.jar" /> <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
</path> </path>
<taskdef name="setup" <taskdef name="setup"
@ -85,7 +85,7 @@ limitations under the License.
<!-- Properties --> <!-- Properties -->
<property name="android-tools" value="${sdk-location}/tools" /> <property name="android-tools" value="${sdk.dir}/tools" />
<!-- Input directories --> <!-- Input directories -->
<property name="source-folder" value="src" /> <property name="source-folder" value="src" />
@ -154,7 +154,7 @@ limitations under the License.
<arg value="-S" /> <arg value="-S" />
<arg path="${resource-folder}" /> <arg path="${resource-folder}" />
<arg value="-I" /> <arg value="-I" />
<arg path="${android-jar}" /> <arg path="${android.jar}" />
</exec> </exec>
</target> </target>
@ -239,7 +239,7 @@ limitations under the License.
manifest="AndroidManifest.xml" manifest="AndroidManifest.xml"
resources="${resource-folder}" resources="${resource-folder}"
assets="${asset-folder}" assets="${asset-folder}"
androidjar="${android-jar}" androidjar="${android.jar}"
outfolder="${out-folder}" outfolder="${out-folder}"
basename="${ant.project.name}" /> basename="${ant.project.name}" />
</target> </target>
@ -275,7 +275,7 @@ limitations under the License.
<arg value="-f"/> <arg value="-f"/>
<arg value="-v"/> <arg value="-v"/>
<arg value="4"/> <arg value="4"/>
<arg value="${out-folder}/temp.apk"/> <arg value="${out-folder}/temp.apk"/>
<arg value="${out-folder}/BarcodeScanner-debug.apk"/> <arg value="${out-folder}/BarcodeScanner-debug.apk"/>
</exec> </exec>
</target> </target>

2
android/default.properties
View file

@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-4 target=android-8

2
android/res/layout-land/encode.xml
View file

@ -34,7 +34,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center" android:gravity="center"
android:textColor="@color/contents_text" android:textColor="@color/contents_text"
android:textSize="22sp" android:textSize="18sp"
android:paddingRight="8dip" android:paddingRight="8dip"
android:paddingTop="8dip" android:paddingTop="8dip"
android:paddingBottom="8dip"/> android:paddingBottom="8dip"/>

2
android/res/layout-land/share.xml
View file

@ -28,7 +28,7 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
android:textColor="@color/share_text" android:textColor="@color/share_text"
android:textSize="22sp" android:textSize="18sp"
android:text="@string/msg_share_explanation"/> android:text="@string/msg_share_explanation"/>
<LinearLayout <LinearLayout

69
android/res/layout-ldpi/capture.xml
View file

@ -52,10 +52,10 @@
android:gravity="right"> android:gravity="right">
<ImageView android:id="@+id/barcode_image_view" <ImageView android:id="@+id/barcode_image_view"
android:layout_width="160dip" android:layout_width="150dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="160dip" android:maxWidth="150dip"
android:maxHeight="160dip" android:maxHeight="150dip"
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitEnd"/> android:scaleType="fitEnd"/>
@ -126,6 +126,28 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:id="@+id/meta_text_view_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/msg_default_meta"
android:textColor="@color/result_minor_text"
android:textStyle="bold"
android:textSize="14sp"
android:paddingRight="4dip"/>
<TextView android:id="@+id/meta_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/result_minor_text"
android:textSize="14sp"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
<ScrollView <ScrollView
@ -179,38 +201,13 @@
</LinearLayout> </LinearLayout>
<LinearLayout <TextView android:id="@+id/status_view"
android:orientation="vertical" android:layout_width="wrap_content"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="fill_parent" android:layout_gravity="bottom|center_horizontal"
android:background="@color/transparent"> android:background="@color/transparent"
android:text="@string/msg_default_status"
<FrameLayout android:textColor="@color/status_text"
android:layout_width="fill_parent" android:textSize="14sp"/>
android:layout_height="fill_parent"
android:layout_weight="1"
android:background="@color/transparent"/>
<LinearLayout android:id="@+id/status_view"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="@color/status_view"
android:baselineAligned="false"
android:padding="4dip">
<TextView android:id="@+id/status_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:layout_weight="1"
android:text="@string/msg_default_status"
android:textColor="@color/status_text"
android.textSize="14sp"/>
</LinearLayout>
</LinearLayout>
</FrameLayout> </FrameLayout>

4
android/res/layout/encode.xml
View file

@ -21,7 +21,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:fillViewport="true" android:fillViewport="true"
android:background="@color/encode_view"> android:background="@color/encode_view">
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@color/encode_view" android:background="@color/encode_view"
@ -40,7 +40,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center" android:gravity="center"
android:textColor="@color/contents_text" android:textColor="@color/contents_text"
android:textSize="22sp" android:textSize="18sp"
android:paddingBottom="8dip" android:paddingBottom="8dip"
android:paddingLeft="8dip" android:paddingLeft="8dip"
android:paddingRight="8dip"/> android:paddingRight="8dip"/>

2
android/res/layout/share.xml
View file

@ -28,7 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textColor="@color/share_text" android:textColor="@color/share_text"
android:textSize="22sp" android:textSize="18sp"
android:text="@string/msg_share_explanation"/> android:text="@string/msg_share_explanation"/>
<ImageView <ImageView

2
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -119,7 +119,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
PRODUCT_FORMATS.add(BarcodeFormat.EAN_13); PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
PRODUCT_FORMATS.add(BarcodeFormat.EAN_8); PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
PRODUCT_FORMATS.add(BarcodeFormat.RSS14); PRODUCT_FORMATS.add(BarcodeFormat.RSS14);
ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 3); ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 4);
ONE_D_FORMATS.addAll(PRODUCT_FORMATS); ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
ONE_D_FORMATS.add(BarcodeFormat.CODE_39); ONE_D_FORMATS.add(BarcodeFormat.CODE_39);
ONE_D_FORMATS.add(BarcodeFormat.CODE_93); ONE_D_FORMATS.add(BarcodeFormat.CODE_93);