diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java index 0f26451f4..efc624162 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java @@ -32,9 +32,10 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; +import org.eehouse.android.xw4.jni.BoardDims; +import org.eehouse.android.xw4.jni.CommonPrefs; import org.eehouse.android.xw4.jni.DrawCtx; import org.eehouse.android.xw4.jni.DrawScoreInfo; -import org.eehouse.android.xw4.jni.CommonPrefs; import org.eehouse.android.xw4.jni.JNIThread; import org.eehouse.android.xw4.jni.XwJNI; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardDims.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardDims.java new file mode 100644 index 000000000..da2ab5dd6 --- /dev/null +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardDims.java @@ -0,0 +1,48 @@ +/* -*- compile-command: "cd ../../../../../../; ant debug install"; -*- */ +/* + * Copyright 2009-2013 by Eric House (xwords@eehouse.org). All rights + * reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package org.eehouse.android.xw4.jni; + + +// Why does this have to be its own class... +public class BoardDims { + public int left, top; + public int width, height; // of the bitmap + public int scoreWidth, scoreHt; + public int boardWidth, boardHt; + public int trayTop, trayHt; + public int cellSize, maxCellSize; + public int timerWidth; + + // public String toString() + // { + // return "width: " + width + // + " height: " + height + // + " left: " + left + // + " top: " + top + // + " scoreHt: " + scoreHt + // + " scoreWidth: " + scoreWidth + // + " boardHt: " + boardHt + // + " trayTop: " + trayTop + // + " trayHt: " + trayHt + // + " cellSize: " + cellSize + // + " maxCellSize: " + maxCellSize; + // } +} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java index cde724d42..2e2cc560b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java @@ -32,7 +32,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.concurrent.LinkedBlockingQueue; -import org.eehouse.android.xw4.BoardDims; import org.eehouse.android.xw4.ConnStatusHandler; import org.eehouse.android.xw4.DBUtils; import org.eehouse.android.xw4.DbgUtils; @@ -352,7 +351,7 @@ public class JNIThread extends Thread { break; case CMD_SETDRAW: - XwJNI.board_setDraw( m_jniGamePtr, (DrawCtx)args[0] ); + XwJNI.board_setDraw( m_jniGamePtr, (DrawCtx)args[0] ); // here XwJNI.board_invalAll( m_jniGamePtr ); break; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/SyncedDraw.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/SyncedDraw.java index 12c946bb2..c473c963f 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/SyncedDraw.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/SyncedDraw.java @@ -21,7 +21,7 @@ package org.eehouse.android.xw4.jni; import android.graphics.Rect; -import org.eehouse.android.xw4.BoardDims; +import org.eehouse.android.xw4.jni.BoardDims; public interface SyncedDraw { void doJNIDraw(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java index e4e4082e0..fc81da1ac 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java @@ -21,7 +21,7 @@ package org.eehouse.android.xw4.jni; import android.graphics.Rect; -import org.eehouse.android.xw4.BoardDims; +import org.eehouse.android.xw4.jni.BoardDims; // Collection of native methods public class XwJNI {