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

Hide numeral base preference

Browse Source
This commit is contained in:
Sergey Solovyev 2012-04-23 11:31:23 +04:00
parent d69d8eef42
commit 6ed16bb26a
6 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calculatorpp/res/values-ru/text_preferences.xml
View File

@ -4,4 +4,7 @@
<string name="c_show_equals_button_title">Показывать клавишу равно</string>
<string name="c_show_equals_button_summary">Если включено, то клавиша равно будет показана</string>
<string name="c_hide_numeral_base_digits_title">Не показывать цифры из других систем счисления</string>
<string name="c_hide_numeral_base_digits_summary">Если включено, то цифры из других систем счисления будут спрятаны</string>
</resources>

3
calculatorpp/res/values-uk/text_preferences.xml
View File

@ -4,4 +4,7 @@
<string name="c_show_equals_button_title">Показывать клавишу равно</string>
<string name="c_show_equals_button_summary">Если включено, то клавиша равно будет показана</string>
<string name="c_hide_numeral_base_digits_title">Не показывать цифры из других систем счисления</string>
<string name="c_hide_numeral_base_digits_summary">Если включено, то цифры из других систем счисления будут спрятаны</string>
</resources>

3
calculatorpp/res/values/text_preferences.xml
View File

@ -4,4 +4,7 @@
<string name="c_show_equals_button_title">Show equals button</string>
<string name="c_show_equals_button_summary">If turned on equals button is shown</string>
<string name="c_hide_numeral_base_digits_title">Hide other numeral base digits</string>
<string name="c_hide_numeral_base_digits_summary">If turned on other numeral base digits base will be hidden</string>
</resources>

7
calculatorpp/res/xml/preferences.xml
View File

@ -148,6 +148,13 @@
a:summary="@string/c_show_equals_button_summary"
a:defaultValue="true"/>
<android.preference.CheckBoxPreference
a:key="hideNumeralBaseDigits"
a:title="@string/c_hide_numeral_base_digits_title"
a:summary="@string/c_hide_numeral_base_digits_summary"
a:defaultValue="true"/>
</PreferenceScreen>
<PreferenceScreen

1
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@ -36,6 +36,7 @@ public final class CalculatorPreferences {
public static final Preference<Boolean> usePrevAsBack = new BooleanPreference("org.solovyev.android.calculator.CalculatorActivity_use_back_button_as_prev", false);
public static final Preference<Boolean> showEqualsButton = new BooleanPreference("showEqualsButton", true);
public static final Preference<Boolean> autoOrientation = new BooleanPreference("autoOrientation", true);
public static final Preference<Boolean> hideNumeralBaseDigits = new BooleanPreference("hideNumeralBaseDigits", true);
public static enum Theme {

11
calculatorpp/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
View File

@ -13,7 +13,7 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
*/
public class NumeralBaseButtons {
public synchronized void toggleNumericDigits(@NotNull Activity activity, @NotNull NumeralBase currentNumeralBase) {
private synchronized void toggleNumericDigits(@NotNull Activity activity, @NotNull NumeralBase currentNumeralBase) {
for (NumeralBase numeralBase : NumeralBase.values()) {
if ( currentNumeralBase != numeralBase ) {
AndroidNumeralBase.valueOf(numeralBase).toggleButtons(false, activity);
@ -24,7 +24,12 @@ public class NumeralBaseButtons {
}
public synchronized void toggleNumericDigits(@NotNull Activity activity, @NotNull SharedPreferences preferences) {
final NumeralBase nb = CalculatorEngine.Preferences.numeralBase.getPreference(preferences);
this.toggleNumericDigits(activity, nb);
if (CalculatorPreferences.Gui.hideNumeralBaseDigits.getPreference(preferences)) {
final NumeralBase nb = CalculatorEngine.Preferences.numeralBase.getPreference(preferences);
this.toggleNumericDigits(activity, nb);
} else {
// set HEX to show all digits
AndroidNumeralBase.valueOf(NumeralBase.hex).toggleButtons(true, activity);
}
}
}