From 8a3e106ebb3b113bd8541ab38fc997c425f2752f Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 12 May 2022 17:47:00 -0700 Subject: [PATCH] show toast about trading tiles mode on board open I was confused, so others will be too :-) --- .../org/eehouse/android/xw4/BoardDelegate.java | 17 ++++++++++++++++- .../android/app/src/main/res/values/strings.xml | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java index f602c753f..eb614bbb0 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java @@ -1054,7 +1054,7 @@ public class BoardDelegate extends DelegateBase startChatActivity(); break; case START_TRADE_ACTION: - showToast( R.string.entering_trade ); + showTradeToastOnce( true ); cmd = JNICmd.CMD_TRADE; break; case LOOKUP_ACTION: @@ -2171,6 +2171,20 @@ public class BoardDelegate extends DelegateBase } } + private boolean mTradeToastShown = false; + private void showTradeToastOnce( boolean inTrade ) + { + if ( inTrade ) { + if ( !mTradeToastShown ) { + mTradeToastShown = true; + Utils.showToast( m_activity, R.string.entering_trade ); + } + } else { + mTradeToastShown = false; + } + } + + private static int mCounter = 0; private Handler makeJNIHandler() { Handler handler = new Handler() { @@ -2193,6 +2207,7 @@ public class BoardDelegate extends DelegateBase m_mySIS.inTrade = m_gsi.inTrade; } m_view.setInTrade( m_mySIS.inTrade ); + showTradeToastOnce( m_mySIS.inTrade ); adjustTradeVisibility(); invalidateOptionsMenuIf(); } diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index c44375aa6..b047d68ce 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -430,7 +430,7 @@ i.e. after user has picked board_menu_trade menu item --> Commit trade Cancel trade - Tap tiles to select… + Trading tiles. Tap tiles to select… 2L