From f78ff6786a8773f87a7f904237e7ca8d440ad4b6 Mon Sep 17 00:00:00 2001
From: eehouse <eehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Fri, 23 Apr 2010 08:54:04 +0000
Subject: [PATCH] replace menuitem to juggle players with button; place it and
 add player button below player list; remove heading above phonies, adding
 "phonies" to each spinner text; add "game settings" heading.  Still need to
 find a way to make the headings pop visually.

---
 .../XWords4/res/layout/game_config.xml        | 43 +++++++++++--------
 .../XWords4/res/menu/game_config_menu.xml     |  3 --
 .../android/XWords4/res/values/strings.xml    |  9 ++--
 .../org/eehouse/android/xw4/GameConfig.java   | 10 +++--
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/game_config.xml b/xwords4/android/XWords4/res/layout/game_config.xml
index 680a7da67..ba58585e3 100644
--- a/xwords4/android/XWords4/res/layout/game_config.xml
+++ b/xwords4/android/XWords4/res/layout/game_config.xml
@@ -61,10 +61,6 @@
               android:text="@string/configure_role" 
               />
 
-    <LinearLayout android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
-
       <TextView android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="20dip"
@@ -73,14 +69,6 @@
                 android:gravity="left"
                 />
 
-      <Button android:id="@+id/add_player"
-              android:layout_width="wrap_content" 
-              android:layout_height="wrap_content"
-              android:layout_gravity="right"
-              android:text="@string/button_add_player" 
-              />
-    </LinearLayout>
-
     <!-- players -->
     <LinearLayout android:id="@+id/player_list"
                   android:layout_width="fill_parent"
@@ -88,6 +76,23 @@
                   android:orientation="vertical">
     </LinearLayout>
 
+    <LinearLayout android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:layout_gravity="bottom|center"
+                  >
+      <Button android:id="@+id/add_player"
+              android:layout_width="wrap_content" 
+              android:layout_height="wrap_content"
+              android:text="@string/button_add_player" 
+              />
+      <Button android:id="@+id/juggle_players"
+              android:layout_width="wrap_content" 
+              android:layout_height="wrap_content"
+              android:text="@string/button_juggle_players" 
+              />
+    </LinearLayout>
+
     <TextView android:layout_height="wrap_content"
               android:layout_width="fill_parent"
               android:layout_marginLeft="20dip"
@@ -101,6 +106,13 @@
              android:drawSelectorOnTop="true"
              />
 
+    <TextView android:layout_height="wrap_content"
+              android:layout_width="fill_parent"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:text="@string/settings_label"
+              />
+
     <CheckBox android:id="@+id/hints_allowed"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
@@ -149,13 +161,6 @@
               android:text="@string/smart_robot"
               />
 
-    <TextView android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:layout_marginLeft="20dip"
-              android:layout_marginRight="20dip"
-              android:text="@string/phonies_label"
-              />
-
     <Spinner android:id="@+id/phonies_spinner"
              android:layout_width="fill_parent"
              android:layout_height="wrap_content"
diff --git a/xwords4/android/XWords4/res/menu/game_config_menu.xml b/xwords4/android/XWords4/res/menu/game_config_menu.xml
index 94022c53c..07bc22d66 100644
--- a/xwords4/android/XWords4/res/menu/game_config_menu.xml
+++ b/xwords4/android/XWords4/res/menu/game_config_menu.xml
@@ -4,7 +4,4 @@
     <item android:id="@+id/game_config_revert"
           android:title="@string/game_config_revert"
           />
-    <item android:id="@+id/game_config_juggle"
-          android:title="@string/game_config_juggle"
-          />
 </menu>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 83690c19e..5b9b41c96 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -147,6 +147,7 @@
 
     <string name="players_label">Players</string>
     <string name="button_add_player">Add player</string>
+    <string name="button_juggle_players">Juggle players</string>
 
     <string name="game_config_juggle">Juggle players</string>
 
@@ -160,7 +161,7 @@
     <string name="connect_via_label">Connect via</string>
 
     <string name="configure_role">Configure connection</string>
-    <string name="phonies_label">Phonies</string>
+    <string name="settings_label">Game settings</string>
     <string name="minutes_label">Minutes in game</string>
 
     <string name="smart_robot">Smart robot</string>
@@ -197,9 +198,9 @@
     <string name="role_host">Host</string>
     <string name="role_guest">Guest</string>
 
-    <string name="phonies_ignore">Ignore</string>
-    <string name="phonies_warn">Warn</string>
-    <string name="phonies_disallow">Disallow</string>
+    <string name="phonies_ignore">Ignore phonies</string>
+    <string name="phonies_warn">Warn if phonies</string>
+    <string name="phonies_disallow">Disallow phonies</string>
     <string name="gamel_menu_prefs">Preferences</string>
     <string name="gamel_menu_dicts">Dictionaries</string>
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
index 8b0732232..d01c0f897 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
@@ -65,6 +65,7 @@ public class GameConfig extends Activity implements View.OnClickListener {
     private static final int CONFIRM_CHANGE = 6;
 
     private Button m_addPlayerButton;
+    private Button m_jugglePlayersButton;
     private Button m_configureButton;
     private String m_path;
     private CurGameInfo m_gi;
@@ -361,6 +362,8 @@ public class GameConfig extends Activity implements View.OnClickListener {
 
         m_addPlayerButton = (Button)findViewById(R.id.add_player);
         m_addPlayerButton.setOnClickListener( this );
+        m_jugglePlayersButton = (Button)findViewById(R.id.juggle_players);
+        m_jugglePlayersButton.setOnClickListener( this );
         m_configureButton = (Button)findViewById(R.id.configure_role);
         m_configureButton.setOnClickListener( this );
 
@@ -486,10 +489,6 @@ public class GameConfig extends Activity implements View.OnClickListener {
         boolean handled = true;
 
         switch( item.getItemId() ) {
-        case R.id.game_config_juggle:
-            m_gi.juggle();
-            loadPlayers();
-            break;
         case R.id.game_config_revert:
             Utils.notImpl( this );
             break;
@@ -507,6 +506,9 @@ public class GameConfig extends Activity implements View.OnClickListener {
                 m_gi.addPlayer(); // ups nPlayers
                 loadPlayers();
             }
+        } else if ( m_jugglePlayersButton == view ) {
+            m_gi.juggle();
+            loadPlayers();
         } else if ( m_configureButton == view ) {
             int position = m_connectSpinner.getSelectedItemPosition();
             switch ( m_types[ position ] ) {