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

Number format preference

Browse Source
This commit is contained in:
serso
2016-04-28 12:18:35 +02:00
parent 9e4a798c1b
commit 5a9bcdede7
15 changed files with 477 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/layout/fragment_plot_function_edit.xml
View File

@@ -59,11 +59,9 @@
<TextView
android:id="@+id/fn_linewidth_label"
style="@style/TextAppearance.AppCompat.Caption"
style="@style/CppLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="4dp"
android:paddingLeft="4dp"
android:text="@string/cpp_plot_function_line_width"
tools:ignore="RtlSymmetry"/>
@@ -74,11 +72,9 @@
<TextView
android:id="@+id/fn_color_label"
style="@style/TextAppearance.AppCompat.Caption"
style="@style/CppLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="4dp"
android:paddingLeft="4dp"
android:text="@string/cpp_plot_function_line_color"
tools:ignore="RtlSymmetry"/>

34
app/src/main/res/layout/preference_number_format.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/cpp_dialog_spacing">
<TextView
style="@style/CppLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Notation"/>
<Spinner
android:id="@+id/nf_notation_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
style="@style/CppLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Precision"/>
<org.solovyev.android.views.DiscreteSeekBar
android:id="@+id/nf_precision_seekbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:labelsColor="?android:attr/textColorSecondary"
app:labelsSize="12sp"
app:values="@array/cpp_prefs_precisions"/>
</LinearLayout>

8
app/src/main/res/values/attrs_dsb.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="DiscreteSeekBar">
<attr name="values" format="reference"/>
<attr name="labelsSize" format="dimension|reference"/>
<attr name="labelsColor" format="color|reference"/>
</declare-styleable>
</resources>

5
app/src/main/res/values/styles.xml
View File

@@ -319,6 +319,11 @@
<item name="android:visibility">gone</item>
</style>
<style name="CppLabel" parent="TextAppearance.AppCompat.Caption">
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
</style>
<dimen name="list_item_text_size">16sp</dimen>
<dimen name="list_item_text_size_small">14sp</dimen>
</resources>

1
app/src/main/res/values/text_non_translatable.xml
View File

@@ -34,6 +34,5 @@
<item>13</item>
<item>14</item>
<item>15</item>
<item>16</item>
</string-array>
</resources>

3
app/src/main/res/values/text_strings.xml
View File

@@ -124,4 +124,7 @@
<string name="cpp_angles">Angles</string>
<string name="cpp_radix">Radix</string>
<string name="cpp_numeral_system">Numeral system</string>
<string name="cpp_number_format_simple">Simple</string>
<string name="cpp_number_format_eng">Engineering</string>
<string name="cpp_number_format_sci">Scientific</string>
</resources>

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

@@ -24,11 +24,9 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<android.preference.CheckBoxPreference
a:defaultValue="true"
a:key="engine.output.round"
a:summary="@string/c_calc_round_result_summary"
a:title="@string/c_calc_round_result_title" />
<org.solovyev.android.calculator.preferences.NumberFormatPreference
a:key="engine.output.numberFormat"
a:title="Number format" />
<ListPreference
a:entries="@array/cpp_prefs_precisions"