diff --git a/android-app-core/res/values-ru/text_strings.xml b/android-app-core/res/values-ru/text_strings.xml
index 83039e50..071f70d8 100644
--- a/android-app-core/res/values-ru/text_strings.xml
+++ b/android-app-core/res/values-ru/text_strings.xml
@@ -320,5 +320,16 @@
Неправильное число!Границы графика не могут быть равны!Применить
+ Сообщение
+ Продолжить
+ Поддержать проект очень легко и безопасно: процесс покупки проводится Google и всё что вам нужно - это настроенный Google аккаунт.\n\n
+ Информация о покупке хранится на серверах Google с вашим Google аккаунтом и вы можете легко использовать приложение на нескольких устройствах.\n\n
+ По нажатию кнопки \'Продолжить\' вы будете перенаправлены в приложение Google Play для совершения покупки.
+
+ Покупка
+
+ Спасибо за помощь в развитии проекта!\n\n Приложение получит уведомление о покупке в течение нескольких минут. Вы всегда можете посмотреть состояние покупки в вашем Google аккаунте.\n
+ Если у вас есть вопросы или проблемы вы всегда можете обратиться ко мне напрямую (конакты доступны в Меню->О приложении)
+
\ No newline at end of file
diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml
index 2aebeade..c480b9f9 100644
--- a/android-app-core/res/values/text_strings.xml
+++ b/android-app-core/res/values/text_strings.xml
@@ -175,8 +175,8 @@
Defines the behaviour of the Back buttonUse Back button as history prev
- Billing information will be reloaded from the server
- Update billing information
+ Purchase information will be reloaded from the server
+ Update purchase informationWarningError
@@ -321,6 +321,16 @@
Graph boundaries should not be the same!ApplyMessage
+ Continue
+ Supporting the project is easy and secure: purchase process is provided by Google and all you need is a properly configured Google account.\n\n
+ Payment information is stored in Google servers with your Google account and you can easily use application on several devices.\n\n
+ By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.
+
+ Purchase
+
+ Thank you for supporting the application!\n\n It might take several minutes until app will be informed about the purchase. You always can check information about the purchase in your Google Account.\n
+ If you have any problems or questions feel free to contact me directly (contacts are available in Main->Menu->About)
+
\ No newline at end of file
diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
index e287bcfc..3a6e16d9 100644
--- a/android-app/AndroidManifest.xml
+++ b/android-app/AndroidManifest.xml
@@ -36,7 +36,7 @@
-
+
@@ -57,6 +57,8 @@
+
+
diff --git a/android-app/res/layout/cpp_dialog_fragment.xml b/android-app/res/layout/cpp_dialog_fragment.xml
index ae212b05..602b74da 100644
--- a/android-app/res/layout/cpp_dialog_fragment.xml
+++ b/android-app/res/layout/cpp_dialog_fragment.xml
@@ -11,7 +11,9 @@
+ a:layout_height="wrap_content"
+ a:maxLines="10"
+ a:scrollbars="vertical"/>
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
index a6d793bf..60bd843a 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
@@ -24,6 +24,7 @@ import org.solovyev.android.calculator.math.edit.*;
import org.solovyev.android.calculator.matrix.CalculatorMatrixActivity;
import org.solovyev.android.calculator.plot.CalculatorPlotActivity;
import org.solovyev.android.calculator.plot.CalculatorPlotter;
+import org.solovyev.android.calculator.preferences.CalculatorPreferencesActivity;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.text.StringUtils;
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java
index e804399a..e0204584 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
+import android.text.method.ScrollingMovementMethod;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -97,6 +98,7 @@ public class CalculatorDialogActivity extends SherlockFragmentActivity {
if (dialogData != null) {
final TextView messageTextView = (TextView) root.findViewById(R.id.cpp_dialog_message_textview);
+ messageTextView.setMovementMethod(ScrollingMovementMethod.getInstance());
messageTextView.setText(dialogData.getMessage());
if ( dialogData.getMessageType() == MessageType.error || dialogData.getMessageType() == MessageType.warning ) {
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java
index e53cca41..bf83968e 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java
@@ -35,6 +35,8 @@ public enum CalculatorFragmentType {
plotter_function_settings(CalculatorPlotFunctionSettingsActivity.CalculatorPlotFunctionSettingsFragment.class, R.layout.cpp_plot_function_settings_fragment, R.string.cpp_plot_function_settings),
plotter_range(CalculatorPlotRangeActivity.CalculatorPlotRangeFragment.class, R.layout.cpp_plot_range_fragment, R.string.cpp_plot_range),
+ purchase_dialog(CalculatorPlotRangeActivity.CalculatorPlotRangeFragment.class, R.layout.cpp_purchase_dialog_fragment, R.string.cpp_purchase_title),
+
dialog(CalculatorDialogActivity.CalculatorDialogFragment.class, R.layout.cpp_dialog_fragment, R.string.cpp_message),
about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about),
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
index 354f4a3d..b40f9676 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
@@ -43,6 +43,17 @@ enum CalculatorMenu implements LabeledMenuItem