From 963c449b81d49e086e114f124376517c1d5de768 Mon Sep 17 00:00:00 2001
From: dswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 3 Dec 2009 16:42:43 +0000
Subject: [PATCH] Made the buttons on the Share screen a bit wider and better
 spaced out. I didn't bother with the landscape version although it could use
 the same treatment.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1133 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/res/layout/share.xml   | 82 ++++++++++++++++++----------------
 android/res/values/strings.xml |  4 +-
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/android/res/layout/share.xml b/android/res/layout/share.xml
index 3a4a8eee2..eaf3e30e8 100755
--- a/android/res/layout/share.xml
+++ b/android/res/layout/share.xml
@@ -31,53 +31,57 @@
       android:text="@string/msg_share_explanation"
       android:paddingBottom="32dip"/>
 
-  <LinearLayout
-      android:layout_width="wrap_content"
+  <ImageView
+      android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:background="@color/share_view"
-      android:orientation="vertical"
-      android:layout_gravity="center">
+      android:layout_gravity="center"
+      android:scaleType="center"
+      android:src="@drawable/share_via_barcode"
+      android:paddingBottom="32dip"/>
 
-    <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="center"
-        android:src="@drawable/share_via_barcode"
-        android:paddingBottom="32dip"/>
+  <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="0"
+      android:layout_gravity="center"
+      android:orientation="horizontal"
+      android:gravity="center"
+      android:weightSum="1"
+      android:paddingBottom="8dip">
 
-    <TableLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+    <Button android:id="@+id/contact_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.4"
+            android:text="@string/button_share_contact"/>
 
-      <TableRow>
+    <Button android:id="@+id/bookmark_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.4"
+            android:text="@string/button_share_bookmark"/>
 
-        <Button android:id="@+id/contact_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/button_share_contact"/>
+  </LinearLayout>
 
-        <Button android:id="@+id/bookmark_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/button_share_bookmark"/>
+  <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="0"
+      android:orientation="horizontal"
+      android:gravity="center"
+      android:weightSum="1">
 
-      </TableRow>
+    <Button android:id="@+id/clipboard_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.4"
+            android:text="@string/button_share_clipboard"/>
 
-      <TableRow>
-
-        <Button android:id="@+id/clipboard_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/button_share_clipboard"/>
-
-        <Button android:id="@+id/app_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/button_share_app"/>
-
-      </TableRow>
-
-    </TableLayout>
+    <Button android:id="@+id/app_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.4"
+            android:text="@string/button_share_app"/>
 
   </LinearLayout>
 
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 026db2e9c..534e81862 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_picker_name">Applications</string>  
+  <string name="app_picker_name">Applications</string>
   <string name="app_name">Barcode Scanner</string>
   <string name="bookmark_picker_name">Bookmarks</string>
   <string name="button_add_calendar">Add to calendar</string>
@@ -65,7 +65,7 @@
   <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
   <string name="msg_encode_in_progress">Generating a barcode\u2026</string>
   <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
-  <string name="msg_loading_apps">Loading list of applications</string>
+  <string name="msg_loading_apps">Loading list of applications\u2026</string>
   <string name="msg_not_our_results">You are leaving this application. The search results you will see are not related to this application.</string>
   <string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
   <string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>