From f0444c5c1ecdf6c9f93fc1ea57f4bcec516cb862 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 19 Apr 2020 07:33:12 -0700
Subject: [PATCH] make player edit dialog less ugly

---
 .../app/src/main/res/layout/player_edit.xml   | 90 ++++++++++---------
 .../app/src/main/res/values/strings.xml       |  6 +-
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/xwords4/android/app/src/main/res/layout/player_edit.xml b/xwords4/android/app/src/main/res/layout/player_edit.xml
index 84679f3a8..cc025af57 100644
--- a/xwords4/android/app/src/main/res/layout/player_edit.xml
+++ b/xwords4/android/app/src/main/res/layout/player_edit.xml
@@ -22,7 +22,9 @@
 
   <LinearLayout android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp"
+                >
 
     <CheckBox android:id="@+id/remote_check"
               android:layout_width="wrap_content"
@@ -36,43 +38,49 @@
                   android:layout_width="fill_parent"
                   android:orientation="vertical">
 
-      <TextView android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip"
-                android:text="@string/player_label"
-                android:gravity="left"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                />
-      
-      <EditText android:id="@+id/player_name_edit"
-                android:layout_height="wrap_content"
-                android:layout_width="fill_parent"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip"
-                android:scrollHorizontally="true"
-                android:selectAllOnFocus="true"
-                android:gravity="fill_horizontal"
-                android:maxLines="1"
-                android:maxLength="32"
-                android:inputType="textCapWords"
-                android:textAppearance="?android:attr/textAppearanceMedium" 
-                />
+      <LinearLayout android:orientation="horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    >
+        <TextView android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:text="@string/player_label"
+                  android:gravity="left"
+                  android:layout_marginRight="5dp"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  />
 
-      <TextView android:id="@+id/dict_label"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip"
-                android:gravity="left"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                />
-      
-      <Spinner android:id="@+id/dict_spinner"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:drawSelectorOnTop="true"
-               />
+        <EditText android:id="@+id/player_name_edit"
+                  android:layout_height="wrap_content"
+                  android:layout_width="fill_parent"
+                  android:scrollHorizontally="true"
+                  android:selectAllOnFocus="true"
+                  android:gravity="fill_horizontal"
+                  android:maxLines="1"
+                  android:maxLength="32"
+                  android:inputType="textCapWords"
+                  android:textAppearance="?android:attr/textAppearanceMedium" 
+                  />
+      </LinearLayout>
+
+      <LinearLayout android:orientation="horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    >
+        <TextView android:id="@+id/dict_label"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:gravity="left"
+                  android:layout_marginRight="5dp"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  />
+        
+        <Spinner android:id="@+id/dict_spinner"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:drawSelectorOnTop="true"
+                 />
+      </LinearLayout>
 
       <CheckBox android:id="@+id/robot_check"
                 android:layout_width="wrap_content"
@@ -83,13 +91,11 @@
       <LinearLayout android:id="@+id/password_set"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
-                    android:orientation="vertical">
-
+                    android:orientation="horizontal"
+                    >
 
         <TextView android:layout_height="wrap_content"
                   android:layout_width="wrap_content"
-                  android:layout_marginLeft="20dip"
-                  android:layout_marginRight="20dip"
                   android:text="@string/password_label"
                   android:gravity="left"
                   android:textAppearance="?android:attr/textAppearanceMedium" 
@@ -98,8 +104,6 @@
         <EditText android:id="@+id/password_edit"
                   android:layout_height="wrap_content"
                   android:layout_width="fill_parent"
-                  android:layout_marginLeft="20dip"
-                  android:layout_marginRight="20dip"
                   android:scrollHorizontally="true"
                   android:gravity="fill_horizontal"
                   android:maxLines="1"
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 314b2867a..f97aa3ac7 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -417,7 +417,7 @@
          player will use.  The language the game will use (which
          constrains the choice of wordlists) is substituted in for
          "%1$s". -->
-    <string name="dict_lang_label_fmt">Wordlist (in %1$s)</string>
+    <string name="dict_lang_label_fmt">Wordlist (%1$s)</string>
     <!-- If the dropdown is selected, this is the title displayed
          above the list of selectable items.  The language the game
          will use is substituted in for "%1$s". -->
@@ -425,13 +425,13 @@
     <!-- checkbox determining if player is robot/automated or human -->
     <string name="robot_label">Robot player</string>
     <!-- text of label identifying the field where human players can
-         enter an option password.  The label and field disappear when
+         enter an optional password.  The label and field disappear when
          the robot player checkbox is checked because it makes no
          sense for a robot to have a password.  In fact, passwords
          only make sense where there's more than one local human
          player on a device, so they are infrequently used in network
          games as well. -->
-    <string name="password_label">Password</string>
+    <string name="password_label">Password:</string>
     <!--
        ############################################################
        # :Screens: