No longer speaks 'dollars' after each bill read

matthill · May 18, 2014 · 11b774e · 11b774e
1 parent 78a56b4
commit 11b774e
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/com/ndu/mobile/darwinwallet/BillRecognizerActivity.java b/src/com/ndu/mobile/darwinwallet/BillRecognizerActivity.java
@@ -250,15 +250,31 @@ public void recognitionEvent(RecognitionResult result)
 
 		if (result.match_found)
 		{
-			output = getResources().getBoolean(R.bool.sign_before_value) ? loadedCurrency.getSymbol() + result.bill_value : result.bill_value + loadedCurrency.getSymbol();
+			String speechOutput = String.valueOf(result.bill_value);
+
+			if (getResources().getBoolean(R.bool.sign_before_value))
+			{
+				output = loadedCurrency.getSymbol() + result.bill_value;
+			}
+			else
+			{
+				output = result.bill_value + loadedCurrency.getSymbol();
+			}
+
 			if (result.front == true)
+			{
 				output = output + " " + getString(R.string.front);
+				speechOutput = speechOutput + " " + getString(R.string.front);
+			}
 			else
+			{
 				output = output + " " + getString(R.string.back);
+				speechOutput = speechOutput + " " + getString(R.string.back);
+			}
 
 			lblOutput.setTextColor(Color.GREEN);
 			lblOutput.setText(output);
-			voice.speakWithoutCallback(output);
+			voice.speakWithoutCallback(speechOutput);
 			playSound(SOUND_RECOGNITION_EVENT);
 		}
 		else