Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-06 20:45:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

make player edit dialog less ugly

Browse source
This commit is contained in:
Eric House 2020-04-19 07:33:12 -07:00
parent ac376c5dd9
commit f0444c5c1e
2 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
xwords4/android/app/src/main/res/layout/player_edit.xml
View file

@ -22,7 +22,9 @@
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:padding="8dp"
>
<CheckBox android:id="@+id/remote_check" <CheckBox android:id="@+id/remote_check"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -36,20 +38,21 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
>
<TextView android:layout_height="wrap_content" <TextView android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:text="@string/player_label" android:text="@string/player_label"
android:gravity="left" android:gravity="left"
android:layout_marginRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
/> />
<EditText android:id="@+id/player_name_edit" <EditText android:id="@+id/player_name_edit"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:gravity="fill_horizontal" android:gravity="fill_horizontal"
@ -58,13 +61,17 @@
android:inputType="textCapWords" android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium" 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" <TextView android:id="@+id/dict_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:gravity="left" android:gravity="left"
android:layout_marginRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
/> />
@ -73,6 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawSelectorOnTop="true" android:drawSelectorOnTop="true"
/> />
</LinearLayout>
<CheckBox android:id="@+id/robot_check" <CheckBox android:id="@+id/robot_check"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -83,13 +91,11 @@
<LinearLayout android:id="@+id/password_set" <LinearLayout android:id="@+id/password_set"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical"> android:orientation="horizontal"
>
<TextView android:layout_height="wrap_content" <TextView android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:text="@string/password_label" android:text="@string/password_label"
android:gravity="left" android:gravity="left"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@ -98,8 +104,6 @@
<EditText android:id="@+id/password_edit" <EditText android:id="@+id/password_edit"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:gravity="fill_horizontal" android:gravity="fill_horizontal"
android:maxLines="1" android:maxLines="1"

6
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -417,7 +417,7 @@
player will use. The language the game will use (which player will use. The language the game will use (which
constrains the choice of wordlists) is substituted in for constrains the choice of wordlists) is substituted in for
"%1$s". --> "%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 <!-- If the dropdown is selected, this is the title displayed
above the list of selectable items. The language the game above the list of selectable items. The language the game
will use is substituted in for "%1$s". --> will use is substituted in for "%1$s". -->
@ -425,13 +425,13 @@
<!-- checkbox determining if player is robot/automated or human --> <!-- checkbox determining if player is robot/automated or human -->
<string name="robot_label">Robot player</string> <string name="robot_label">Robot player</string>
<!-- text of label identifying the field where human players can <!-- 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 the robot player checkbox is checked because it makes no
sense for a robot to have a password. In fact, passwords sense for a robot to have a password. In fact, passwords
only make sense where there's more than one local human only make sense where there's more than one local human
player on a device, so they are infrequently used in network player on a device, so they are infrequently used in network
games as well. --> games as well. -->
<string name="password_label">Password</string> <string name="password_label">Password:</string>
<!-- <!--
############################################################ ############################################################
# :Screens: # :Screens: