From 7dfa042b773b2c9ebe5baaf8a7af98d7fd3d323e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 5 Apr 2014 12:12:00 -0700
Subject: [PATCH] rename style and use it to align table header with columns

---
 xwords4/android/XWords4/res/layout/board.xml     |  4 ++--
 xwords4/android/XWords4/res/layout/btinviter.xml |  4 ++--
 .../android/XWords4/res/layout/loc_list_item.xml |  4 ++--
 xwords4/android/XWords4/res/layout/loc_main.xml  | 12 ++++--------
 xwords4/android/XWords4/res/layout/new_game.xml  | 16 ++++++++--------
 .../XWords4/res/layout/prefs_w_buttons.xml       |  4 ++--
 .../android/XWords4/res/layout/smsinviter.xml    |  4 ++--
 xwords4/android/XWords4/res/values/styles.xml    |  2 +-
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/board.xml b/xwords4/android/XWords4/res/layout/board.xml
index e36c2c356..497b97b33 100644
--- a/xwords4/android/XWords4/res/layout/board.xml
+++ b/xwords4/android/XWords4/res/layout/board.xml
@@ -28,11 +28,11 @@
                 >
     <Button android:id="@+id/exchange_commit"
             android:text="@string/button_trade_commit" 
-            style="@style/spaced_buttons"
+            style="@style/evenly_spaced_horizontal"
             />
     <Button android:id="@+id/exchange_cancel"
             android:text="@string/button_trade_cancel" 
-            style="@style/spaced_buttons"
+            style="@style/evenly_spaced_horizontal"
             />
   </LinearLayout>
 
diff --git a/xwords4/android/XWords4/res/layout/btinviter.xml b/xwords4/android/XWords4/res/layout/btinviter.xml
index 7dc82291c..48a8aaca7 100644
--- a/xwords4/android/XWords4/res/layout/btinviter.xml
+++ b/xwords4/android/XWords4/res/layout/btinviter.xml
@@ -26,7 +26,7 @@
                 >
       <Button android:id="@+id/button_rescan"
               android:text="@string/bt_pick_rescan_button"
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
       <!-- <Button android:id="@+id/button_reconfigure" -->
       <!--         android:text="@string/bt_pick_reconfig_button" -->
@@ -36,7 +36,7 @@
       <!--         /> -->
       <Button android:id="@+id/button_clear"
               android:text="@string/bt_pick_clear_button"
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
   </LinearLayout>
 
diff --git a/xwords4/android/XWords4/res/layout/loc_list_item.xml b/xwords4/android/XWords4/res/layout/loc_list_item.xml
index ee62d71e1..e6609fd8f 100644
--- a/xwords4/android/XWords4/res/layout/loc_list_item.xml
+++ b/xwords4/android/XWords4/res/layout/loc_list_item.xml
@@ -9,10 +9,10 @@
     >
 
     <TextView android:id="@+id/english_view"
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
     <EditText android:id="@+id/xlated_view"
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
 
 </org.eehouse.android.xw4.loc.LocListItem>
diff --git a/xwords4/android/XWords4/res/layout/loc_main.xml b/xwords4/android/XWords4/res/layout/loc_main.xml
index 4d30da871..c4870fe15 100644
--- a/xwords4/android/XWords4/res/layout/loc_main.xml
+++ b/xwords4/android/XWords4/res/layout/loc_main.xml
@@ -36,18 +36,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 >
-    <TextView android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceLarge"
+    <TextView style="@style/evenly_spaced_horizontal"
               android:text="@string/loc_main_english"
               />
 
     <org.eehouse.android.xw4.loc.LocTextView
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:textAppearance="?android:attr/textAppearanceLarge"
-         custom:strid="@string/loc_main_yourlang"
-         />
+        style="@style/evenly_spaced_horizontal"
+        custom:strid="@string/loc_main_yourlang"
+        />
 
   </LinearLayout>
 
diff --git a/xwords4/android/XWords4/res/layout/new_game.xml b/xwords4/android/XWords4/res/layout/new_game.xml
index 4d97f9a00..3590af654 100644
--- a/xwords4/android/XWords4/res/layout/new_game.xml
+++ b/xwords4/android/XWords4/res/layout/new_game.xml
@@ -54,11 +54,11 @@
                   >
       <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local"
               custom:strid="@string/newgame_local" 
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
       <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local_config"
               custom:strid="@string/newgame_local_config" 
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
     </LinearLayout>
 
@@ -92,12 +92,12 @@
                   >
       <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_net"
               custom:strid="@string/newgame_invite" 
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
 
       <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_net_config"
               custom:strid="@string/newgame_net_config" 
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
     </LinearLayout>
 
@@ -155,12 +155,12 @@
                     >
         <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_sms"
                 custom:strid="@string/newgame_invite" 
-                style="@style/spaced_buttons"
+                style="@style/evenly_spaced_horizontal"
                 />
 
         <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_sms_config"
                 custom:strid="@string/newgame_net_config" 
-                style="@style/spaced_buttons"
+                style="@style/evenly_spaced_horizontal"
                 />
       </LinearLayout>
     </LinearLayout>
@@ -220,13 +220,13 @@
         <org.eehouse.android.xw4.loc.LocButton 
              android:id="@+id/newgame_invite_bt"
              custom:strid="@string/newgame_invite" 
-             style="@style/spaced_buttons"
+             style="@style/evenly_spaced_horizontal"
              />
 
         <org.eehouse.android.xw4.loc.LocButton 
              android:id="@+id/newgame_bt_config"
              custom:strid="@string/newgame_net_config" 
-             style="@style/spaced_buttons"
+             style="@style/evenly_spaced_horizontal"
              />
       </LinearLayout>
     </LinearLayout>
diff --git a/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml b/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml
index f034f444e..b165db508 100644
--- a/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml
+++ b/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml
@@ -21,11 +21,11 @@
                 >
     <Button android:id="@+id/revert_colors"
             android:text="@string/button_revert_colors"
-            style="@style/spaced_buttons"
+            style="@style/evenly_spaced_horizontal"
             />
     <Button android:id="@+id/revert_all"
             android:text="@string/button_revert_all"
-            style="@style/spaced_buttons"
+            style="@style/evenly_spaced_horizontal"
             />
   </LinearLayout>
 </LinearLayout>
diff --git a/xwords4/android/XWords4/res/layout/smsinviter.xml b/xwords4/android/XWords4/res/layout/smsinviter.xml
index 6b721d6cc..bc8255fb7 100644
--- a/xwords4/android/XWords4/res/layout/smsinviter.xml
+++ b/xwords4/android/XWords4/res/layout/smsinviter.xml
@@ -41,7 +41,7 @@
                 >
       <Button android:id="@+id/button_add"
               android:text="@string/button_sms_add"
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
       <ImageButton android:id="@+id/manual_add_button"
                    android:layout_height="fill_parent"
@@ -51,7 +51,7 @@
                    />
       <Button android:id="@+id/button_clear"
               android:text="@string/bt_pick_clear_button"
-              style="@style/spaced_buttons"
+              style="@style/evenly_spaced_horizontal"
               />
   </LinearLayout>
 
diff --git a/xwords4/android/XWords4/res/values/styles.xml b/xwords4/android/XWords4/res/values/styles.xml
index bbea3719b..038da665d 100644
--- a/xwords4/android/XWords4/res/values/styles.xml
+++ b/xwords4/android/XWords4/res/values/styles.xml
@@ -60,7 +60,7 @@
       <item name="android:layout_marginBottom">3sp</item>
     </style>
 
-    <style name="spaced_buttons">
+    <style name="evenly_spaced_horizontal">
       <item name="android:layout_width">fill_parent</item>
       <item name="android:layout_height">wrap_content</item>
       <item name="android:layout_weight">1</item>