mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
Added support for landscape mode when encoding QR Codes, and made some small layout improvements.
git-svn-id: https://zxing.googlecode.com/svn/trunk@672 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
d9dce6b108
commit
034b6ef1f2
|
@ -45,8 +45,7 @@ versionName is 2.31, 2.4, or 3.0. -->
|
||||||
<activity android:name="BarcodesPreferenceActivity"
|
<activity android:name="BarcodesPreferenceActivity"
|
||||||
android:label="@string/preferences_name">
|
android:label="@string/preferences_name">
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name="BarcodesEncodeActivity"
|
<activity android:name="BarcodesEncodeActivity">
|
||||||
android:screenOrientation="portrait">
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="com.google.zxing.client.android.ENCODE"/>
|
<action android:name="com.google.zxing.client.android.ENCODE"/>
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
<category android:name="android.intent.category.DEFAULT"/>
|
||||||
|
|
39
android/res/layout-land/encode.xml
Executable file
39
android/res/layout-land/encode.xml
Executable file
|
@ -0,0 +1,39 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
Copyright (C) 2008 ZXing authors
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/encode_view"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:background="@color/encode_view"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center">
|
||||||
|
|
||||||
|
<ImageView android:id="@+id/image_view"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:scaleType="center"/>
|
||||||
|
|
||||||
|
<TextView android:id="@+id/contents_text_view"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center"
|
||||||
|
android:textColor="@color/contents_text"
|
||||||
|
android:textSize="20.0sp"
|
||||||
|
android:paddingRight="8px"/>
|
||||||
|
</LinearLayout>
|
|
@ -34,5 +34,6 @@
|
||||||
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="20.0sp"/>
|
android:textSize="20.0sp"
|
||||||
|
android:paddingBottom="8px"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -75,6 +75,7 @@ public class BarcodesEncodeActivity extends Activity {
|
||||||
int width = layout.getWidth();
|
int width = layout.getWidth();
|
||||||
int height = layout.getHeight();
|
int height = layout.getHeight();
|
||||||
int smallerDimension = (width < height) ? width : height;
|
int smallerDimension = (width < height) ? width : height;
|
||||||
|
smallerDimension = smallerDimension * 7 / 8;
|
||||||
|
|
||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in a new issue