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

Export remaining prefs colors; add default relay host to prefs.

Browse source
This commit is contained in:
eehouse 2010-02-14 17:28:46 +00:00
parent 5e066514cb
commit 65fb05b29c
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
View file

@ -9,6 +9,10 @@ import org.eehouse.android.xw4.R;
import junit.framework.Assert;
public class CommonPrefs {
public static final int COLOR_TILE_BACK = 0;
public static final int COLOR_FOCUS = 1;
public static final int COLOR_LAST = 2;
private static Context s_context = null;
private static CommonPrefs s_cp = null;
@ -20,12 +24,14 @@ public class CommonPrefs {
public int[] playerColors;
public int[] bonusColors;
public int[] otherColors;
private CommonPrefs()
{
playerColors = new int[4];
bonusColors = new int[5];
bonusColors[0] = 0xFFFFFFFF; // white
otherColors = new int[COLOR_LAST];
}
private CommonPrefs refresh()
@ -68,7 +74,12 @@ public class CommonPrefs {
bonusColors[ii+1] = prefToColor( sp, ids2[ii] );
}
int idsOther[] = { R.string.key_tile_back,
R.string.key_focus,
};
for ( int ii = 0; ii < idsOther.length; ++ii ) {
otherColors[ii] = prefToColor( sp, idsOther[ii] );
}
return this;
}
@ -100,4 +111,12 @@ public class CommonPrefs {
}
return s_cp.refresh();
}
public static String getDefaultRelayHost()
{
SharedPreferences sp =
PreferenceManager.getDefaultSharedPreferences( s_context );
String key = s_context.getString( R.string.key_relay_host );
return sp.getString( key, "" );
}
}

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

@ -35,7 +35,7 @@ public class CommsAddrRec {
Utils.logf( "CommsAddrRec() called " );
conType = CommsConnType.COMMS_CONN_RELAY;
ip_relay_invite = "Room 1";
ip_relay_hostName = "10.0.2.2";
ip_relay_hostName = CommonPrefs.getDefaultRelayHost();
ip_relay_port = 10999;
}

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/TransportProcs.java
View file

@ -1,3 +1,5 @@
/* -*- compile-command: "cd ../../../../../../; ant install"; -*- */
package org.eehouse.android.xw4.jni;