diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-05-06 22:22:00 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-05-06 22:22:00 -0400 |
commit | 44fa9b5b07062c165192a50fea4301e57d3424ba (patch) | |
tree | d265d0bcda45ef980e88092b83bfc46098c9e19f /src/us/minak/IMEView.java | |
parent | 2b66c7acedf133bb000a34a3881cc3b88f7afa83 (diff) | |
parent | 100d98e3ff6798ce2e2a8f1f97b8b24de1e20168 (diff) |
Merge branch 'master' of github.com:AndrewMurrell/minak
Conflicts:
src/us/minak/IMEGestureOverlayView.java
src/us/minak/IMEService.java
src/us/minak/IMEView.java
Diffstat (limited to 'src/us/minak/IMEView.java')
-rw-r--r-- | src/us/minak/IMEView.java | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/src/us/minak/IMEView.java b/src/us/minak/IMEView.java index 99e36cd..2cf7921 100644 --- a/src/us/minak/IMEView.java +++ b/src/us/minak/IMEView.java @@ -13,10 +13,16 @@ package us.minak; import java.util.LinkedList; +import java.util.List; +import java.util.Locale; import java.util.Queue; import android.content.Context; +import android.graphics.Color; import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; +import android.widget.Button; import android.widget.RelativeLayout; /** @@ -26,6 +32,27 @@ public class IMEView extends RelativeLayout { private StringReciever mOnCharacterEnteredListener; private final Queue<Character> mSymbolsQueue = new LinkedList<Character>(); + private float x; + private float y; + private boolean ongoingGesture = false; + + public boolean setTouchLocation(float x, float y) { + if (!ongoingGesture) { + this.x = x; + this.y = y; + return true; + } + return false; + } + + public void setState(boolean state) { + ongoingGesture = state; + } + + public boolean getState() { + return ongoingGesture; + } + public IMEView(Context context, AttributeSet attrs) { super(context, attrs); } @@ -39,6 +66,11 @@ public class IMEView extends RelativeLayout { enterCharacter(character); } }); + + //dynamic MetaCircle adding stuff here. replace null with Shift or Ctrl or Meta or Alt or Hyper or whatever. + drawingSpaceView.circles.add(new MetaCircle((float)50.0, (float)50.0, (float)20.0, Color.RED, new MetaExpression(null))); + drawingSpaceView.circles.add(new MetaCircle((float)70.0, (float)70.0, (float)20.0, Color.RED, new MetaExpression(null))); + drawingSpaceView.circles.add(new MetaCircle((float)50.0, (float)30.0, (float)20.0, Color.RED, new MetaExpression(null))); } public void setOnCharacterEnteredListener(StringReciever onCharacterEnteredListener) { @@ -49,6 +81,13 @@ public class IMEView extends RelativeLayout { return mSymbolsQueue; } + private final OnTouchListener mOnTouchListener = new OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + return setTouchLocation(event.getX(), event.getY()); + } + }; + /** * Passes the given character to the input service. * |