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

force display order on ConnTypes

Browse source
This commit is contained in:
Eric House 2020-04-05 18:03:24 -07:00 committed by Eric House
parent ec6e815994
commit 341605001d
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
View file

@ -165,6 +165,17 @@ public class ConnStatusHandler {
return s_downOnMe && s_rect.contains( xx, yy ); return s_downOnMe && s_rect.contains( xx, yy );
} }
private static final CommsConnType[] sDisplayOrder = {
CommsConnType.COMMS_CONN_RELAY,
CommsConnType.COMMS_CONN_BT,
CommsConnType.COMMS_CONN_IR,
CommsConnType.COMMS_CONN_IP_DIRECT,
CommsConnType.COMMS_CONN_SMS,
CommsConnType.COMMS_CONN_P2P,
CommsConnType.COMMS_CONN_NFC,
};
public static String getStatusText( Context context, XwJNI.GamePtr gamePtr, public static String getStatusText( Context context, XwJNI.GamePtr gamePtr,
CommsConnTypeSet connTypes, CommsConnTypeSet connTypes,
CommsAddrRec addr ) CommsAddrRec addr )
@ -179,7 +190,10 @@ public class ConnStatusHandler {
sb.append( LocUtils.getString( context, sb.append( LocUtils.getString( context,
R.string.connstat_net_fmt, R.string.connstat_net_fmt,
connTypes.toString( context, true ))); connTypes.toString( context, true )));
for ( CommsConnType typ : connTypes.getTypes() ) { for ( CommsConnType typ : sDisplayOrder ) {
if ( !connTypes.contains(typ) ) {
continue;
}
SuccessRecord record = recordFor( context, typ, false ); SuccessRecord record = recordFor( context, typ, false );
// Don't show e.g. NFC unless it's been used // Don't show e.g. NFC unless it's been used