diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java index fa8a5d67d..b747182f3 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java @@ -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 ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java index 9abb91d43..65919a3a8 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java @@ -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) ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java index c1014ab3a..52b986855 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java @@ -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] ); diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml index 6b89e703d..45fdb86e9 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -31,6 +31,7 @@ key_clr_tile_back key_clr_empty key_clr_background + key_cellline key_clr_crosshairs key_clr_bonushint diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 40a1f58a0..a311ed0c7 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -889,6 +889,8 @@ In-square bonus hint + + Board lines