Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

more cleanup; log info toward reuse of list items (looks unlikely)

Browse source
This commit is contained in:
Eric House 2012-12-18 07:40:48 -08:00
parent d583ec139d
commit 9cbd76aae7
2 changed files with 27 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2156,6 +2156,7 @@
<string name="no_move_onegroup">Moving is impossible until there
is more than one group.</string>
<string name="group_namef">%1$s (%2$d games)</string>
<!-- Button shown in game over dialog triggering creation of new
game with the same players and parameters as the one that

71
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
View file

@ -139,18 +139,15 @@ public class GameListAdapter implements ExpandableListAdapter {
{
long groupid = getGroupIDFor( groupPosition );
DBUtils.setGroupExpanded( m_context, groupid, false );
// m_closedLangs.add( m_langs[groupPosition] );
// saveClosed();
}
public void onGroupExpanded( int groupPosition )
{
long groupid = getGroupIDFor( groupPosition );
DBUtils.setGroupExpanded( m_context, groupid, true );
// m_closedLangs.add( m_langs[groupPosition] );
// saveClosed();
}
public boolean areAllItemsEnabled() { return false; }
public boolean areAllItemsEnabled() { return true; }
public boolean isChildSelectable( int groupPosition, int childPosition )
{ return true; }
@ -159,7 +156,22 @@ public class GameListAdapter implements ExpandableListAdapter {
boolean isLastChild, View convertView,
ViewGroup parent)
{
return getChildView( groupPosition, childPosition );
View result = null;
if ( null != convertView ) {
DbgUtils.logf( "getChildView gave non-null convertView" );
if ( convertView instanceof GameListItem ) {
GameListItem child = (GameListItem)convertView;
long rowid = getRowIDFor( groupPosition, childPosition );
if ( child.getRowID() == rowid ) {
DbgUtils.logf( "reusing child for rowid %d", rowid );
result = child;
}
}
}
if ( null == result ) {
result = getChildView( groupPosition, childPosition );
}
return result;
}
private View getChildView( int groupPosition, int childPosition )
@ -174,17 +186,17 @@ public class GameListAdapter implements ExpandableListAdapter {
public View getGroupView( int groupPosition, boolean isExpanded,
View convertView, ViewGroup parent )
{
if ( null != convertView ) {
DbgUtils.logf( "getGroupView gave non-null convertView" );
}
View row =
Utils.inflate(m_context,
android.R.layout.simple_expandable_list_item_1 );
TextView view = (TextView)row.findViewById( android.R.id.text1 );
String name = groupNames()[groupPosition];
if ( name.equals("") ) {
name = "<Unnamed>";
}
if ( !isExpanded ) {
int nKids = getChildrenCount( groupPosition );
name += String.format( " (%d)", nKids );
name = m_context.getString( R.string.group_namef, name, nKids );
}
view.setText( name );
return view;
@ -204,9 +216,10 @@ public class GameListAdapter implements ExpandableListAdapter {
public Object getChild( int groupPosition, int childPosition )
{
String name = groupNames()[groupPosition];
long[] rows = getRows( name );
return rows[childPosition];
return null;
// String name = groupNames()[groupPosition];
// long[] rows = getRows( name );
// return rows[childPosition];
}
public Object getGroup( int groupPosition )
@ -229,38 +242,6 @@ public class GameListAdapter implements ExpandableListAdapter {
public void registerDataSetObserver( DataSetObserver obs ){}
public void unregisterDataSetObserver( DataSetObserver obs ){}
// private View getItem( final long rowid )
// {
// View layout;
// boolean haveLayout = false;
// synchronized( m_viewsCache ) {
// ViewInfo vi = m_viewsCache.get( rowid );
// haveLayout = null != vi;
// if ( haveLayout ) {
// layout = vi.m_view;
// } else {
// layout = m_factory.inflate( R.layout.game_list_tmp, null );
// vi = new ViewInfo( layout, rowid );
// m_viewsCache.put( rowid, vi );
// }
// }
// }
// @Override
// public int getCount() {
// return DBUtils.gamesList(m_context).length;
// }
// // Views. A view depends on a summary, which takes time to load.
// // When one needs loading it's done via an async task.
// public View getView( int position, View convertView, ViewGroup parent )
// {
// GameListItem result = (GameListItem)
// m_factory.inflate( R.layout.game_list_item, null );
// result.init( m_handler, DBUtils.gamesList(m_context)[position],
// m_fieldID, m_cb );
// return result;
// }
public void inval( long rowid )
{
GameListItem child = getItemFor( rowid );