mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-07 05:24:46 +01:00
add hint explaining new tap-on-pending-words feature
And bring back another BoardCanvas hint that had been commented out.
This commit is contained in:
parent
d3f4a729d7
commit
797eea833a
3 changed files with 39 additions and 16 deletions
|
@ -1,7 +1,7 @@
|
|||
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
|
||||
/*
|
||||
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
||||
* rights reserved.
|
||||
* Copyright 2009 - 2019 by Eric House (xwords@eehouse.org). All rights
|
||||
* reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
|
@ -31,6 +31,8 @@ import android.graphics.RectF;
|
|||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eehouse.android.xw4.jni.BoardDims;
|
||||
import org.eehouse.android.xw4.jni.CommonPrefs;
|
||||
|
@ -88,6 +90,7 @@ public class BoardCanvas extends Canvas implements DrawCtx {
|
|||
protected String[] m_dictChars;
|
||||
private boolean m_hasSmallScreen;
|
||||
private int m_backgroundUsed = 0x00000000;
|
||||
private int mPendingCount;
|
||||
|
||||
// FontDims: exists to translate space available to the largest
|
||||
// font we can draw within that space taking advantage of our use
|
||||
|
@ -382,6 +385,7 @@ public class BoardCanvas extends Canvas implements DrawCtx {
|
|||
bonusStr = m_bonusSummaries[bonus];
|
||||
}
|
||||
} else if ( pending ) {
|
||||
++mPendingCount;
|
||||
if ( darkOnLight() ) {
|
||||
foreColor = WHITE;
|
||||
backColor = BLACK;
|
||||
|
@ -425,7 +429,6 @@ public class BoardCanvas extends Canvas implements DrawCtx {
|
|||
return canDraw;
|
||||
} // drawCell
|
||||
|
||||
private boolean m_arrowHintShown = false;
|
||||
public void drawBoardArrow( Rect rect, int bonus, boolean vert,
|
||||
int hintAtts, int flags )
|
||||
{
|
||||
|
@ -452,19 +455,7 @@ public class BoardCanvas extends Canvas implements DrawCtx {
|
|||
arrow.setBounds( rect );
|
||||
arrow.draw( BoardCanvas.this );
|
||||
|
||||
if ( !m_arrowHintShown ) {
|
||||
m_arrowHintShown = true;
|
||||
// Handler handler = getHandler();
|
||||
// if ( null != handler ) {
|
||||
// handler.post( new Runnable() {
|
||||
// public void run() {
|
||||
// m_parent.
|
||||
// showNotAgainDlgThen( R.string.not_again_arrow,
|
||||
// R.string.
|
||||
// key_notagain_arrow );
|
||||
// } } );
|
||||
// }
|
||||
}
|
||||
postNAHint( R.string.not_again_arrow, R.string.key_notagain_arrow );
|
||||
}
|
||||
|
||||
public boolean trayBegin( Rect rect, int owner, int score )
|
||||
|
@ -543,6 +534,12 @@ public class BoardCanvas extends Canvas implements DrawCtx {
|
|||
int xx = rect.left + rect.width() - 1;
|
||||
drawLine( xx, rect.top, xx, rect.top + rect.height(),
|
||||
m_strokePaint );
|
||||
|
||||
if ( mPendingCount > 0 ) {
|
||||
mPendingCount = 0;
|
||||
postNAHint( R.string.not_again_longtap_lookup,
|
||||
R.string.key_na_longtap_lookup );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -886,4 +883,23 @@ public class BoardCanvas extends Canvas implements DrawCtx {
|
|||
return m_tileStrokePaint;
|
||||
}
|
||||
|
||||
private static Set<Integer> sShown = new HashSet<>();
|
||||
private void postNAHint( final int msgID, final int keyID )
|
||||
{
|
||||
if ( !sShown.contains( keyID ) ) {
|
||||
sShown.add( keyID );
|
||||
|
||||
if ( m_activity instanceof XWActivity ) {
|
||||
final XWActivity activity = (XWActivity)m_activity;
|
||||
|
||||
activity.runOnUiThread( new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
activity.makeNotAgainBuilder( msgID, keyID )
|
||||
.show();
|
||||
}
|
||||
} );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -145,6 +145,7 @@
|
|||
<string name="key_na_comms_relay">key_na_comms_relay</string>
|
||||
<string name="key_na_bt_badproto">key_na_bt_badproto</string>
|
||||
<string name="key_na_sms_banned">key_na_sms_banned</string>
|
||||
<string name="key_na_longtap_lookup">key_na_longtap_lookup</string>
|
||||
|
||||
<!-- Nor is my email address -->
|
||||
<string name="email_author_email">xwords@eehouse.org</string>
|
||||
|
|
|
@ -2862,4 +2862,10 @@
|
|||
<string name="relay_poll_name_no_polling">FCM only: no polling</string>
|
||||
<string name="relay_poll_name_both">Default: mix polling and FCM</string>
|
||||
|
||||
<string name="not_again_longtap_lookup">You can look up words BEFORE
|
||||
they\'re committed as moves -- by long-tapping, same as committed
|
||||
words.\n\nUse this feature to check the validity of words you\'re
|
||||
thinking of playing, or to look up an unfamiliar word provided as a
|
||||
hint.</string>
|
||||
|
||||
</resources>
|
||||
|
|
Loading…
Reference in a new issue