Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'from_android_beta_175' into android_branch

Browse source
This commit is contained in:
Eric House 2021-03-31 16:59:31 -07:00
commit 2d3f86a396
7 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/app/build.gradle
View file

@ -1,6 +1,6 @@
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */ /* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
/* /*
* Copyright 2015 - 2020 by Eric House (xwords@eehouse.org). All rights * Copyright 2015 - 2021 by Eric House (xwords@eehouse.org). All rights
* reserved. * reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -19,8 +19,8 @@
*/ */
def INITIAL_CLIENT_VERS = 10 def INITIAL_CLIENT_VERS = 10
def VERSION_CODE_BASE = 171 def VERSION_CODE_BASE = 172
def VERSION_NAME = '4.4.175' def VERSION_NAME = '4.4.176'
def BUILD_INFO_NAME = "build-info.txt" def BUILD_INFO_NAME = "build-info.txt"
// Not all variants use the same BT_UUID. Those with the same talk to // Not all variants use the same BT_UUID. Those with the same talk to

8
xwords4/android/app/src/main/assets/changes.html
View file

@ -13,10 +13,9 @@
</style> </style>
</head> </head>
<body> <body>
<h2>CrossWords 4.4.175 release</h2> <h2>CrossWords 4.4.176 release</h2>
<p>This release adds "Known Players" to make it easier to invite <p>This bug-fix release fixes a crash first-time users only would see</p>
people you've played against before</p>
<div id="survey"> <div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take <p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
@ -24,8 +23,9 @@
CrossWords.</p> CrossWords.</p>
</div> </div>
<h3>New with this release</h3> <h3>New with this release (and the one days before)</h3>
<ul> <ul>
<li>Fix crash dismissing new-game dialog</li>
<li>Add Known Players to make it easier to invite opponents <li>Add Known Players to make it easier to invite opponents
you've played against before</li> you've played against before</li>
<li>Don't offer to archive or delete completed games prematurely</li> <li>Don't offer to archive or delete completed games prematurely</li>

5
xwords4/android/app/src/main/java/org/eehouse/android/xw4/NewWithKnowns.java
View file

@ -104,6 +104,11 @@ public class NewWithKnowns extends LinearLayout
R.id.names, R.id.names,
R.id.expl_known, R.id.expl_known,
}; };
TextView tv = (TextView)findViewById(R.id.choose_expl_default);
int id = standalone ? R.string.choose_expl_default_solo
: R.string.choose_expl_default_net;
tv.setText(LocUtils.getString( context, id ) );
} }
for ( int resID : toHide ) { for ( int resID : toHide ) {

1
xwords4/android/app/src/main/res/layout/new_game_with_knowns.xml
View file

@ -42,7 +42,6 @@
style="@style/new_game_radio" style="@style/new_game_radio"
/> />
<TextView android:id="@+id/choose_expl_default" <TextView android:id="@+id/choose_expl_default"
android:text="@string/choose_expl_default"
style="@style/new_game_expl" style="@style/new_game_expl"
/> />

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

@ -2678,7 +2678,9 @@
<string name="knowns_dup_name_fmt">Unable to change name from <string name="knowns_dup_name_fmt">Unable to change name from
“%1$s” to “%2$s”. Is “%2$s” already in use?</string> “%1$s” to “%2$s”. Is “%2$s” already in use?</string>
<!-- Quick-start new game explanations and buttons --> <!-- Quick-start new game explanations and buttons -->
<string name="choose_expl_default">Start a solo game using the <string name="choose_expl_default_solo">Start a solo game using the
current defaults</string>
<string name="choose_expl_default_net">Start a networked game using the
current defaults</string> current defaults</string>
<string name="choose_expl_new">Start a game by sending an <string name="choose_expl_new">Start a game by sending an
invitation via email, SMS, or even a QR code</string> invitation via email, SMS, or even a QR code</string>

2
xwords4/android/res_src/values-fr/strings.xml
View file

@ -3062,7 +3062,7 @@ pour la langue</string>
<string name="choose_expl_config">OU commencez une partie après l\'avoir configurée, par ex. pour changer la langue ou le nombre de joueurs</string> <string name="choose_expl_config">OU commencez une partie après l\'avoir configurée, par ex. pour changer la langue ou le nombre de joueurs</string>
<string name="choose_expl_known">OU commencez une partie avec quelqu\'un avec qui vous avez déjà joué, pas d\'invitation requise</string> <string name="choose_expl_known">OU commencez une partie avec quelqu\'un avec qui vous avez déjà joué, pas d\'invitation requise</string>
<string name="choose_expl_new">Démarrez une partie en envoyant une invitation par e-mail, SMS ou même un code QR</string> <string name="choose_expl_new">Démarrez une partie en envoyant une invitation par e-mail, SMS ou même un code QR</string>
<string name="choose_expl_default">Démarrer une partie en solo en utilisant les paramètres par défaut actuels</string> <string name="choose_expl_default_solo">Démarrer une partie en solo en utilisant les paramètres par défaut actuels</string>
<string name="knowns_dup_name_fmt">Impossible de renommer « %1$s » en « %2$s ». « %2$s » est-il déjà utilisé \?</string> <string name="knowns_dup_name_fmt">Impossible de renommer « %1$s » en « %2$s ». « %2$s » est-il déjà utilisé \?</string>
<string name="knowns_delete_confirm_fmt">Êtes-vous sûr de vouloir supprimer « %1$s » des Joueurs Connus  \? <string name="knowns_delete_confirm_fmt">Êtes-vous sûr de vouloir supprimer « %1$s » des Joueurs Connus  \?
\n \n

2
xwords4/android/res_src/values-pt-rBR/strings.xml
View file

@ -1102,7 +1102,7 @@
<string name="button_rematch">Revanche</string> <string name="button_rematch">Revanche</string>
<string name="filter_sum_pat_fmt">Exibindo: %1$s, de tamanho %2$d-%3$d (%4$d palavras)</string> <string name="filter_sum_pat_fmt">Exibindo: %1$s, de tamanho %2$d-%3$d (%4$d palavras)</string>
<string name="invite_msg_extra_rematch">Com revanches, todos os convites necessários são enviados automaticamente. Mas você sempre pode enviar novos se um convidado não estiver respondendo.</string> <string name="invite_msg_extra_rematch">Com revanches, todos os convites necessários são enviados automaticamente. Mas você sempre pode enviar novos se um convidado não estiver respondendo.</string>
<string name="choose_expl_default">Iniciar uma partida solo utilizando os padrões atuais</string> <string name="choose_expl_default_solo">Iniciar uma partida solo utilizando os padrões atuais</string>
<string name="knowns_ts_fmt">Partida mais recente: %1$s</string> <string name="knowns_ts_fmt">Partida mais recente: %1$s</string>
<string name="invite_choice_mqtt">Internet/MQTT</string> <string name="invite_choice_mqtt">Internet/MQTT</string>
<string name="dupe_title_fmt">%1$s (dup.)</string> <string name="dupe_title_fmt">%1$s (dup.)</string>