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

fixes: grouping separator preference

Browse Source
This commit is contained in:
serso 2011-10-23 16:51:58 +04:00
parent 4577e1e90c
commit 296e2b46a0
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/calc_zero_digit_button.xml
View File

@ -8,7 +8,8 @@
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/zeroDigitButton" a:text="0" a:id="@+id/zeroDigitButton"
a:text="0"
calc:textUp="." calc:textUp="."
calc:textDown="000" calc:textDown="000"
calc:directionTextScale="0.5" calc:directionTextScale="0.5"

2
res/values/arrays.xml
View File

@ -24,7 +24,7 @@
<string-array name="p_grouping_separator_values"> <string-array name="p_grouping_separator_values">
<item>""</item> <item>""</item>
<item>\'</item> <item>\'</item>
<item> </item> <item>" "</item>
</string-array> </string-array>
</resources> </resources>

2
src/main/java/org/solovyev/android/calculator/math/MathType.java
View File

@ -55,7 +55,7 @@ public enum MathType {
} }
}, },
postfix_function(400, true, false, Functions.allPostfix) { postfix_function(400, true, true, Functions.allPostfix) {
@Override @Override
protected String getSubstituteToJscl(@NotNull String match) { protected String getSubstituteToJscl(@NotNull String match) {
final String result; final String result;

2
src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
View File

@ -118,6 +118,8 @@ public class ToJsclTextProcessorTest {
Assert.assertEquals( "20.0*3.141592653589793/180", preprocessor.process("20.0°").toString()); Assert.assertEquals( "20.0*3.141592653589793/180", preprocessor.process("20.0°").toString());
Assert.assertEquals( "sin(30*3.141592653589793/180)", preprocessor.process("sin(30°)").toString()); Assert.assertEquals( "sin(30*3.141592653589793/180)", preprocessor.process("sin(30°)").toString());
Assert.assertEquals( "asin(sin(3.141592653589793/6))*3.141592653589793/180", preprocessor.process("asin(sin(π/6))°").toString()); Assert.assertEquals( "asin(sin(3.141592653589793/6))*3.141592653589793/180", preprocessor.process("asin(sin(π/6))°").toString());
Assert.assertEquals( "1*3.141592653589793/180*sin(1)", preprocessor.process("1°sin(1)").toString());
} }
} }