From 13c1c8c94025ae2b98ddd3fb5abb8690bae174ad Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 2 Jan 2021 17:51:40 -0800
Subject: [PATCH] cleanup bits of game config dialog

---
 .../org/eehouse/android/xw4/GameConfigDelegate.java    | 10 +---------
 .../android/app/src/main/res/layout/game_config.xml    |  5 ++++-
 xwords4/android/app/src/main/res/values/strings.xml    |  7 +------
 xwords4/android/res_src/values-ca/strings.xml          |  1 -
 xwords4/android/res_src/values-de/strings.xml          |  1 -
 xwords4/android/res_src/values-es/strings.xml          |  1 -
 xwords4/android/res_src/values-fr/strings.xml          |  3 ---
 xwords4/android/res_src/values-ja/strings.xml          |  1 -
 xwords4/android/res_src/values-nb-rNO/strings.xml      |  1 -
 xwords4/android/res_src/values-nl/strings.xml          |  1 -
 xwords4/android/res_src/values-pl/strings.xml          |  1 -
 xwords4/android/res_src/values-pt-rBR/strings.xml      |  1 -
 xwords4/android/res_src/values-pt/strings.xml          |  5 -----
 xwords4/android/res_src/values-sk/strings.xml          |  5 -----
 14 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
index 058c8a624..4cd8f6dcf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
@@ -1210,15 +1210,7 @@ public class GameConfigDelegate extends DelegateBase
 
     private void adjustPlayersLabel()
     {
-        String label;
-        if ( localOnlyGame() ) {
-            label = getString( R.string.players_label_standalone );
-        } else {
-            int remoteCount = m_gi.remoteCount();
-            label = getString( R.string.players_label_host_fmt,
-                               m_gi.nPlayers - remoteCount,
-                               remoteCount );
-        }
+        String label = getString( R.string.players_label_standalone );
         ((TextView)findViewById( R.id.players_label )).setText( label );
     }
 
diff --git a/xwords4/android/app/src/main/res/layout/game_config.xml b/xwords4/android/app/src/main/res/layout/game_config.xml
index fa4c5f8d4..6a416ca40 100644
--- a/xwords4/android/app/src/main/res/layout/game_config.xml
+++ b/xwords4/android/app/src/main/res/layout/game_config.xml
@@ -49,6 +49,7 @@
     <LinearLayout android:layout_width="fill_parent"
                   android:layout_height="fill_parent"
                   android:orientation="vertical"
+                  android:layout_margin="4dp"
                   >
 
       <TextView style="@style/config_separator"
@@ -60,12 +61,14 @@
                android:layout_height="wrap_content"
                android:drawSelectorOnTop="true"
                android:prompt="@string/title_langs_list"
+               android:layout_marginTop="8dp"
+               android:layout_marginBottom="5dp"
                />
       <Spinner android:id="@+id/dict_spinner"
                android:layout_width="fill_parent"
                android:layout_height="wrap_content"
                android:drawSelectorOnTop="true"
-               android:layout_marginLeft="20sp"
+               android:layout_marginLeft="20dp"
                />
 
       <!-- players -->
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 908a81591..a7e4dde99 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -264,11 +264,6 @@
     <!-- text for separator above the list of players that's used for
          non-networked games -->
     <string name="players_label_standalone">Players (tap to edit)</string>
-    <!-- text for separator above the list of players that's used for
-         networked games.  The numbers of local and non-local players
-         are substituted for %1$d and %2$d. -->
-    <string name="players_label_host_fmt">Players (%1$d local, %2$d
-      off-device)</string>
     <!-- text of button for adding new player to game -->
     <string name="button_add_player">Add player</string>
     <!-- text of button to juggle (randomly rearrange order of) players -->
@@ -770,7 +765,7 @@
     <!-- Label for the first "human player" name preference -->
     <string name="pref_human_name">Human player (your name)</string>
     <!-- sub-preference for dictionaries (soon to be called "word lists") -->
-    <string name="prefs_dicts">Wordlists</string>
+    <string name="prefs_dicts">Language and Wordlists</string>
     <!-- clarification of above -->
     <string name="prefs_dicts_summary">Default wordlists</string>
     <!-- dictionary used by default for human players when creating
diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml
index e3bb34b0b..6bebf054c 100644
--- a/xwords4/android/res_src/values-ca/strings.xml
+++ b/xwords4/android/res_src/values-ca/strings.xml
@@ -85,7 +85,6 @@
     <string name="guest_name">(jugador visitant)</string>
     <string name="player_edit_title">Jugador</string>
     <string name="players_label_standalone">Jugadors</string>
-    <string name="players_label_host_fmt">Jugadors (%1$d locals, %2$d remots)</string>
     <string name="button_add_player">Afegeix un jugador</string>
     <string name="button_juggle_players">Remena els jugadors</string>
     <string name="dicts_item_select">Estableix com a predeterminat</string>
diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml
index 29a4fa17d..b70e63f8f 100644
--- a/xwords4/android/res_src/values-de/strings.xml
+++ b/xwords4/android/res_src/values-de/strings.xml
@@ -95,7 +95,6 @@
     <string name="set_default_message_fmt">"Für welche Spieler soll die Wortliste %1$s  Standardeinstellung für neue Partien sein? (Die Sprache %2$s wird Standardeinstellung für beide.)"</string>
     <string name="game_locked">Sperreinstellungen</string>
     <string name="players_label_standalone">Spieler (zum Bearbeiten antippen)</string>
-    <string name="players_label_host_fmt">Spieler (%1$d lokal, %2$d extern)</string>
     <string name="join_room">Öffentlichen Raum betreten</string>
     <string name="public_names_progress_fmt">Öffentliche Räume für %1$d-Spieler-Partien in %2$s werden geholt.</string>
     <string name="no_name_found_fmt">Keine öffentlichen Räume für %1$d-Spieler-Partien in %2$s gefunden. Versuchen Sie zu aktualisieren oder erzeugen Sie Ihre eigenen.</string>
diff --git a/xwords4/android/res_src/values-es/strings.xml b/xwords4/android/res_src/values-es/strings.xml
index e89004882..f43347f0b 100644
--- a/xwords4/android/res_src/values-es/strings.xml
+++ b/xwords4/android/res_src/values-es/strings.xml
@@ -69,7 +69,6 @@
     <string name="title_langs_list">Idiomas (basado en las listas de palabras instaladas)</string>
     <string name="game_locked">Ajustes de bloqueo</string>
     <string name="players_label_standalone">Jugadores (pulsa para editar)</string>
-    <string name="players_label_host_fmt">Jugadores (%1$d locales, %2$d remotos)</string>
     <string name="button_add_player">Añadir jugador</string>
     <string name="button_juggle_players">Barajar jugadores</string>
     <string name="lang_label">Idioma de la partida</string>
diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml
index 98681b416..21f808932 100644
--- a/xwords4/android/res_src/values-fr/strings.xml
+++ b/xwords4/android/res_src/values-fr/strings.xml
@@ -268,9 +268,6 @@ installées)</string>
     <!-- text for separator above the list of players that's used for
          networked games.  The numbers of local and non-local players
          are substituted for %1$d and %2$d. -->
-    <!--<string name="players_label_host_fmt">Players (%1$d local, %2$d
-      off-device)</string>-->
-    <string name="players_label_host_fmt">Joueurs (%1$d locaux, %2$d hors-appareil)</string>
     <!-- text of button for adding new player to game -->
     <!--<string name="button_add_player">Add player</string>-->
     <string name="button_add_player">Ajouter un joueur</string>
diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml
index 51523031e..4870180f4 100644
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@@ -59,7 +59,6 @@
     <string name="title_langs_list">言語 (インストールされている単語リストに基づく)</string>
     <string name="game_locked">ロック設定</string>
     <string name="players_label_standalone">プレイヤー (タップして編集)</string>
-    <string name="players_label_host_fmt">プレイヤー (%1$d ローカル、%2$d 他のデバイス)</string>
     <string name="button_add_player">プレイヤーを追加</string>
     <string name="button_juggle_players">プレイヤーをシャッフル</string>
     <string name="lang_label">ゲームの言語</string>
diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml
index a558e7126..8a37ae07d 100644
--- a/xwords4/android/res_src/values-nb-rNO/strings.xml
+++ b/xwords4/android/res_src/values-nb-rNO/strings.xml
@@ -445,7 +445,6 @@
 \n
 \n(Tilbakestilling sletter alle trekk og all tilknyttet informasjon.)</item>
     </plurals>
-    <string name="players_label_host_fmt">Spillere (%1$d lokale, %2$d eksterne)</string>
     <string name="phonies_spinner_prompt">Hvordan «ønskeord» skal behandles (altså dem som ikke finnes i ordlisten)</string>
     <string name="phonies_ignore">Ingorer ønskeord</string>
     <string name="phonies_warn">Advar hvis ønskeord</string>
diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml
index 80aa47f17..07b5cda98 100644
--- a/xwords4/android/res_src/values-nl/strings.xml
+++ b/xwords4/android/res_src/values-nl/strings.xml
@@ -65,7 +65,6 @@
     <string name="title_langs_list">Talen (gebaseerd op geïnstalleerde woordenlijsten)</string>
     <string name="game_locked">Instellingen vastzetten</string>
     <string name="players_label_standalone">Spelers (druk om te bewerken)</string>
-    <string name="players_label_host_fmt">Spelers (%1$d lokaal, %2$d op een ander apparaat)</string>
     <string name="button_add_player">Speler toevoegen</string>
     <string name="button_juggle_players">Spelers schudden</string>
     <string name="lang_label">Speltaal</string>
diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml
index c5a83998a..961d8a4ec 100644
--- a/xwords4/android/res_src/values-pl/strings.xml
+++ b/xwords4/android/res_src/values-pl/strings.xml
@@ -237,7 +237,6 @@
     <string name="set_default_message_fmt">Dla jakich graczy lista słów %1$s powinna być domyślna dla nowych gier\? (Język %2$s będzie domyślny dla obu.)</string>
     <string name="button_default_robot">Robot</string>
     <string name="button_default_both">Oba</string>
-    <string name="players_label_host_fmt">Gracze (%1$d lokalny, %2$d wyłączone urządzenie)</string>
     <string name="public_names_progress_fmt">Pobieranie publicznych pokoi dla gier %1$d -graczy w grach %2$s.</string>
     <string name="no_name_found_fmt">Nie znaleziono pokoi publicznych dla gier %1$d-player w %2$s. Spróbuj odświeżyć lub stworzyć własne.</string>
     <string name="robot_smarter">Inteligentniejszy robot</string>
diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index 9f0a41dc4..4e80b4774 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -112,7 +112,6 @@
     <string name="title_gamenet_config_fmt">%1$s configurações (na rede)</string>
     <string name="title_game_config_fmt">Configurações para %1$s</string>
     <string name="loc_downloads">Baixados</string>
-    <string name="players_label_host_fmt">Jogadores (%1$d local, %2$d remoto)</string>
     <string name="players_label_standalone">Jogadores (toque para editar)</string>
     <string name="confirm_deleteonly_dicts_fmt">Apagar %1$s deixará você sem qualquer %2$s listas de palavras. Um ou mais jogos não abrirão (até você baixar uma lista de substituição.)</string>
     <string name="rename_label_caveat">Mude o nome desse jogo (somente nesse dispositivo) para:</string>
diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index 32d490acf..f65daa1da 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -242,11 +242,6 @@
     <!-- text for separator above the list of players that's used for
          non-networked games -->
     <string name="players_label_standalone">Jogadores</string>
-    <!-- text for separator above the list of players that's used for
-         networked games.  The numbers of local and non-local players
-         are substituted for %1$d and %2$d. -->
-    <string name="players_label_host_fmt">Jogadores (%1$d local, %2$d
-      remoto)</string>
     <!-- text of button for adding new player to game -->
     <string name="button_add_player">Adicionar jogador</string>
     <!-- text of button to juggle (randomly rearrange order of) players -->
diff --git a/xwords4/android/res_src/values-sk/strings.xml b/xwords4/android/res_src/values-sk/strings.xml
index 1a66f7538..d49945e8c 100644
--- a/xwords4/android/res_src/values-sk/strings.xml
+++ b/xwords4/android/res_src/values-sk/strings.xml
@@ -422,11 +422,6 @@
     <string name="button_trade_commit">XLATE ME: Commit trade</string>
     <string name="player_edit_title">Hráč</string>
     <string name="players_label_standalone">Hráči</string>
-    <!-- text for separator above the list of players that's used for
-         networked games.  The numbers of local and non-local players
-         are substituted for %1$d and %2$d. -->
-    <string name="players_label_host_fmt">XLATE ME: Players (%1$d local, %2$d
-      off-device)</string>
     <string name="button_add_player">Pridať hráča</string>
     <string name="button_juggle_players">Prehodiť hráča</string>
     <!-- If the query returns no rooms, this message is displayed,