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

- Centered the results UI to look better on tablets.

Browse source 
- Other minor polish.
- Bumped the version to 3.54 beta 1.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1737 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com 2011-04-05 18:41:12 +00:00
parent 4b84ad8a40
commit 0dbfc11aa3
6 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -20,8 +20,8 @@ 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.53" android:versionName="3.54 beta 1"
android:versionCode="67" android:versionCode="68"
android:installLocation="auto"> 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"

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

@ -4,6 +4,12 @@
<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.54:</b></p>
<ul>
<li>Fixed support for the Motorola Xoom tablet.</li>
<li>Added Hebrew translation.</li>
<li>Other minor fixes.</li>
</ul>
<p><b>New in version 3.53:</b></p> <p><b>New in version 3.53:</b></p>
<ul> <ul>
<li>Added support for 16 and 24 digit ITF codes.</li> <li>Added support for 16 and 24 digit ITF codes.</li>

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

@ -190,32 +190,32 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"> android:gravity="center">
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:id="@+id/shopper_button" <Button android:id="@+id/shopper_button"
android:layout_width="0sp" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"

23
android/res/layout/capture.xml
View file

@ -42,14 +42,14 @@
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:gravity="top" android:gravity="center"
android:padding="12dip"> android:padding="12dip">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="right"> android:gravity="right|center_vertical">
<ImageView android:id="@+id/barcode_image_view" <ImageView android:id="@+id/barcode_image_view"
android:layout_width="160dip" android:layout_width="160dip"
@ -151,13 +151,13 @@
</LinearLayout> </LinearLayout>
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/contents_text_view" <TextView android:id="@+id/contents_text_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -185,38 +185,39 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/result_button_view" <LinearLayout android:id="@+id/result_button_view"
android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"> android:gravity="center">
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:layout_width="0sp" <Button android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button android:id="@+id/shopper_button" <Button android:id="@+id/shopper_button"
android:layout_width="wrap_content" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp" android:textSize="14sp"
android:drawableLeft="@drawable/shopper_icon" android:drawableLeft="@drawable/shopper_icon"
android:drawablePadding="4dip" android:drawablePadding="4dip"

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

@ -61,7 +61,7 @@
<string name="menu_history">History</string> <string name="menu_history">History</string>
<string name="menu_settings">Settings</string> <string name="menu_settings">Settings</string>
<string name="menu_share">Share</string> <string name="menu_share">Share</string>
<string name="msg_about">Based on the open source ZXing Barcode Library</string> <string name="msg_about">The official Android app of the open source ZXing barcode project.</string>
<string name="msg_buggy">This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string> <string name="msg_buggy">This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
<string name="msg_bulk_mode_scanned">Bulk mode: barcode scanned and saved</string> <string name="msg_bulk_mode_scanned">Bulk mode: barcode scanned and saved</string>
<string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string> <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>

10
android/res/xml/preferences.xml
View file

@ -28,11 +28,6 @@
android:key="preferences_decode_Data_Matrix" android:key="preferences_decode_Data_Matrix"
android:defaultValue="true" android:defaultValue="true"
android:title="@string/preferences_decode_Data_Matrix_title"/> android:title="@string/preferences_decode_Data_Matrix_title"/>
<CheckBoxPreference
android:key="preferences_reverse_image"
android:defaultValue="false"
android:title="@string/preferences_reverse_image_title"
android:summary="@string/preferences_reverse_image_summary"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_actions_title"> <PreferenceCategory android:title="@string/preferences_actions_title">
<CheckBoxPreference <CheckBoxPreference
@ -75,5 +70,10 @@
android:defaultValue="false" android:defaultValue="false"
android:title="@string/preferences_bulk_mode_title" android:title="@string/preferences_bulk_mode_title"
android:summary="@string/preferences_bulk_mode_summary"/> android:summary="@string/preferences_bulk_mode_summary"/>
<CheckBoxPreference
android:key="preferences_reverse_image"
android:defaultValue="false"
android:title="@string/preferences_reverse_image_title"
android:summary="@string/preferences_reverse_image_summary"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>