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

Avoid using layouts

Browse Source
This commit is contained in:
serso 2016-03-23 21:56:44 +01:00
parent bf8aede7f7
commit 1fe612f63f
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -110,7 +110,7 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference
private void updateModeMenuItem() { private void updateModeMenuItem() {
final Menu menu = toolbar.getMenu(); final Menu menu = toolbar.getMenu();
final MenuItem modeMenuItem = menu.findItem(R.id.menu_mode); final MenuItem modeMenuItem = menu.findItem(R.id.menu_mode);
modeMenuItem.setTitle(getString(R.string.cpp_mode_status, getString(getActivityMode().menuName))); modeMenuItem.setTitle(getString(R.string.cpp_mode_status, getString(getActivityMode().name)));
} }
@Override @Override

16
app/src/main/java/org/solovyev/android/calculator/Preferences.java
View File

@ -136,7 +136,6 @@ public final class Preferences {
Gui.keepScreenOn.tryPutDefault(preferences, editor); Gui.keepScreenOn.tryPutDefault(preferences, editor);
Gui.language.tryPutDefault(preferences, editor); Gui.language.tryPutDefault(preferences, editor);
Graph.plotImag.tryPutDefault(preferences, editor);
Calculations.calculateOnFly.tryPutDefault(preferences, editor); Calculations.calculateOnFly.tryPutDefault(preferences, editor);
Calculations.preferredAngleUnits.tryPutDefault(preferences, editor); Calculations.preferredAngleUnits.tryPutDefault(preferences, editor);
Calculations.preferredNumeralBase.tryPutDefault(preferences, editor); Calculations.preferredNumeralBase.tryPutDefault(preferences, editor);
@ -381,17 +380,14 @@ public final class Preferences {
} }
public enum Mode { public enum Mode {
engineer(R.string.p_layout_calculator, R.string.cpp_wizard_mode_engineer), engineer(R.string.cpp_wizard_mode_engineer),
simple(R.string.p_layout_simple, R.string.cpp_wizard_mode_simple); simple(R.string.cpp_wizard_mode_simple);
@StringRes @StringRes
public final int name; public final int name;
@StringRes
public final int menuName;
Mode(@StringRes int name, @StringRes int menuName) { Mode(@StringRes int name) {
this.name = name; this.name = name;
this.menuName = menuName;
} }
} }
@ -406,10 +402,7 @@ public final class Preferences {
} }
} }
public static class Graph { @SuppressWarnings("unused")
public static final Preference<Boolean> plotImag = BooleanPreference.of("graph_plot_imag", false);
}
static class Deleted { static class Deleted {
static final Preference<Integer> appVersion = IntegerPreference.of("application.version", DEF_VALUE); static final Preference<Integer> appVersion = IntegerPreference.of("application.version", DEF_VALUE);
static final Preference<Boolean> feedbackWindowShown = BooleanPreference.of("feedback_window_shown", false); static final Preference<Boolean> feedbackWindowShown = BooleanPreference.of("feedback_window_shown", false);
@ -424,5 +417,6 @@ public final class Preferences {
static final Preference<Boolean> showEqualsButton = BooleanPreference.of("showEqualsButton", true); static final Preference<Boolean> showEqualsButton = BooleanPreference.of("showEqualsButton", true);
static final Preference<Boolean> autoOrientation = BooleanPreference.of("autoOrientation", true); static final Preference<Boolean> autoOrientation = BooleanPreference.of("autoOrientation", true);
static final Preference<Boolean> startOnBoot = BooleanPreference.of("onscreen_start_on_boot", false); static final Preference<Boolean> startOnBoot = BooleanPreference.of("onscreen_start_on_boot", false);
static final Preference<Boolean> plotImag = BooleanPreference.of("graph_plot_imag", false);
} }
} }