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

prevent min from exceed max by not including values below min as

Browse source 
possible max settings and vice-versa.  Since spinner values no longer
have a consistent base, parse them rather than relying on position --
requires assumptions such as that View is a TextView, but that is
probably not changing.
This commit is contained in:
Andy2 2011-11-21 08:19:25 -08:00
parent aba4e02cac
commit c7906c3bd4
2 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/android/XWords4/res/values/strings.xml
View file

@ -1784,7 +1784,10 @@
<string name="cur_tilesf">Tile picker\n(so far: %s)</string>
<string name="pick_faceup">Pick tiles face-up</string>
<string name="dict_browse_titlef">%1$s (%2$d words)</string>
<string name="dict_browse_titlef">%1$s (%2$d words using %3$d-%4$d
tiles)</string>
<string name="dict_browse_title1f">%1$s (%2$d words using %3$d
tiles)</string>
<string name="dict_browse_nowordsf">No word in %1$s starts with
%2$s.</string>
<string name="not_again_browse">This button opens the wordlist

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

@ -85,9 +85,11 @@ public class DictBrowseActivity extends XWListActivity
XwJNI.dict_iter_setMinMax( m_dictClosure, m_minShown, m_maxShown );
m_nWords = XwJNI.dict_iter_wordCount( m_dictClosure );
setTitle( Utils.format( DictBrowseActivity.this,
R.string.dict_browse_titlef,
m_name, m_nWords ) );
int format = m_minShown == m_maxShown ?
R.string.dict_browse_title1f : R.string.dict_browse_titlef;
setTitle( Utils.format( DictBrowseActivity.this, format,
m_name, m_nWords, m_minShown, m_maxShown ));
}
public Object getItem( int position )
@ -175,18 +177,9 @@ public class DictBrowseActivity extends XWListActivity
}
} );
m_minShown = intent.getIntExtra( DICT_MIN, MIN_LEN );
m_minSpinner = (Spinner)findViewById( R.id.wordlen_min );
m_minSpinner.setAdapter( makeAdapter() );
m_minSpinner.setOnItemSelectedListener( this );
m_minSpinner.setSelection( m_minShown - m_minAvail );
m_maxSpinner = (Spinner)findViewById( R.id.wordlen_max );
m_maxSpinner.setAdapter( makeAdapter() );
m_maxSpinner.setOnItemSelectedListener( this );
m_maxShown = m_maxSpinner.getCount() + MIN_LEN - 1;
m_maxShown = intent.getIntExtra( DICT_MAX, m_maxShown );
m_maxSpinner.setSelection( m_maxShown - MIN_LEN );
m_minShown = intent.getIntExtra( DICT_MIN, m_minAvail );
m_maxShown = intent.getIntExtra( DICT_MAX, m_maxAvail );
setUpSpinners();
setListAdapter( new DictListAdapter() );
getListView().setFastScrollEnabled( true );
@ -232,7 +225,8 @@ public class DictBrowseActivity extends XWListActivity
public void onItemSelected( AdapterView<?> parent, View view,
int position, long id )
{
int newval = position + MIN_LEN;
TextView text = (TextView)view;
int newval = Integer.parseInt( text.getText().toString() );
if ( parent == m_minSpinner ) {
setMinMax( newval, m_maxShown );
} else if ( parent == m_maxSpinner ) {
@ -290,11 +284,16 @@ public class DictBrowseActivity extends XWListActivity
}
}
private ArrayAdapter<String> makeAdapter()
private void makeAdapter( Spinner spinner, int min, int max, int cur )
{
String[] nums = new String[m_maxAvail - m_minAvail + 1];
for ( int ii = m_minAvail; ii <= m_maxAvail; ++ii ) {
nums[ii-m_minAvail] = String.format( "%d", ii );
int sel = -1;
String[] nums = new String[max - min + 1];
for ( int ii = 0; ii < nums.length; ++ii ) {
int val = min + ii;
if ( val == cur ) {
sel = ii;
}
nums[ii] = String.format( "%d", min + ii );
}
ArrayAdapter<String> adapter = new
ArrayAdapter<String>( this,
@ -303,9 +302,26 @@ public class DictBrowseActivity extends XWListActivity
nums );
adapter.setDropDownViewResource( android.R.layout.
simple_spinner_dropdown_item );
return adapter;
spinner.setAdapter( adapter );
spinner.setSelection( sel );
}
private void setUpSpinners()
{
// Min and max-length spinners. To avoid empty lists,
// don't allow min to exceed max. Do that by making the
// current max the largest min allowed, and the current
// min the smallest max allowed.
m_minSpinner = (Spinner)findViewById( R.id.wordlen_min );
makeAdapter( m_minSpinner, m_minAvail, m_maxShown, m_minShown );
m_minSpinner.setOnItemSelectedListener( this );
m_maxSpinner = (Spinner)findViewById( R.id.wordlen_max );
makeAdapter( m_maxSpinner, m_minShown, m_maxAvail, m_maxShown );
m_maxSpinner.setOnItemSelectedListener( this );
}
public static void launch( Context caller, String name )
{
Intent intent = new Intent( caller, DictBrowseActivity.class );