From a0ac4d4cf9e31bbe019d29ddb6f514a9e3edcc73 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 6 May 2014 22:26:11 -0400 Subject: Added MetaCircle handling for key modification, but this needs to be fixed. BREAKS THINGS. --- src/us/minak/IMEView.java | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src/us/minak/IMEView.java') diff --git a/src/us/minak/IMEView.java b/src/us/minak/IMEView.java index 7cdf4fd..0f40325 100644 --- a/src/us/minak/IMEView.java +++ b/src/us/minak/IMEView.java @@ -13,8 +13,6 @@ package us.minak; import java.util.LinkedList; -import java.util.List; -import java.util.Locale; import java.util.Queue; import android.content.Context; @@ -184,20 +182,12 @@ public class IMEView extends RelativeLayout { * The character to enter */ private void enterCharacter(String character) { - //for each circle in circles check to see if the touch was in the circle and apply the meta-key - switch (mShiftState) { - case OFF: - mOnCharacterEnteredListener.putString(character); - break; - case ON: - mOnCharacterEnteredListener.putString(character.toUpperCase(Locale.ENGLISH)); - shift(); - break; - case CAPS_LOCK: - mOnCharacterEnteredListener.putString(character.toUpperCase(Locale.ENGLISH)); - break; - default: - throw new IllegalArgumentException(); + for (MetaCircle circle : ((IMEGestureOverlayView) findViewById(R.id.drawing_space)).circles) { + //go through circles and check if they are applicable + if (circle.containsPoint(this.x, this.y) && circle.getMetaExpression().state != MetaExpression.State.ON) { + //TODO: apply the Meta-key here + ; + } } } } -- cgit v1.2.3 From 6d5d5a3eef46d9f6bba30ddd87e8dfad0ba73ca0 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 6 May 2014 22:28:49 -0400 Subject: ON should be OFF --- src/us/minak/IMEView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/us/minak/IMEView.java') diff --git a/src/us/minak/IMEView.java b/src/us/minak/IMEView.java index 1b09af9..318abd0 100644 --- a/src/us/minak/IMEView.java +++ b/src/us/minak/IMEView.java @@ -20,7 +20,6 @@ import android.graphics.Color; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; -import android.widget.Button; import android.widget.RelativeLayout; /** @@ -95,12 +94,11 @@ public class IMEView extends RelativeLayout { private void enterCharacter(String character) { for (MetaCircle circle : ((IMEGestureOverlayView) findViewById(R.id.drawing_space)).circles) { //go through circles and check if they are applicable - if (circle.containsPoint(this.x, this.y) && circle.getMetaExpression().state != MetaExpression.State.ON) { + if (circle.containsPoint(this.x, this.y) && circle.getMetaExpression().state != MetaExpression.State.OFF) { //TODO: apply the Meta-key here ; } } - mOnCharacterEnteredListener.putString(character); } } -- cgit v1.2.3