fixes: grouping separator preference
This commit is contained in:
parent
d9ce5da2fc
commit
ab414326ef
@ -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"
|
||||||
|
@ -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>
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user