From ac5f77201936142da1e05448c860e7dcf8e3f6d0 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sat, 2 Mar 2019 01:55:33 +0000 Subject: [PATCH] Better display of game index 0 --- .../acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java index 90931d3..0e8f923 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java @@ -78,7 +78,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { nr = now.rationale; } - if (nr == CtFwSGameStateManager.NowRationale.NR_NOT_CONFIG || gameIndex == 0) { + if (nr == CtFwSGameStateManager.NowRationale.NR_NOT_CONFIG) { gameStateLabelText = String.format(rs.getString(R.string.header_gamestate0), rs.getString(R.string.notify_not_config)); } else { @@ -109,8 +109,13 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { sfx = ""; } - gameStateLabelText = String.format(rs.getString(R.string.header_gamestateN), - gameIndex, sfx); + if (gameIndex == 0) { + gameStateLabelText = String.format(rs.getString(R.string.header_gamestate0), + sfx); + } else { + gameStateLabelText = String.format(rs.getString(R.string.header_gamestateN), + gameIndex, sfx); + } } final TextView gstv = mAct.findViewById(R.id.header_gamestate); -- 2.50.1