new version + introducing angle utils
This commit is contained in:
parent
24f5875549
commit
5be6a82955
@ -3,8 +3,8 @@
|
||||
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
package="org.solovyev.android.calculator"
|
||||
a:installLocation="auto"
|
||||
a:versionCode="13"
|
||||
a:versionName="1.1.13">
|
||||
a:versionCode="14"
|
||||
a:versionName="1.1.14">
|
||||
|
||||
<uses-permission a:name="android.permission.VIBRATE"/>
|
||||
|
||||
|
@ -86,6 +86,12 @@
|
||||
<string name="c_history_is_empty">История пуста!</string>
|
||||
<string name="c_app_history">История</string>
|
||||
<string name="c_char_is_not_accepted">Символ \'%s\' не допустим в названии переменной!</string>
|
||||
|
||||
<string name="c_calc_angle_units">Единицы измерения углов</string>
|
||||
<string name="p_deg">Градусы</string>
|
||||
<string name="p_rad">Радианы</string>
|
||||
<string name="c_angle_units_summary">Определяет единицы измерения углов.</string>
|
||||
|
||||
<string name="c_calc_theme">Тема оформления</string>
|
||||
<string name="p_default_theme">По умолчанию</string>
|
||||
<string name="p_violet_theme">Фиолетовая</string>
|
||||
|
@ -47,4 +47,13 @@
|
||||
<item>100</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="p_angle_units_names">
|
||||
<item>@string/p_deg</item>
|
||||
<item>@string/p_rad</item>
|
||||
</string-array>
|
||||
<string-array name="p_angle_units">
|
||||
<item>deg</item>
|
||||
<item>rad</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
@ -27,6 +27,9 @@
|
||||
|
||||
<string name="p_calc_vars">org.solovyev.android.calculator.CalculatorModel_vars</string>
|
||||
|
||||
<string name="p_calc_angle_units_key">org.solovyev.android.calculator.CalculatorActivity_angle_units</string>
|
||||
<string name="p_calc_angle_units">deg</string>
|
||||
|
||||
<string name="p_calc_theme_key">org.solovyev.android.calculator.CalculatorActivity_calc_theme</string>
|
||||
<string name="p_calc_theme">default_theme</string>
|
||||
|
||||
|
@ -87,6 +87,12 @@
|
||||
<string name="c_history_is_empty">History is empty!</string>
|
||||
<string name="c_app_history">History</string>
|
||||
<string name="c_char_is_not_accepted">Character \'%s\' is not accepted in variable name!</string>
|
||||
|
||||
<string name="c_calc_angle_units">Angle Units</string>
|
||||
<string name="p_deg">Degrees</string>
|
||||
<string name="p_rad">Radians</string>
|
||||
<string name="c_angle_units_summary">Defines the default units for angles.</string>
|
||||
|
||||
<string name="c_calc_theme">Theme</string>
|
||||
<string name="p_default_theme">Default</string>
|
||||
<string name="p_violet_theme">Violet</string>
|
||||
|
@ -23,6 +23,14 @@
|
||||
a:summary="@string/c_calc_grouping_separator_summary"
|
||||
a:entryValues="@array/p_grouping_separator_values"/>
|
||||
|
||||
<!--
|
||||
<ListPreference a:key="@string/p_calc_angle_units_key"
|
||||
a:title="@string/c_calc_angle_units"
|
||||
a:entries="@array/p_angle_units_names"
|
||||
a:summary="@string/c_angle_units_summary"
|
||||
a:entryValues="@array/p_angle_units"/>
|
||||
-->
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
|
@ -301,7 +301,7 @@ public class CalculatorVarsActivity extends ListActivity {
|
||||
|
||||
if (!StringUtils.isEmpty(name)) {
|
||||
try {
|
||||
Identifier.parser.parse(name, new MutableInt(0), 0, null);
|
||||
Identifier.parser.parse(name, new MutableInt(0), null);
|
||||
result = true;
|
||||
} catch (ParseException e) {
|
||||
// not valid name;
|
||||
|
Loading…
Reference in New Issue
Block a user