mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-14 08:01:38 +01:00
cleanup
This commit is contained in:
parent
e887d0a116
commit
b10453bd25
1 changed files with 2 additions and 41 deletions
|
@ -1617,40 +1617,6 @@ public class BoardActivity extends XWActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private View buildLookupDlg()
|
|
||||||
{
|
|
||||||
initLookup();
|
|
||||||
|
|
||||||
LinearLayout layout =
|
|
||||||
(LinearLayout)Utils.inflate( this, R.layout.wordlist_view );
|
|
||||||
|
|
||||||
final Spinner spinner =
|
|
||||||
(Spinner)layout.findViewById( R.id.site_spinner );
|
|
||||||
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
|
|
||||||
android.R.layout.simple_spinner_item,
|
|
||||||
m_lookupNames );
|
|
||||||
spinner.setAdapter( adapter );
|
|
||||||
|
|
||||||
ListView list = (ListView)layout.findViewById( R.id.words );
|
|
||||||
adapter = new ArrayAdapter<String>( this,
|
|
||||||
//android.R.layout.select_dialog_item,
|
|
||||||
// android.R.layout.simple_list_item_1,
|
|
||||||
android.R.layout.select_dialog_item,
|
|
||||||
m_words ) ;
|
|
||||||
list.setAdapter( adapter );
|
|
||||||
OnItemClickListener oicl = new OnItemClickListener() {
|
|
||||||
public void onItemClick(AdapterView<?> parent,
|
|
||||||
View view,
|
|
||||||
int position, long id ) {
|
|
||||||
int urlPos = spinner.getSelectedItemPosition();
|
|
||||||
lookupWord( m_words[position], m_lookupUrls[urlPos] );
|
|
||||||
}
|
|
||||||
};
|
|
||||||
list.setOnItemClickListener( oicl );
|
|
||||||
|
|
||||||
return layout;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void lookupWord()
|
private void lookupWord()
|
||||||
{
|
{
|
||||||
if ( null == m_words || 0 == m_words.length ) {
|
if ( null == m_words || 0 == m_words.length ) {
|
||||||
|
@ -1677,7 +1643,8 @@ public class BoardActivity extends XWActivity
|
||||||
if ( false ) {
|
if ( false ) {
|
||||||
Utils.logf( "skipping lookupWord(%s)", word );
|
Utils.logf( "skipping lookupWord(%s)", word );
|
||||||
} else {
|
} else {
|
||||||
String dict_url = String.format( fmt, curLangCode(), word );
|
String langCode = m_langCodes[m_gi.dictLang];
|
||||||
|
String dict_url = String.format( fmt, langCode, word );
|
||||||
Uri uri = Uri.parse( dict_url );
|
Uri uri = Uri.parse( dict_url );
|
||||||
Intent intent = new Intent( Intent.ACTION_VIEW, uri );
|
Intent intent = new Intent( Intent.ACTION_VIEW, uri );
|
||||||
intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
|
intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
|
||||||
|
@ -1690,12 +1657,6 @@ public class BoardActivity extends XWActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String curLangCode()
|
|
||||||
{
|
|
||||||
initLookup();
|
|
||||||
return m_langCodes[m_gi.dictLang];
|
|
||||||
}
|
|
||||||
|
|
||||||
private void initLookup()
|
private void initLookup()
|
||||||
{
|
{
|
||||||
if ( null == m_langCodes ) {
|
if ( null == m_langCodes ) {
|
||||||
|
|
Loading…
Reference in a new issue