Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

rename file

Browse source 
And change something that was using custom layout for just its checkbox
to just use a checkbox.
This commit is contained in:
Eric House 2016-12-15 07:28:44 -08:00
parent f8bba60798
commit 9f7975d471
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
xwords4/android/XWords4/res/layout/inviter_item.xml → xwords4/android/XWords4/res/layout/inviter_item_frame.xml
View file

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnViaViewLayout.java
View file

@ -80,12 +80,10 @@ public class ConnViaViewLayout extends LinearLayout {
CommsConnTypeSet supported = CommsConnTypeSet.getSupported( context ); CommsConnTypeSet supported = CommsConnTypeSet.getSupported( context );
for ( CommsConnType typ : supported.getTypes() ) { for ( CommsConnType typ : supported.getTypes() ) {
LinearLayout item = (LinearLayout) CheckBox box = new CheckBox( context );
LocUtils.inflate( context, R.layout.inviter_item );
CheckBox box = (CheckBox)item.findViewById( R.id.inviter_check );
box.setText( typ.longName( context ) ); box.setText( typ.longName( context ) );
box.setChecked( m_curSet.contains( typ ) ); box.setChecked( m_curSet.contains( typ ) );
list.addView( item ); list.addView( box );
final CommsConnType typf = typ; final CommsConnType typf = typ;
box.setOnCheckedChangeListener( new OnCheckedChangeListener() { box.setOnCheckedChangeListener( new OnCheckedChangeListener() {

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
View file

@ -272,14 +272,12 @@ abstract class InviteDelegate extends ListDelegateBase
ViewGroup parent ) ViewGroup parent )
{ {
final InviterItem item = m_items[position]; final InviterItem item = m_items[position];
final LinearLayout layout = (LinearLayout)inflate( R.layout.inviter_item ); final LinearLayout layout = (LinearLayout)
inflate( R.layout.inviter_item_frame );
CheckBox box = (CheckBox)layout.findViewById( R.id.inviter_check ); CheckBox box = (CheckBox)layout.findViewById( R.id.inviter_check );
// box.setText( m_devNames[position] );
// box.setTag( addr );
// Give subclass a chance to install and populate its view // Give subclass a chance to install and populate its view
FrameLayout frame = (FrameLayout)layout.findViewById( R.id.frame ); FrameLayout frame = (FrameLayout)layout.findViewById( R.id.frame );
Assert.assertNotNull( frame );
View child = inflate( m_itemId ); View child = inflate( m_itemId );
frame.addView( child ); frame.addView( child );
onChildAdded( child, m_items[position] ); onChildAdded( child, m_items[position] );