From 9eb424201d7e4c7c049b718fe8fbd937dc28e4af Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand.private.network>
Date: Sun, 18 Jul 2010 19:16:46 -0700
Subject: [PATCH] Add credits to About; use style to remove duplicates; credit
 Sarah.

---
 .../android/XWords4/res/layout/about_dlg.xml  | 32 ++++++-------------
 .../android/XWords4/res/values/strings.xml    |  3 ++
 xwords4/android/XWords4/res/values/styles.xml |  9 ++++++
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/about_dlg.xml b/xwords4/android/XWords4/res/layout/about_dlg.xml
index 664f383e2..623ef8908 100644
--- a/xwords4/android/XWords4/res/layout/about_dlg.xml
+++ b/xwords4/android/XWords4/res/layout/about_dlg.xml
@@ -6,38 +6,24 @@
               >
 
    <TextView android:id="@+id/version_string"
-		     android:layout_marginLeft="5sp"
-	         android:layout_width="fill_parent" 
-	         android:layout_height="wrap_content"
-             android:textColor="#FFFFFFFF"
+             style="@style/about_items"
              />
 
-   <TextView android:layout_marginLeft="5sp"
-   		     android:layout_marginTop="5sp"
-   		     android:layout_marginBottom="5sp"
-	         android:layout_width="fill_parent" 
-	         android:layout_height="wrap_content"
+   <TextView style="@style/about_items"
     	     android:text="@string/about_copyright"
-             android:textColor="#FFFFFFFF"
              />
 
-   <TextView android:layout_marginLeft="5sp"
-   		     android:layout_marginTop="5sp"
-   		     android:layout_marginBottom="5sp"
-	         android:layout_width="fill_parent" 
-	         android:layout_height="wrap_content"
-    	     android:text="@string/about_web"
-             android:textColor="#FFFFFFFF"
+   <TextView style="@style/about_items"
+             android:text="@string/about_web"
     	     android:autoLink="all" 
              />
 
    <TextView android:id="@+id/about_xlator"
-             android:layout_marginLeft="5sp"
-   		     android:layout_marginTop="5sp"
-   		     android:layout_marginBottom="5sp"
-	         android:layout_width="fill_parent" 
-	         android:layout_height="wrap_content"
-             android:textColor="#FFFFFFFF"
+             style="@style/about_items"
+             />
+
+   <TextView style="@style/about_items"
+             android:text="@string/about_credits"
              />
 
 </LinearLayout>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 74e00aae5..a88b942fb 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -340,6 +340,9 @@
     <!-- fill this in other than in English -->
     <string name="xlator"></string>
 
+    <string name="about_credits">Toolbar icons by Sarah Chu; other
+    credits pending permission.</string>
+
     <string name="downloading_dictf">Downloading Crosswords
     dictionary %s...</string>
     <string name="no_dict_title">Dictionary not found</string>
diff --git a/xwords4/android/XWords4/res/values/styles.xml b/xwords4/android/XWords4/res/values/styles.xml
index b41cffb5a..c51814546 100644
--- a/xwords4/android/XWords4/res/values/styles.xml
+++ b/xwords4/android/XWords4/res/values/styles.xml
@@ -43,5 +43,14 @@
       <item name="android:layout_weight">1</item>
     </style>
 
+    <style name="about_items">
+      <item name="android:layout_marginLeft">5sp</item>
+      <item name="android:layout_marginTop">5sp</item>
+      <item name="android:layout_marginBottom">5sp</item>
+      <item name="android:layout_width">fill_parent</item>
+      <item name="android:layout_height">wrap_content</item>
+      <item name="android:textColor">#FFFFFFFF</item>
+    </style>
+
 </resources>