Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't go straight from tap on dict word to browser: add bool so that

Browse source 
even if there's only one lookup URL it'll be listed and user can
quickly cancel.
This commit is contained in:
Andy2 2011-11-02 18:48:13 -07:00
parent c222f08252
commit 56fc73e78a
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java
View file

@ -180,7 +180,7 @@ public class DictBrowseActivity extends XWListActivity
{
TextView text = (TextView)view;
String[] words = { text.getText().toString() };
launchLookup( words, m_lang );
launchLookup( words, m_lang, true );
}
private void findButtonClicked()

12
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -58,6 +58,7 @@ public class DlgDelegate {
private static final String POSBUTTON = "posbutton";
private static final String WORDS = "words";
private static final String LANG = "lang";
private static final String FORCELIST = "forcelist";
// Cache a couple of callback implementations that never change:
private DialogInterface.OnClickListener m_cbkOnClickLstnr = null;
@ -78,6 +79,7 @@ public class DlgDelegate {
private String m_dictName = null;
private String[] m_words = null;
private int m_wordsLang = -1;
private boolean m_forceList = false;
public DlgDelegate( Activity activity, DlgClickNotify callback,
Bundle bundle )
@ -93,6 +95,7 @@ public class DlgDelegate {
m_prefsKey = bundle.getInt( PREFSKEY );
m_words = bundle.getStringArray( WORDS );
m_wordsLang = bundle.getInt( LANG );
m_forceList = bundle.getBoolean( FORCELIST );
}
}
@ -105,6 +108,7 @@ public class DlgDelegate {
outState.putInt( PREFSKEY, m_prefsKey );
outState.putStringArray( WORDS, m_words );
outState.putInt( LANG, m_wordsLang );
outState.putBoolean( FORCELIST, m_forceList );
}
public Dialog onCreateDialog( int id )
@ -130,12 +134,13 @@ public class DlgDelegate {
dialog = createDictGoneDialog();
break;
case DLG_LOOKUP:
LookupView view = (LookupView)Utils.inflate( m_activity, R.layout.lookup );
LookupView view = (LookupView)Utils.inflate( m_activity,
R.layout.lookup );
dialog = new AlertDialog.Builder( m_activity )
.setView( view )
.create();
view.setDialog( dialog, DLG_LOOKUP );
view.setWords( m_words, m_wordsLang );
view.setWords( m_words, m_wordsLang, m_forceList );
break;
}
return dialog;
@ -242,10 +247,11 @@ public class DlgDelegate {
}
}
public void launchLookup( String[] words, int lang )
public void launchLookup( String[] words, int lang, boolean forceList )
{
m_words = words;
m_wordsLang = lang;
m_forceList = forceList;
m_activity.showDialog( DLG_LOOKUP );
}

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/LookupView.java
View file

@ -62,6 +62,7 @@ public class LookupView extends LinearLayout
private static int s_lang = -1;
private String[] m_words;
private boolean m_forceList;
private static int m_lang;
private int m_wordIndex = 0;
private int m_urlIndex = 0;
@ -79,9 +80,10 @@ public class LookupView extends LinearLayout
m_context = cx;
}
public void setWords( String[] words, int lang )
public void setWords( String[] words, int lang, boolean forceList )
{
m_words = words;
m_forceList = forceList;
setLang( lang );
m_state = STATE_DONE;
@ -140,7 +142,8 @@ public class LookupView extends LinearLayout
if ( STATE_WORDS == m_state && 1 >= m_words.length ) {
m_state += incr;
}
if ( STATE_URLS == m_state && 1 >= s_lookupUrls.length ) {
if ( STATE_URLS == m_state &&
( 1 >= s_lookupUrls.length && !m_forceList ) ) {
m_state += incr;
}
if ( m_state == curState ) {

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
View file

@ -153,7 +153,7 @@ public class XWActivity extends Activity
protected void launchLookup( String[] words, int lang )
{
m_delegate.launchLookup( words, lang );
m_delegate.launchLookup( words, lang, false );
}
// DlgDelegate.DlgClickNotify interface

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
View file

@ -155,7 +155,12 @@ public class XWListActivity extends ListActivity
protected void launchLookup( String[] words, int lang )
{
m_delegate.launchLookup( words, lang );
m_delegate.launchLookup( words, lang, false );
}
protected void launchLookup( String[] words, int lang, boolean forceList )
{
m_delegate.launchLookup( words, lang, forceList );
}
}