Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add pref to set color of board lines

Browse source
This commit is contained in:
Eric House 2020-07-19 17:31:50 -07:00
parent 729fb5d6b7
commit ad4542b4ac
6 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
View file

@ -49,7 +49,7 @@ public class BoardCanvas extends Canvas implements DrawCtx {
private static final String TAG = BoardCanvas.class.getSimpleName();
private static final int BLACK = 0xFF000000;
private static final int WHITE = 0xFFFFFFFF;
private static final int FRAME_GREY = 0xFF101010;
private static final int LINE_PCT = 3;
private static final int SCORE_HT_DROP = 2;
private static final boolean DEBUG_DRAWFRAMES = false;
private static final int NOT_TURN_ALPHA = 0x3FFFFFFF;
@ -442,7 +442,10 @@ public class BoardCanvas extends Canvas implements DrawCtx {
}
// frame the cell
m_strokePaint.setColor( adjustColor(FRAME_GREY) );
int frameColor = m_otherColors[CommonPrefs.COLOR_CELLLINE];
m_strokePaint.setColor( adjustColor(frameColor) );
int width = Math.max(1, (rect.width() * LINE_PCT) / 100);
m_strokePaint.setStrokeWidth( width );
drawRect( rect, m_strokePaint );
drawCrosshairs( rect, flags );
@ -559,7 +562,8 @@ public class BoardCanvas extends Canvas implements DrawCtx {
// the board (without scrolling), the right-most cells
// don't draw their right borders due to clipping, so draw
// for them.
m_strokePaint.setColor( adjustColor(FRAME_GREY) );
int frameColor = m_otherColors[CommonPrefs.COLOR_CELLLINE];
m_strokePaint.setColor( adjustColor(frameColor) );
int xx = rect.left + rect.width() - 1;
drawLine( xx, rect.top, xx, rect.top + rect.height(),
m_strokePaint );

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
View file

@ -102,6 +102,7 @@ public class PrefsDelegate extends DelegateBase
R.string.key_empty,
R.string.key_background,
R.string.key_clr_bonushint,
R.string.key_cellline,
};
for ( int colorKey : colorKeys ) {
editor.remove( getString(colorKey) );

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java
View file

@ -40,7 +40,8 @@ public class CommonPrefs extends XWPrefs {
public static final int COLOR_FOCUS = 2;
public static final int COLOR_BACKGRND = 3;
public static final int COLOR_BONUSHINT = 4;
public static final int COLOR_LAST = 5;
public static final int COLOR_CELLLINE = 5;
public static final int COLOR_LAST = 6;
private static CommonPrefs s_cp = null;
@ -108,6 +109,7 @@ public class CommonPrefs extends XWPrefs {
R.string.key_clr_crosshairs,
R.string.key_background,
R.string.key_clr_bonushint,
R.string.key_cellline,
};
for ( int ii = 0; ii < idsOther.length; ++ii ) {
otherColors[ii] = prefToColor( context, sp, idsOther[ii] );

1
xwords4/android/app/src/main/res/values/common_rsrc.xml
View file

@ -31,6 +31,7 @@
<string name="key_tile_back">key_clr_tile_back</string>
<string name="key_empty">key_clr_empty</string>
<string name="key_background">key_clr_background</string>
<string name="key_cellline">key_cellline</string>
<string name="key_clr_crosshairs">key_clr_crosshairs</string>
<string name="key_clr_bonushint">key_clr_bonushint</string>

2
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -889,6 +889,8 @@
<!-- the color of text, e.g. "2L", shown on a bonus square on the
board -->
<string name="key_bonushint">In-square bonus hint</string>
<!-- The color of the lines delimiting cells on the board -->
<string name="cellline">Board lines</string>
<!--
############################################################
# :Dialogs:

6
xwords4/android/app/src/main/res/xml/xwprefs.xml
View file

@ -241,6 +241,12 @@
android:title="@string/background"
android:defaultValue="0xFFFFFF"
/>
<org.eehouse.android.xw4.EditColorPreference
android:key="@string/key_cellline"
android:title="@string/cellline"
android:defaultValue="0x101010"
/>
</PreferenceScreen>
</PreferenceScreen>