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

use real strings rather than enum's toString() result in prefs UI

Browse source
This commit is contained in:
Eric House 2014-11-14 07:53:12 -08:00
parent e750811836
commit d848c17d03
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConnAddrPreference.java
View file

@ -58,8 +58,8 @@ public class XWConnAddrPreference extends DialogPreference {
setNegativeButtonText( LocUtils.getString( context, R.string.button_cancel ) );
m_curSet = XWPrefs.getAddrTypes( m_context );
setSummary( m_curSet.toString() );
m_curSet = XWPrefs.getAddrTypes( context );
setSummary( m_curSet.toString( context ) );
}
@Override
@ -70,7 +70,7 @@ public class XWConnAddrPreference extends DialogPreference {
LinearLayout list = (LinearLayout)view.findViewById( R.id.conn_types );
for ( CommsConnType typ : s_supported.getTypes() ) {
CheckBox box = (CheckBox)LocUtils.inflate( m_context, R.layout.btinviter_item );
box.setText( typ.longName() );
box.setText( typ.longName( m_context ) );
box.setChecked( m_curSet.contains( typ ) );
list.addView( box );
@ -84,7 +84,7 @@ public class XWConnAddrPreference extends DialogPreference {
} else {
m_curSet.remove( typf );
}
setSummary( m_curSet.toString() );
setSummary( m_curSet.toString( m_context ) );
}
} );
}

25
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java
View file

@ -20,6 +20,7 @@
package org.eehouse.android.xw4.jni;
import android.content.Context;
import android.text.TextUtils;
import java.net.InetAddress;
import java.util.HashSet;
@ -28,6 +29,8 @@ import java.util.Iterator;
import junit.framework.Assert;
import org.eehouse.android.xw4.Utils;
import org.eehouse.android.xw4.R;
import org.eehouse.android.xw4.loc.LocUtils;
import org.eehouse.android.xw4.DbgUtils;
public class CommsAddrRec {
@ -40,7 +43,20 @@ public class CommsAddrRec {
COMMS_CONN_BT,
COMMS_CONN_SMS;
public String longName() { return toString(); }
public String longName( Context context )
{
int id = 0;
switch( this ) {
case COMMS_CONN_RELAY:
id = R.string.connstat_relay; break;
case COMMS_CONN_BT:
id = R.string.connstat_bt; break;
case COMMS_CONN_SMS:
id = R.string.connstat_sms; break;
}
return ( 0 == id ) ? toString() : LocUtils.getString( context, id );
}
};
public static class CommsConnTypeSet extends HashSet<CommsConnType> {
@ -55,20 +71,19 @@ public class CommsAddrRec {
@Override
public boolean add( CommsConnType typ )
{
DbgUtils.logf( "CommsConnTypeSet.add(%s)", typ.toString() );
// DbgUtils.logf( "CommsConnTypeSet.add(%s)", typ.toString() );
// Assert.assertFalse( CommsConnType._COMMS_CONN_NONE == typ );
boolean result = CommsConnType._COMMS_CONN_NONE == typ ? true
: super.add( typ );
return result;
}
@Override
public String toString()
public String toString( Context context )
{
CommsConnType[] types = getTypes();
String[] strs = new String[types.length];
for ( int ii = 0; ii < types.length; ++ii ) {
strs[ii] = types[ii].longName();
strs[ii] = types[ii].longName( context );
}
return TextUtils.join( " + ", strs );
}