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

multiplication sign fix

Browse Source
This commit is contained in:
serso
2011-12-15 23:17:34 +04:00
parent 602a626420
commit 69a25604a3
11 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/solovyev/android/view/widgets/ColorButton.java
View File

@@ -90,7 +90,7 @@ public class ColorButton extends Button {
feedbackPaint.setStrokeWidth(2);
if (CollectionsUtils.contains(getText().toString(), Arrays.asList("+", "-", "/", "×"))) {
if (CollectionsUtils.contains(getText().toString(), Arrays.asList("+", "-", "/", "×", "*", "∙"))) {
getPaint().setColor(resources.getColor(R.color.button_operator_text_color));
} else if (getText().toString().equals("C")) {
getPaint().setColor(resources.getColor(R.color.button_ce_text_color));

11
src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
View File

@@ -38,9 +38,6 @@ public class DirectionDragButton extends DragButton {
@NotNull
private final static String DEFAULT_DIRECTION_TEXT_SCALE = "0.33;0.33;0.33;0.33";
@Nullable
private String textMiddle;
protected static class DirectionTextData {
@NotNull
@@ -258,9 +255,6 @@ public class DirectionDragButton extends DragButton {
}
}
// backup text
this.textMiddle = String.valueOf(getText());
super.init(context);
initialized = true;
}
@@ -327,11 +321,6 @@ public class DirectionDragButton extends DragButton {
return getText(GuiDragDirection.down);
}
@Nullable
public String getTextMiddle() {
return textMiddle;
}
@Nullable
public String getText(@NotNull DragDirection direction) {
final GuiDragDirection guiDragDirection = GuiDragDirection.valueOf(direction);