X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=android%2Fres%2Flayout%2Fcapture.xml;h=fd8ab7e4ee902fa9105bf9bb3ca39ee70d43ee5a;hp=bb83aa51822707a14e72364f47801ac1deaedf90;hb=e0eb285fd67be9e42787dae40d08a114bd0ac3ab;hpb=f64eb0de61af3b4fe2c480e1ed6d3e2e18f82a05

diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index bb83aa51..fd8ab7e4 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2008 Google Inc.
+ 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.
@@ -23,49 +23,169 @@
                android:layout_height="fill_parent"
                android:layout_centerInParent="true"/>
 
-  <com.android.barcodes.ViewfinderView
-                  android:id="@+id/viewfinder_view"
-                  android:layout_width="fill_parent"
-                  android:layout_height="fill_parent"
-                  android:background="@color/transparent"/>
+  <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
+  <LinearLayout android:id="@+id/result_view"
                 android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                android:background="@color/transparent">
+                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="fill_parent"
+          android:gravity="right">
+
+        <ImageView android:id="@+id/barcode_image_view"
+                   android:layout_width="160dip"
+                   android:layout_height="wrap_content"
+                   android:maxWidth="160dip"
+                   android:maxHeight="160dip"
+                   android:layout_marginBottom="4dip"
+                   android:adjustViewBounds="true"
+                   android:scaleType="fitEnd"/>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:id="@+id/format_text_view_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_format"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:textSize="14sp"
+                    android:paddingRight="4dip"/>
+
+          <TextView android:id="@+id/format_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"
+                    android:textSize="14sp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:id="@+id/type_text_view_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_type"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:textSize="14sp"
+                    android:paddingRight="4dip"/>
+
+          <TextView android:id="@+id/type_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"
+                    android:textSize="14sp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:id="@+id/time_text_view_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_time"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:textSize="14sp"
+                    android:paddingRight="4dip"/>
+
+          <TextView android:id="@+id/time_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"
+                    android:textSize="14sp"/>
+
+        </LinearLayout>
+
+      </LinearLayout>
 
-    <FrameLayout
-                 android:layout_width="fill_parent"
-                 android:layout_height="fill_parent"
-                 android:layout_weight="1"
-                 android:background="@color/transparent"/>
+      <ScrollView
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content">
 
-    <LinearLayout android:id="@+id/status_view"
+        <TextView android:id="@+id/contents_text_view"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:textColor="@color/result_text"
+                  android:textColorLink="@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:layout_weight="0"
-                  android:background="@color/status_view"
-                  android:baselineAligned="false"
-                  android:padding="4px">
-
-      <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"/>
-
-      <Button android:id="@+id/status_action_button"
-              android:layout_width="wrap_content"
+                  android:gravity="center">
+
+      <Button android:layout_width="0sp"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
+              android:visibility="gone"/>
+
+      <Button android:layout_width="0sp"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
+              android:visibility="gone"/>
+
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
-              android:layout_gravity="center|fill_horizontal"
+              android:layout_weight="1"
+              android:textSize="14sp"
+              android:visibility="gone"/>
+
+      <Button android:layout_width="0sp"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
     </LinearLayout>
 
   </LinearLayout>
 
+  <TextView android:id="@+id/status_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:background="@color/transparent"
+            android:text="@string/msg_default_status"
+            android:textColor="@color/status_text"
+            android:textSize="14sp"/>
+
 </FrameLayout>