Made a bunch of improvements to QVGA layouts.

git-svn-id: http://zxing.googlecode.com/svn/trunk@1179 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/res/layout-land/share.xml b/android/res/layout-land/share.xml
index f505130..93b4860 100755 (executable)
--- a/android/res/layout-land/share.xml
+++ b/android/res/layout-land/share.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:scaleType="center"
         android:src="@drawable/share_via_barcode"
-        android:paddingRight="48dip"/>
+        android:paddingRight="32dip"/>
 
     <TableLayout
         android:layout_width="fill_parent"
@@ -54,12 +54,14 @@
         <Button android:id="@+id/contact_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/button_share_contact"/>
+                android:text="@string/button_share_contact"
+                android:minWidth="90dip"/>
 
         <Button android:id="@+id/bookmark_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/button_share_bookmark"/>
+                android:text="@string/button_share_bookmark"
+                android:minWidth="90dip"/>
 
       </TableRow>
 
@@ -68,12 +70,14 @@
         <Button android:id="@+id/clipboard_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/button_share_clipboard"/>
+                android:text="@string/button_share_clipboard"
+                android:minWidth="90dip"/>
 
         <Button android:id="@+id/app_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/button_share_app"/>
+                android:text="@string/button_share_app"
+                android:minWidth="90dip"/>
 
       </TableRow>
 

diff --git a/android/res/layout-ldpi/capture.xml b/android/res/layout-ldpi/capture.xml
new file mode 100755 (executable)
index 0000000..affc4ef
--- /dev/null
+++ b/android/res/layout-ldpi/capture.xml
@@ -0,0 +1,158 @@
+<?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.
+ -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent">
+
+  <SurfaceView android:id="@+id/preview_view"
+               android:layout_width="fill_parent"
+               android:layout_height="fill_parent"
+               android:layout_centerInParent="true"/>
+
+  <com.google.zxing.client.android.ViewfinderView
+      android:id="@+id/viewfinder_view"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:background="@color/transparent"/>
+
+  <LinearLayout android:id="@+id/result_view"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:background="@color/result_view"
+                android:visibility="gone"
+                android:padding="4dip">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="top"
+        android:padding="12dip">
+
+      <LinearLayout
+          android:orientation="vertical"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:gravity="left|top">
+
+        <ImageView android:id="@+id/barcode_image_view"
+                   android:layout_width="160dip"
+                   android:layout_height="wrap_content"
+                   android:layout_marginBottom="4dip"
+                   android:adjustViewBounds="true"
+                   android:scaleType="centerInside"/>
+
+        <TextView android:id="@+id/format_text_view"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="left"
+                  android:text="@string/msg_default_format"
+                  android:textColor="@color/result_minor_text"
+                  android:textSize="14sp"/>
+
+        <TextView android:id="@+id/type_text_view"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="left"
+                  android:text="@string/msg_default_type"
+                  android:textColor="@color/result_minor_text"
+                  android:textSize="14sp"/>
+
+      </LinearLayout>
+
+      <ScrollView
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:layout_weight="1">
+
+        <TextView android:id="@+id/contents_text_view"
+                  android:layout_width="fill_parent"
+                  android:layout_height="fill_parent"
+                  android:gravity="left|top"
+                  android:text="@string/msg_default_contents"
+                  android:textColor="@color/result_text"
+                  android:textSize="22sp"
+                  android:paddingLeft="12dip"
+                  android:autoLink="web"/>
+
+      </ScrollView>
+
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/result_button_view"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:gravity="center">
+
+      <Button android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:visibility="gone"/>
+
+      <Button android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:visibility="gone"/>
+
+      <Button android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:visibility="gone"/>
+
+      <Button android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:visibility="gone"/>
+
+    </LinearLayout>
+
+  </LinearLayout>
+
+  <LinearLayout
+      android:orientation="vertical"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:background="@color/transparent">
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        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>

diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index 3e39cde..866a0c4 100755 (executable)
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -64,7 +64,7 @@
                   android:layout_gravity="left"
                   android:text="@string/msg_default_format"
                   android:textColor="@color/result_minor_text"
-                  android:textSize="14sp"/>
+                  android:textSize="12sp"/>
 
         <TextView android:id="@+id/type_text_view"
                   android:layout_width="wrap_content"
@@ -72,7 +72,7 @@
                   android:layout_gravity="left"
                   android:text="@string/msg_default_type"
                   android:textColor="@color/result_minor_text"
-                  android:textSize="14sp"/>
+                  android:textSize="12sp"/>
 
       </LinearLayout>
 

diff --git a/android/res/layout/share.xml b/android/res/layout/share.xml
index eaf3e30..936840e 100755 (executable)
--- a/android/res/layout/share.xml
+++ b/android/res/layout/share.xml
@@ -29,7 +29,7 @@
       android:textColor="@color/share_text"
       android:textSize="18.0sp"
       android:text="@string/msg_share_explanation"
-      android:paddingBottom="32dip"/>
+      android:paddingBottom="24dip"/>
 
   <ImageView
       android:layout_width="fill_parent"
@@ -37,7 +37,7 @@
       android:layout_gravity="center"
       android:scaleType="center"
       android:src="@drawable/share_via_barcode"
-      android:paddingBottom="32dip"/>
+      android:paddingBottom="24dip"/>
 
   <LinearLayout
       android:layout_width="fill_parent"