TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cursor arrows issues

Browse Source
This commit is contained in:
serso 2014-09-10 22:54:41 +02:00
parent 4ca3099ef3
commit a1ee20ad81
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-app-core/res/layout/cpp_simple_button_left.xml
View File

@ -24,5 +24,5 @@
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_left"
a:text="◀"
a:text="◁"
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_button_right.xml
View File

@ -24,5 +24,5 @@
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_right"
a:text="▶"
a:text="▷"
style="@style/cpp_simple_metro_control_button_style"/>

BIN
android-app/assets/fonts/Roboto-Regular.ttf
View File

Binary file not shown.

4
android-app/res/layout/cpp_drag_button_left.xml
View File

@ -25,8 +25,8 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_left"
c:textUp="◀◀"
a:text="◀"
c:textUp="◁◁"
a:text="◁"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler"/>

4
android-app/res/layout/cpp_drag_button_right.xml
View File

@ -25,8 +25,8 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_right"
c:textUp="▶▶"
a:text="▶"
c:textUp="▷▷"
a:text="▷"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler"/>

9
android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
View File

@ -23,15 +23,14 @@
package org.solovyev.android.calculator;
import android.view.MotionEvent;
import javax.annotation.Nonnull;
import org.solovyev.android.view.drag.DirectionDragButton;
import org.solovyev.android.view.drag.DragButton;
import org.solovyev.android.view.drag.DragDirection;
import org.solovyev.android.view.drag.SimpleOnDragListener;
import org.solovyev.common.math.Point2d;
import javax.annotation.Nonnull;
/**
* User: serso
* Date: 9/16/11
@ -48,10 +47,10 @@ public class CursorDragProcessor implements SimpleOnDragListener.DragProcessor {
if (dragButton instanceof DirectionDragButton) {
String text = ((DirectionDragButton) dragButton).getText(dragDirection);
if ("◀◀".equals(text)) {
if ("◁◁".equals(text)) {
Locator.getInstance().getEditor().setCursorOnStart();
result = true;
} else if ("▶▶".equals(text)) {
} else if ("▷▷".equals(text)) {
Locator.getInstance().getEditor().setCursorOnEnd();
result = true;
}

4
core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
View File

@ -47,13 +47,13 @@ public enum CalculatorSpecialButton {
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_history_detached, null);
}
},
cursor_right("▶") {
cursor_right("▷") {
@Override
public void onClick(@Nonnull CalculatorKeyboard keyboard) {
keyboard.moveCursorRight();
}
},
cursor_left("◀") {
cursor_left("◁") {
@Override
public void onClick(@Nonnull CalculatorKeyboard keyboard) {
keyboard.moveCursorLeft();