diff --git a/android-app-core/res/values-ru/text_strings.xml b/android-app-core/res/values-ru/text_strings.xml
index 071f70d8..db095c87 100644
--- a/android-app-core/res/values-ru/text_strings.xml
+++ b/android-app-core/res/values-ru/text_strings.xml
@@ -317,6 +317,8 @@
Интервал построения
X мин
X макс
+ Y мин
+ Y макс
Неправильное число!
Границы графика не могут быть равны!
Применить
diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/plot/AndroidCalculatorPlotter.java b/android-app-core/src/main/java/org/solovyev/android/calculator/plot/AndroidCalculatorPlotter.java
index 3bd15e5c..f63d9c2b 100644
--- a/android-app-core/src/main/java/org/solovyev/android/calculator/plot/AndroidCalculatorPlotter.java
+++ b/android-app-core/src/main/java/org/solovyev/android/calculator/plot/AndroidCalculatorPlotter.java
@@ -158,6 +158,11 @@ public class AndroidCalculatorPlotter implements CalculatorPlotter, SharedPrefer
plotter.setPlotImag(plotImag);
}
+ @Override
+ public void savePlotBoundaries(@NotNull PlotBoundaries plotBoundaries) {
+ plotter.savePlotBoundaries(plotBoundaries);
+ }
+
@Override
public void setPlotBoundaries(@NotNull PlotBoundaries plotBoundaries) {
plotter.setPlotBoundaries(plotBoundaries);
@@ -169,9 +174,4 @@ public class AndroidCalculatorPlotter implements CalculatorPlotter, SharedPrefer
setPlotImag(CalculatorPreferences.Graph.plotImag.getPreference(preferences));
}
}
-
- @Override
- public void setPlotData(boolean plot3d, @NotNull PlotBoundaries plotBoundaries) {
- plotter.setPlotData(plot3d, plotBoundaries);
- }
}
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
index 952d483d..f79b4726 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
@@ -95,8 +95,11 @@ public abstract class AbstractCalculatorPlotFragment extends CalculatorFragment
setHasOptionsMenu(true);
}
- private void saveBoundaries(@NotNull PlotBoundaries boundaries) {
- Locator.getInstance().getPlotter().setPlotBoundaries(boundaries);
+ private void savePlotBoundaries() {
+ final PlotBoundaries plotBoundaries = getPlotBoundaries();
+ if (plotBoundaries != null) {
+ Locator.getInstance().getPlotter().savePlotBoundaries(plotBoundaries);
+ }
}
@Nullable
@@ -106,10 +109,7 @@ public abstract class AbstractCalculatorPlotFragment extends CalculatorFragment
public void onPause() {
PreferenceManager.getDefaultSharedPreferences(this.getActivity()).unregisterOnSharedPreferenceChangeListener(this);
- final PlotBoundaries plotBoundaries = getPlotBoundaries();
- if (plotBoundaries != null) {
- saveBoundaries(plotBoundaries);
- }
+ savePlotBoundaries();
super.onPause();
}
@@ -203,10 +203,25 @@ public abstract class AbstractCalculatorPlotFragment extends CalculatorFragment
super.onCreateOptionsMenu(menu, inflater);
final List> menuItems = new ArrayList>();
- menuItems.add(PlotMenu.range);
menuItems.add(PlotMenu.preferences);
menuItems.add(PlotMenu.functions);
+ final IdentifiableMenuItem