Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

label dicts that are installed and that need updating

Browse source
This commit is contained in:
Eric House 2014-06-11 07:07:14 -07:00
parent 42225e314e
commit b3823bacb1
5 changed files with 60 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/archive/R.java
View file

@ -942,12 +942,14 @@ public final class R {
*/
public static final int dict_browse_title_fmt=0x7f0601fa;
public static final int dict_host=0x7f060079;
public static final int dict_installed=0x7f0602bc;
/** label for dropdown by which wordlist is chosen that this
player will use. The language the game will use (which
constrains the choice of wordlists) is substituted in for
"%1$s".
*/
public static final int dict_lang_label_fmt=0x7f0600e8;
public static final int dict_needs_update=0x7f0602bd;
/** string name="invite_mime">text/plain</string
*/
public static final int dict_url=0x7f060072;

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

@ -2261,4 +2261,6 @@
<string name="delete_dicts">Delete wordlist[s]</string>
<string name="dict_installed">Installed</string>
<string name="dict_needs_update">Needs updating</string>
</resources>

2
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

@ -1935,4 +1935,6 @@
morf revres.</string>
<string name="getinfo">Teg ofni</string>
<string name="delete_dicts">Eteled ]s[tsildrow</string>
<string name="dict_installed">Dellatsni</string>
<string name="dict_needs_update">Sdeen gnitadpu</string>
</resources>

2
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

@ -1935,4 +1935,6 @@
FROM SERVER.</string>
<string name="getinfo">GET INFO</string>
<string name="delete_dicts">DELETE WORDLIST[S]</string>
<string name="dict_installed">INSTALLED</string>
<string name="dict_needs_update">NEEDS UPDATING</string>
</resources>

57
xwords4/android/XWords4/src/org/eehouse/android/xw4/RemoteDictsDelegate.java
View file

@ -51,9 +51,10 @@ public class RemoteDictsDelegate extends ListDelegateBase
private ListView m_listView;
private boolean[] m_expanded;
private String[] m_langNames;
private static enum DictState { AVAILABLE, INSTALLED, NEEDS_UPDATE };
private static class DictInfo implements Comparable {
public String m_name;
public String m_comment;
public DictState m_state;
public DictInfo( String name ) { m_name = name; }
public int compareTo( Object obj ) {
DictInfo other = (DictInfo)obj;
@ -211,7 +212,6 @@ public class RemoteDictsDelegate extends ListDelegateBase
int nLangs = langs.length();
ArrayList<String> langNames = new ArrayList<String>();
m_expanded = new boolean[nLangs];
m_langInfo = new HashMap<String, DictInfo[]>();
for ( int ii = 0; ii < nLangs; ++ii ) {
JSONObject langObj = langs.getJSONObject( ii );
@ -226,7 +226,20 @@ public class RemoteDictsDelegate extends ListDelegateBase
name = DictUtils.removeDictExtn( name );
DictInfo info = new DictInfo( name );
if ( DictLangCache.haveDict( m_activity, langName, name ) ) {
info.m_comment = "installed";
boolean matches = true;
String curSum = DictLangCache.getDictMD5Sum( m_activity, name );
if ( null != curSum ) {
JSONArray sums = dict.getJSONArray("md5sums");
if ( null != sums ) {
matches = false;
for ( int kk = 0; !matches && kk < sums.length(); ++kk ) {
String sum = sums.getString( kk );
matches = sum.equals( curSum );
}
}
}
info.m_state = matches? DictState.INSTALLED
: DictState.NEEDS_UPDATE;
}
dictNames.add( info );
}
@ -240,6 +253,21 @@ public class RemoteDictsDelegate extends ListDelegateBase
}
Collections.sort( langNames );
m_langNames = langNames.toArray( new String[langNames.size()] );
// Now start out with languages expanded that have an
// installed dict.
nLangs = m_langNames.length;
m_expanded = new boolean[nLangs];
for ( int ii = 0; ii < nLangs; ++ii ) {
DictInfo[] dicts = m_langInfo.get( m_langNames[ii] );
for ( DictInfo info : dicts ) {
if ( null != info.m_state ) {
m_expanded[ii] = true;
break;
}
}
}
success = true;
} catch ( JSONException ex ) {
DbgUtils.loge( ex );
@ -297,10 +325,14 @@ public class RemoteDictsDelegate extends ListDelegateBase
private class RDListAdapter extends XWListAdapter {
private Integer m_count = null;
private String m_installed;
private String m_needsUpdate;
public RDListAdapter()
{
super( 0 );
m_installed = getString( R.string.dict_installed );
m_needsUpdate = getString( R.string.dict_needs_update );
}
@Override
@ -326,7 +358,10 @@ public class RemoteDictsDelegate extends ListDelegateBase
@Override
public View getView( final int position, View convertView, ViewGroup parent )
{
// DbgUtils.logf( "RemoteDictsDelegate(position=%d)", position );
if ( null != convertView ) {
DbgUtils.logf( "RemoteDictsDelegate(position=%d, convertView=%H)",
position, convertView );
}
View result = null;
int indx = position;
@ -347,7 +382,19 @@ public class RemoteDictsDelegate extends ListDelegateBase
DictInfo info = dicts[indx-1];
item.setText( info.m_name );
item.setComment( info.m_comment );
if ( null != info.m_state ) {
String comment = null;
switch( info.m_state ) {
case INSTALLED:
comment = m_installed;
break;
case NEEDS_UPDATE:
comment = m_needsUpdate;
break;
}
item.setComment( comment );
}
item.cache( langName );
//item.setOnClickListener( RemoteDictsDelegate.this );