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

Engine refactor

Browse Source
This commit is contained in:
serso
2016-01-20 10:46:23 +01:00
parent 1d366123b3
commit 7faef42dea
28 changed files with 280 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/res/values/preferences.xml
View File

@@ -21,9 +21,6 @@
-->
<resources>
<string name="p_calc_result_precision_key" translatable="false">org.solovyev.android.calculator.CalculatorModel_result_precision</string>
<string name="p_calc_result_precision" translatable="false">5</string>
<string name="p_calc_color_display_key" translatable="false">org.solovyev.android.calculator.CalculatorModel_color_display</string>
<string name="p_calc_color_display" translatable="false">true</string>
@@ -39,36 +36,14 @@
</string>
<string name="p_calc_show_release_notes" translatable="false">true</string>
<string name="p_calc_round_result_key" translatable="false">org.solovyev.android.calculator.CalculatorModel_round_result</string>
<string name="p_calc_round_result" translatable="false">true</string>
<string name="p_calc_science_notation_key" translatable="false">calculation.output.science_notation</string>
<string name="p_calc_science_notation" translatable="false">false</string>
<string name="p_calc_history" translatable="false">org.solovyev.android.calculator.CalculatorModel_history</string>
<string name="p_calc_angle_units_key" translatable="false">org.solovyev.android.calculator.CalculatorActivity_angle_units</string>
<string name="p_calc_angle_units" translatable="false">deg</string>
<string name="p_calc_numeral_bases_key" translatable="false">org.solovyev.android.calculator.CalculatorActivity_numeral_bases</string>
<string name="p_calc_numeral_bases" translatable="false">dec</string>
<string name="p_calc_theme_key" translatable="false">org.solovyev.android.calculator.CalculatorActivity_calc_theme</string>
<string name="p_calc_theme" translatable="false">default_theme</string>
<string name="p_calc_layout_key" translatable="false">org.solovyev.android.calculator.CalculatorActivity_calc_layout</string>
<string name="p_calc_layout" translatable="false">main_calculator</string>
<string name="p_calc_grouping_separator_key" translatable="false">
org.solovyev.android.calculator.CalculatorActivity_calc_grouping_separator
</string>
<string name="p_calc_grouping_separator" translatable="false">" "</string>
<string name="p_calc_multiplication_sign_key" translatable="false">
org.solovyev.android.calculator.CalculatorActivity_calc_multiplication_sign
</string>
<string name="p_calc_multiplication_sign" translatable="false">"×"</string>
<string name="p_calc_ad_free" translatable="false">false</string>
</resources>

2
app/src/main/res/xml/preferences_appearance.xml
View File

@@ -39,7 +39,7 @@
<ListPreference
a:entries="@array/p_multiplication_sign_values"
a:entryValues="@array/p_multiplication_sign_values"
a:key="@string/p_calc_multiplication_sign_key"
a:key="engine.multiplicationSign"
a:summary="@string/c_calc_multiplication_sign_summary"
a:title="@string/c_calc_multiplication_sign" />

12
app/src/main/res/xml/preferences_calculations.xml
View File

@@ -27,27 +27,27 @@
<android.preference.CheckBoxPreference
a:defaultValue="true"
a:key="@string/p_calc_round_result_key"
a:key="engine.output.round"
a:summary="@string/c_calc_round_result_summary"
a:title="@string/c_calc_round_result_title" />
<org.solovyev.android.prefs.IntegerPickerDialogPreference
a:defaultValue="5"
a:key="@string/p_calc_result_precision_key"
a:key="engine.output.precision"
a:summary="@string/c_calc_result_precision_summary"
a:title="@string/p_calc_result_precision_title"
range:boundaries="0;16" />
<android.preference.CheckBoxPreference
a:defaultValue="false"
a:key="@string/p_calc_science_notation_key"
a:key="engine.output.scientificNotation"
a:summary="@string/c_calc_science_notation_summary"
a:title="@string/c_calc_science_notation_title" />
<ListPreference
a:entries="@array/p_grouping_separator_names"
a:entryValues="@array/p_grouping_separator_values"
a:key="@string/p_calc_grouping_separator_key"
a:key="engine.groupingSeparator"
a:summary="@string/c_calc_grouping_separator_summary"
a:title="@string/c_calc_grouping_separator" />
@@ -61,7 +61,7 @@
<ListPreference
a:entries="@array/p_angle_units_names"
a:entryValues="@array/p_angle_units"
a:key="@string/p_calc_angle_units_key"
a:key="engine.angleUnit"
a:summary="@string/c_angle_units_summary"
a:title="@string/c_calc_angle_units" />
@@ -75,7 +75,7 @@
<ListPreference
a:entries="@array/p_numeral_bases_names"
a:entryValues="@array/p_numeral_bases"
a:key="@string/p_calc_numeral_bases_key"
a:key="engine.numeralBase"
a:summary="@string/c_numeral_bases_summary"
a:title="@string/c_calc_numeral_bases" />