From 69e49b2c84251f22b2cadb3ca4c2adb7193d5bfc Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Thu, 15 Dec 2011 23:17:34 +0400
Subject: [PATCH] multiplication sign fix

---
 res/values-ru/strings.xml                       |  2 ++
 res/values/arrays.xml                           |  6 ++++++
 res/values/default_values.xml                   |  3 +++
 res/values/strings.xml                          |  2 ++
 res/xml/main_preferences.xml                    |  6 ++++++
 .../android/calculator/CalculatorActivity.java  | 17 ++++++++++++++++-
 .../calculator/model/AbstractNumberBuilder.java |  6 +++++-
 .../calculator/model/CalculatorEngine.java      | 17 +++++++++++++++++
 .../model/FromJsclSimplifyTextProcessor.java    |  2 +-
 .../android/view/widgets/ColorButton.java       |  2 +-
 .../view/widgets/DirectionDragButton.java       | 11 -----------
 11 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8df3ee26..ef290653 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -127,6 +127,8 @@
 	<string name="p_grouping_separator_space">Пробел ( )</string>
 	<string name="c_calc_grouping_separator">Разделитель разрядов</string>
 	<string name="c_calc_grouping_separator_summary">Устанавливает разделитель разрядов числа</string>
+	<string name="c_calc_multiplication_sign">Знак произведения</string>
+	<string name="c_calc_multiplication_sign_summary">Устанавливает знак произведения</string>
 
 	<string name="c_calc_layout">Раскладка</string>
 	<string name="p_layout_cellphone">Телефон</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 83dd1ce1..81a6f6cd 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -27,6 +27,12 @@
 		<item>" "</item>
 	</string-array>
 
+	<string-array name="p_multiplication_sign_values">
+		<item>"*"</item>
+		<item>"×"</item>
+		<item>"∙"</item>
+	</string-array>
+
 	<string-array name="p_layout_names">
 		<item>@string/p_layout_cellphone</item>
 		<item>@string/p_layout_calculator</item>
diff --git a/res/values/default_values.xml b/res/values/default_values.xml
index 00babc34..e6ebd39e 100644
--- a/res/values/default_values.xml
+++ b/res/values/default_values.xml
@@ -44,6 +44,9 @@
 	<string name="p_calc_grouping_separator_key">org.solovyev.android.calculator.CalculatorActivity_calc_grouping_separator</string>
 	<string name="p_calc_grouping_separator">" "</string>
 
+	<string name="p_calc_multiplication_sign_key">org.solovyev.android.calculator.CalculatorActivity_calc_multiplication_sign</string>
+	<string name="p_calc_multiplication_sign">"×"</string>
+
 	<string name="p_calc_haptic_feedback_duration_key">org.solovyev.android.calculator.CalculatorActivity_calc_haptic_feedback_duration_key</string>
 	<string name="p_calc_haptic_feedback_duration">" "</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c07a229..4e35c5be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -128,6 +128,8 @@
 	<string name="p_grouping_separator_space">Space ( )</string>
 	<string name="c_calc_grouping_separator">Grouping separator</string>
 	<string name="c_calc_grouping_separator_summary">Sets grouping separator</string>
+	<string name="c_calc_multiplication_sign">Multiplication sign</string>
+	<string name="c_calc_multiplication_sign_summary">Sets multiplication sign</string>
 
 	<string name="c_calc_layout">Layout</string>
 	<string name="p_layout_cellphone">Cellphone</string>
diff --git a/res/xml/main_preferences.xml b/res/xml/main_preferences.xml
index 0b27ae69..d33e2a38 100644
--- a/res/xml/main_preferences.xml
+++ b/res/xml/main_preferences.xml
@@ -23,6 +23,12 @@
 						a:summary="@string/c_calc_grouping_separator_summary"
 						a:entryValues="@array/p_grouping_separator_values"/>
 
+		<ListPreference a:key="@string/p_calc_multiplication_sign_key"
+						a:title="@string/c_calc_multiplication_sign"
+						a:entries="@array/p_multiplication_sign_values"
+						a:summary="@string/c_calc_multiplication_sign_summary"
+						a:entryValues="@array/p_multiplication_sign_values"/>
+
 		<ListPreference a:key="@string/p_calc_angle_units_key"
 						a:title="@string/c_calc_angle_units"
 						a:entries="@array/p_angle_units_names"
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 450cab28..24aa94a9 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -19,6 +19,7 @@ import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.*;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import jscl.AngleUnit;
@@ -141,6 +142,8 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 
 		CalculatorEngine.instance.reset(this, preferences);
 
+		initMultiplicationButton();
+
 		preferences.registerOnSharedPreferenceChangeListener(this);
 	}
 
@@ -410,7 +413,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 	@SuppressWarnings({"UnusedDeclaration"})
 	public void digitButtonClickHandler(@NotNull View v) {
 		Log.d(String.valueOf(v.getId()), "digitButtonClickHandler() for: " + v.getId() + ". Pressed: " + v.isPressed());
-		calculatorModel.processDigitButtonAction(((DirectionDragButton) v).getTextMiddle());
+		calculatorModel.processDigitButtonAction(((DirectionDragButton) v).getText().toString());
 	}
 
 	@SuppressWarnings({"UnusedDeclaration"})
@@ -561,6 +564,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 		dpclRegister.announce().onDragPreferencesChange(SimpleOnDragListener.getPreferences(preferences, this));
 
 		if (CalculatorEngine.GROUPING_SEPARATOR_P_KEY.equals(key) ||
+				CalculatorEngine.MULTIPLICATION_SIGN_P_KEY.equals(key) ||
 				CalculatorEngine.ROUND_RESULT_P_KEY.equals(key) ||
 					CalculatorEngine.RESULT_PRECISION_P_KEY.equals(key) ||
 						CalculatorEngine.ANGLE_UNITS_P_KEY.equals(key) ||
@@ -568,5 +572,16 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 			CalculatorEngine.instance.reset(this, preferences);
 			this.calculatorModel.evaluate();
 		}
+
+		if ( CalculatorEngine.MULTIPLICATION_SIGN_P_KEY.equals(key) ) {
+			initMultiplicationButton();
+		}
+	}
+
+	private void initMultiplicationButton() {
+		final View multiplicationButton = findViewById(R.id.multiplicationButton);
+		if ( multiplicationButton instanceof Button) {
+			((Button) multiplicationButton).setText(CalculatorEngine.instance.getMultiplicationSign());
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java b/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
index b981a3b9..8bde6d3f 100644
--- a/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
+++ b/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
@@ -40,7 +40,11 @@ public abstract class AbstractNumberBuilder {
 	 * @return true if we can continue of processing of current number, if false - new number should be constructed
 	 */
 	protected boolean canContinue(@NotNull MathType.Result mathTypeResult) {
-		return ((mathTypeResult.getMathType().getGroupType() == MathType.MathGroupType.number && numeralBaseCheck(mathTypeResult) && numeralBaseInTheStart(mathTypeResult.getMathType()) || isSignAfterE(mathTypeResult)));
+		return ((mathTypeResult.getMathType().getGroupType() == MathType.MathGroupType.number && !spaceBefore(mathTypeResult) && numeralBaseCheck(mathTypeResult) && numeralBaseInTheStart(mathTypeResult.getMathType()) || isSignAfterE(mathTypeResult)));
+	}
+
+	private boolean spaceBefore(@NotNull MathType.Result mathTypeResult) {
+		return numberBuilder == null && mathTypeResult.getMatch().trim().isEmpty();
 	}
 
 	private boolean numeralBaseInTheStart(@NotNull MathType mathType) {
diff --git a/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java b/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
index 45e96817..e377f4e7 100644
--- a/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
+++ b/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
@@ -36,6 +36,9 @@ public enum CalculatorEngine {
 
 	public static final String GROUPING_SEPARATOR_P_KEY = "org.solovyev.android.calculator.CalculatorActivity_calc_grouping_separator";
 
+	public static final String MULTIPLICATION_SIGN_P_KEY = "org.solovyev.android.calculator.CalculatorActivity_calc_multiplication_sign";
+	public static final String MULTIPLICATION_SIGN_DEFAULT = "×";
+
 	public static final String ROUND_RESULT_P_KEY = "org.solovyev.android.calculator.CalculatorModel_round_result";
 	public static final boolean ROUND_RESULT_DEFAULT = true;
 
@@ -48,6 +51,7 @@ public enum CalculatorEngine {
 	public static final String ANGLE_UNITS_P_KEY = "org.solovyev.android.calculator.CalculatorActivity_angle_units";
 	public static final String ANGLE_UNITS_DEFAULT = "deg";
 
+
 	public static final int DEFAULT_TIMEOUT = 3000;
 
 	@NotNull
@@ -76,11 +80,23 @@ public enum CalculatorEngine {
 	// calculation thread timeout in milliseconds, after timeout thread would be interrupted
 	private int timeout = DEFAULT_TIMEOUT;
 
+	@NotNull
+	private String multiplicationSign = MULTIPLICATION_SIGN_DEFAULT;
+
 	CalculatorEngine() {
 		this.engine.setRoundResult(true);
 		this.engine.setUseGroupingSeparator(true);
 	}
 
+	@NotNull
+	public String getMultiplicationSign() {
+		return multiplicationSign;
+	}
+
+	public void setMultiplicationSign(@NotNull String multiplicationSign) {
+		this.multiplicationSign = multiplicationSign;
+	}
+
 	public static class Result {
 
 		@NotNull
@@ -256,6 +272,7 @@ public enum CalculatorEngine {
 				this.setRoundResult(preferences.getBoolean(ROUND_RESULT_P_KEY, ROUND_RESULT_DEFAULT));
 				this.setAngleUnits(getAngleUnitsFromPrefs(preferences));
 				this.setNumeralBase(getNumeralBaseFromPrefs(preferences));
+				this.setMultiplicationSign(preferences.getString(MULTIPLICATION_SIGN_P_KEY, MULTIPLICATION_SIGN_DEFAULT));
 
 				final String groupingSeparator = preferences.getString(GROUPING_SEPARATOR_P_KEY, JsclMathEngine.GROUPING_SEPARATOR_DEFAULT);
 				if (StringUtils.isEmpty(groupingSeparator)) {
diff --git a/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java b/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java
index b49367b3..b09cba8e 100644
--- a/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java
@@ -53,7 +53,7 @@ public class FromJsclSimplifyTextProcessor implements TextProcessor<String, Gene
 				}
 
 				if (needMultiplicationSign(mathTypeBefore == null ? null : mathTypeBefore.getMathType(), mathTypeAfter == null ? null : mathTypeAfter.getMathType())) {
-					sb.append("×");
+					sb.append(CalculatorEngine.instance.getMultiplicationSign());
 				}
 
 			} else {
diff --git a/src/main/java/org/solovyev/android/view/widgets/ColorButton.java b/src/main/java/org/solovyev/android/view/widgets/ColorButton.java
index bccafa51..b3be0770 100644
--- a/src/main/java/org/solovyev/android/view/widgets/ColorButton.java
+++ b/src/main/java/org/solovyev/android/view/widgets/ColorButton.java
@@ -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));
diff --git a/src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java b/src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
index f61473cd..1087ed1b 100644
--- a/src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
+++ b/src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
@@ -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);