From 522c9cdbba5539c9b305babce134a76b693d0951 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 14 Jun 2010 10:59:24 +0000
Subject: [PATCH] Prettify scan result screen, I think

git-svn-id: http://zxing.googlecode.com/svn/trunk@1423 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/res/drawable/launcher_icon_large.png  | Bin 0 -> 9358 bytes
 android/res/layout-ldpi/capture.xml           | 116 +++++++++++++-----
 android/res/layout/capture.xml                | 116 +++++++++++++-----
 .../zxing/client/android/CaptureActivity.java |  18 +--
 4 files changed, 169 insertions(+), 81 deletions(-)
 create mode 100644 android/res/drawable/launcher_icon_large.png

diff --git a/android/res/drawable/launcher_icon_large.png b/android/res/drawable/launcher_icon_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..9497f22912d75afc7bc2e5685918fe37d902affb
GIT binary patch
literal 9358
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
N-peRUS4tWM{~yyg<h1|*

literal 0
HcmV?d00001

diff --git a/android/res/layout-ldpi/capture.xml b/android/res/layout-ldpi/capture.xml
index 84ee1ef5..56cf1cd1 100755
--- a/android/res/layout-ldpi/capture.xml
+++ b/android/res/layout-ldpi/capture.xml
@@ -48,8 +48,8 @@
       <LinearLayout
           android:orientation="vertical"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:gravity="left|top">
+          android:layout_height="fill_parent"
+          android:gravity="right">
 
         <ImageView android:id="@+id/barcode_image_view"
                    android:layout_width="160dip"
@@ -58,45 +58,85 @@
                    android:maxHeight="160dip"
                    android:layout_marginBottom="4dip"
                    android:adjustViewBounds="true"
-                   android:scaleType="centerInside"/>
+                   android:scaleType="fitEnd"/>
 
-        <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"/>
+        <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/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"/>
+          <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:layout_gravity="left"
-                  android:text="@string/msg_default_time"
-                  android:textColor="@color/result_minor_text"
-                  android:textSize="14sp"/>
+          <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>
 
       <ScrollView
           android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1">
+          android:layout_height="wrap_content">
 
         <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: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"/>
@@ -111,20 +151,28 @@
                   android:layout_height="wrap_content"
                   android:gravity="center">
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
     </LinearLayout>
diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index 84ee1ef5..56cf1cd1 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -48,8 +48,8 @@
       <LinearLayout
           android:orientation="vertical"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:gravity="left|top">
+          android:layout_height="fill_parent"
+          android:gravity="right">
 
         <ImageView android:id="@+id/barcode_image_view"
                    android:layout_width="160dip"
@@ -58,45 +58,85 @@
                    android:maxHeight="160dip"
                    android:layout_marginBottom="4dip"
                    android:adjustViewBounds="true"
-                   android:scaleType="centerInside"/>
+                   android:scaleType="fitEnd"/>
 
-        <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"/>
+        <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/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"/>
+          <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:layout_gravity="left"
-                  android:text="@string/msg_default_time"
-                  android:textColor="@color/result_minor_text"
-                  android:textSize="14sp"/>
+          <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>
 
       <ScrollView
           android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1">
+          android:layout_height="wrap_content">
 
         <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: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"/>
@@ -111,20 +151,28 @@
                   android:layout_height="wrap_content"
                   android:gravity="center">
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
-      <Button android:layout_width="wrap_content"
+      <Button android:layout_width="0sp"
               android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:textSize="14sp"
               android:visibility="gone"/>
 
     </LinearLayout>
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index d30f6021..50f36f3e 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -49,8 +49,6 @@ import android.os.Message;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.text.ClipboardManager;
-import android.text.SpannableStringBuilder;
-import android.text.style.UnderlineSpan;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -499,7 +497,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
 
     ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
     if (barcode == null) {
-      barcodeImageView.setImageResource(R.drawable.zxing_icon);
+      barcodeImageView.setImageResource(R.drawable.launcher_icon_large);
     } else {
       barcodeImageView.setImageBitmap(barcode);
     }
@@ -507,28 +505,22 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
 
     TextView formatTextView = (TextView) findViewById(R.id.format_text_view);
     formatTextView.setVisibility(View.VISIBLE);
-    formatTextView.setText(getString(R.string.msg_default_format) + ": " +
-        rawResult.getBarcodeFormat().toString());
+    formatTextView.setText(rawResult.getBarcodeFormat().toString());
 
     ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
     TextView typeTextView = (TextView) findViewById(R.id.type_text_view);
     typeTextView.setVisibility(View.VISIBLE);
-    typeTextView.setText(getString(R.string.msg_default_type) + ": " +
-        resultHandler.getType().toString());
+    typeTextView.setText(resultHandler.getType().toString());
 
     DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
     String formattedTime = formatter.format(new Date(rawResult.getTimestamp()));
     TextView timeTextView = (TextView) findViewById(R.id.time_text_view);
     timeTextView.setVisibility(View.VISIBLE);
-    timeTextView.setText(getString(R.string.msg_default_time) + ": " + formattedTime);
+    timeTextView.setText(formattedTime);
 
     TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
-    CharSequence title = getString(resultHandler.getDisplayTitle());
-    SpannableStringBuilder styled = new SpannableStringBuilder(title + "\n\n");
-    styled.setSpan(new UnderlineSpan(), 0, title.length(), 0);
     CharSequence displayContents = resultHandler.getDisplayContents();
-    styled.append(displayContents);
-    contentsTextView.setText(styled);
+    contentsTextView.setText(displayContents);
 
     int buttonCount = resultHandler.getButtonCount();
     ViewGroup buttonView = (ViewGroup) findViewById(R.id.result_button_view);
-- 
2.20.1