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

print wordlist count as part of group title

Browse source
This commit is contained in:
Eric House 2014-06-22 09:42:08 -07:00
parent cf0c864553
commit e1f7c13fc7
5 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1417,6 +1417,7 @@ public final class R {
different wordlists.) different wordlists.)
*/ */
public static final int lang_label=0x7f0600c6; public static final int lang_label=0x7f0600c6;
public static final int lang_name_fmt=0x7f0602c0;
public static final int langdict_label=0x7f0600c7; public static final int langdict_label=0x7f0600c7;
public static final int list_group_default=0x7f06026c; public static final int list_group_default=0x7f06026c;
public static final int list_group_delete=0x7f06026a; public static final int list_group_delete=0x7f06026a;

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

@ -2267,5 +2267,5 @@
download.\n\nDetails:\nNumber of words: %2$d\nDownload size: download.\n\nDetails:\nNumber of words: %2$d\nDownload size:
%3$dK\nNote: %4$s</string> %3$dK\nNote: %4$s</string>
<string name="dict_on_server">Downloadable</string> <string name="dict_on_server">Downloadable</string>
<string name="lang_name_fmt">%1$s (%2$d wordlists)</string>
</resources> </resources>

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

@ -1940,4 +1940,5 @@
daolnwod.\n\nSliated:\nRebmun fo sdrow: %2$d\nDaolnwod ezis: daolnwod.\n\nSliated:\nRebmun fo sdrow: %2$d\nDaolnwod ezis:
%3$dK\nEton: %4$s</string> %3$dK\nEton: %4$s</string>
<string name="dict_on_server">Elbadaolnwod</string> <string name="dict_on_server">Elbadaolnwod</string>
<string name="lang_name_fmt">%1$s (%2$d )stsildrow</string>
</resources> </resources>

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

@ -1940,4 +1940,5 @@
DOWNLOAD.\n\nDETAILS:\nNUMBER OF WORDS: %2$d\nDOWNLOAD SIZE: DOWNLOAD.\n\nDETAILS:\nNUMBER OF WORDS: %2$d\nDOWNLOAD SIZE:
%3$dK\nNOTE: %4$s</string> %3$dK\nNOTE: %4$s</string>
<string name="dict_on_server">DOWNLOADABLE</string> <string name="dict_on_server">DOWNLOADABLE</string>
<string name="lang_name_fmt">%1$s (%2$d WORDLISTS)</string>
</resources> </resources>

38
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -121,6 +121,15 @@ public class DictsDelegate extends ListDelegateBase
return m_name.compareTo( other.m_name ); return m_name.compareTo( other.m_name );
} }
} }
private static class LangInfo {
int m_numDicts;
int m_posn;
public LangInfo( int posn, int numDicts )
{
m_posn = posn;
m_numDicts = numDicts;
}
}
private HashMap<String, DictAndLoc[]> m_localInfo; private HashMap<String, DictAndLoc[]> m_localInfo;
private HashMap<String, DictInfo[]> m_remoteInfo; private HashMap<String, DictInfo[]> m_remoteInfo;
@ -149,14 +158,12 @@ public class DictsDelegate extends ListDelegateBase
continue; continue;
} }
alist.add( new Integer(ii) );
if ( m_closedLangs.contains( langName ) ) {
continue;
}
ArrayList<Object> items = makeLangItems( langName ); ArrayList<Object> items = makeLangItems( langName );
alist.addAll( items );
alist.add( new LangInfo( ii, items.size() ) );
if ( ! m_closedLangs.contains( langName ) ) {
alist.addAll( items );
}
} }
m_listInfo = alist.toArray( new Object[alist.size()] ); m_listInfo = alist.toArray( new Object[alist.size()] );
} }
@ -172,14 +179,17 @@ public class DictsDelegate extends ListDelegateBase
View result = null; View result = null;
Object obj = m_listInfo[position]; Object obj = m_listInfo[position];
if ( obj instanceof Integer ) { if ( obj instanceof LangInfo ) {
int groupPos = (Integer)obj; LangInfo info = (LangInfo)obj;
int groupPos = info.m_posn;
String langName = m_langs[groupPos]; String langName = m_langs[groupPos];
int langCode = DictLangCache.getLangLangCode( m_context, int langCode = DictLangCache.getLangLangCode( m_context,
langName ); langName );
boolean expanded = ! m_closedLangs.contains( langName ); boolean expanded = ! m_closedLangs.contains( langName );
result = ListGroup.make( m_context, DictsDelegate.this, groupPos, String name = getString( R.string.lang_name_fmt, langName,
langName, expanded ); info.m_numDicts );
result = ListGroup.make( m_context, DictsDelegate.this,
groupPos, name, expanded );
} else if ( obj instanceof DictAndLoc ) { } else if ( obj instanceof DictAndLoc ) {
DictAndLoc dal = (DictAndLoc)obj; DictAndLoc dal = (DictAndLoc)obj;
XWListItem item = XWListItem item =
@ -230,7 +240,7 @@ public class DictsDelegate extends ListDelegateBase
asList.addAll( Arrays.asList( m_listInfo ) ); asList.addAll( Arrays.asList( m_listInfo ) );
int indx = findLangItem( langName ) + 1; int indx = findLangItem( langName ) + 1;
while ( indx < asList.size() && ! (asList.get(indx) instanceof Integer) ) { while ( indx < asList.size() && ! (asList.get(indx) instanceof LangInfo) ) {
asList.remove( indx ); asList.remove( indx );
} }
@ -289,8 +299,8 @@ public class DictsDelegate extends ListDelegateBase
int nLangs = m_langs.length; int nLangs = m_langs.length;
for ( int ii = 0; ii < m_listInfo.length; ++ii ) { for ( int ii = 0; ii < m_listInfo.length; ++ii ) {
Object obj = m_listInfo[ii]; Object obj = m_listInfo[ii];
if ( obj instanceof Integer ) { if ( obj instanceof LangInfo ) {
if ( m_langs[(Integer)obj].equals( langName ) ) { if ( m_langs[((LangInfo)obj).m_posn].equals( langName ) ) {
result = ii; result = ii;
break; break;
} }