From 3fd0bb056ae8542f33a59940a45f2ddde5029517 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 2 Sep 2011 19:24:42 -0700 Subject: [PATCH] when there's no move made yet to display after score entry held say so. --- xwords4/android/XWords4/res/values/strings.xml | 4 +++- .../XWords4/src/org/eehouse/android/xw4/BoardActivity.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index fb0875181..b76829a9b 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -119,7 +119,7 @@ New tiles: %s Passed %1$s:%2$d - Traded %d + Exchanged %d tiles Lost turn Commit the current move?\n %s (remote) @@ -609,4 +609,6 @@ when creating new games. (You can change it later in the \"New game default\" section of Settings.) + (No moves yet) + diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index 69ad65acb..661a84c5d 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -934,9 +934,11 @@ public class BoardActivity extends XWActivity { String expl = XwJNI.model_getPlayersLastScore( m_jniGamePtr, player ); + if ( expl.length() == 0 ) { + expl = getString( R.string.no_moves_made ); + } String name = m_gi.players[player].name; - final String text = expl.length() > 0 ? - String.format( "%s\n%s", name, expl ) : name; + final String text = String.format( "%s\n%s", name, expl ); post( new Runnable() { public void run() { Toast.makeText( BoardActivity.this, text,