diff --git a/android-app-core/res/drawable-hdpi/kb_facebook.png b/android-app-core/res/drawable-hdpi/kb_facebook.png
deleted file mode 100644
index 6af63acf..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_facebook.png and /dev/null differ
diff --git a/android-app-core/res/drawable-ldpi/kb_facebook.png b/android-app-core/res/drawable-ldpi/kb_facebook.png
deleted file mode 100644
index bb6591ff..00000000
Binary files a/android-app-core/res/drawable-ldpi/kb_facebook.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_facebook.png b/android-app-core/res/drawable-mdpi/kb_facebook.png
deleted file mode 100644
index 194c8425..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_facebook.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_facebook.png b/android-app-core/res/drawable-xhdpi/kb_facebook.png
deleted file mode 100644
index 8555071e..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_facebook.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png b/android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png
deleted file mode 100644
index 8555071e..00000000
Binary files a/android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png and /dev/null differ
diff --git a/android-app-core/res/layout/cpp_simple_button_like.xml b/android-app-core/res/layout/cpp_simple_button_like.xml
index 235bad53..7c6ea811 100644
--- a/android-app-core/res/layout/cpp_simple_button_like.xml
+++ b/android-app-core/res/layout/cpp_simple_button_like.xml
@@ -24,6 +24,6 @@
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_operators.xml b/android-app-core/res/layout/cpp_simple_button_operators.xml
new file mode 100644
index 00000000..ca9af29a
--- /dev/null
+++ b/android-app-core/res/layout/cpp_simple_button_operators.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_keyboard.xml b/android-app-core/res/layout/cpp_simple_keyboard.xml
index f8d83c21..5ba35cc7 100644
--- a/android-app-core/res/layout/cpp_simple_keyboard.xml
+++ b/android-app-core/res/layout/cpp_simple_keyboard.xml
@@ -78,7 +78,7 @@
-
+
diff --git a/android-app-core/res/values-ru/text_about.xml b/android-app-core/res/values-ru/text_about.xml
index 0e17808a..7b83d398 100644
--- a/android-app-core/res/values-ru/text_about.xml
+++ b/android-app-core/res/values-ru/text_about.xml
@@ -24,8 +24,8 @@
О программе
- Copyright (c) 2009-2011\n\nПрограмма создана\nserso aka se.solovyev\n\n
- Сайт приложения:http://facebook.com/calculatorpp\n\n
+ Copyright (c) 2009-2013\n\nПрограмма создана\nserso aka se.solovyev\n\n
+ Сайт приложения: https://vk.com/calculatorpp\n\n
Эта программа с открытыми исходным кодом:\nон может быть найден на \n
http://github.com\n\n
За подробной информацией, пожалуйста,\nобращайтесь на почту\n
@@ -34,13 +34,10 @@
Если вы хотите поддержать проект материально\nвы можете купить специальную опцию из настроек приложения\n\n
Если вам понравилось приложение -\nпоставьте 5 звёздочек в\n
Google Play\n\n
- Спасибо тем, кто переводил Калькулятор++:\n
- на итальянский - Gabriele Ravanetti\n
- на испанский - Jordi Luna\n
- на украинский - Андрій Бандура\n\n
Это приложение использует следующие открытые библиотеки:\n
Simple (XML serialization)\n
JSCL
+ https://vk.com/calculatorpp
\ No newline at end of file
diff --git a/android-app-core/res/values/text_about.xml b/android-app-core/res/values/text_about.xml
index af617a64..1d082050 100644
--- a/android-app-core/res/values/text_about.xml
+++ b/android-app-core/res/values/text_about.xml
@@ -25,7 +25,7 @@
About
Copyright © 2009–2013\n\nCreated by serso aka se.solovyev\n\n
- We are on Facebook:http://facebook.com/calculatorpp\n\n
+ We are on Facebook: http://facebook.com/calculatorpp\n\n
This program is distributed under Apache 2.0 License:\nsource code can be found on\n
http://github.com\n\n
For more information please\ncontact the author by email\n
@@ -41,5 +41,6 @@
Release notes
"Release notes for version "
+ http://www.facebook.com/calculatorpp
\ No newline at end of file
diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButton.java b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButton.java
index 6915718d..a1d84bb2 100644
--- a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButton.java
+++ b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButton.java
@@ -32,6 +32,16 @@ import org.solovyev.android.calculator.core.R;
import java.util.HashMap;
import java.util.Map;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.cursor_left;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.cursor_right;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.functions_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.history_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.like;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.open_app;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.operators_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.settings_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.vars_detached;
+
/**
* User: serso
* Date: 10/20/12
@@ -54,16 +64,17 @@ public enum CalculatorButton {
period(R.id.cpp_button_period, "."),
brackets(R.id.cpp_button_round_brackets, "()"),
- settings(R.id.cpp_button_settings, CalculatorSpecialButton.settings_detached),
+ settings(R.id.cpp_button_settings, settings_detached),
like(R.id.cpp_button_like, CalculatorSpecialButton.like),
/*last row*/
- left(R.id.cpp_button_left, CalculatorSpecialButton.cursor_left),
- right(R.id.cpp_button_right, CalculatorSpecialButton.cursor_right),
- vars(R.id.cpp_button_vars, CalculatorSpecialButton.vars_detached),
- functions(R.id.cpp_button_functions, CalculatorSpecialButton.functions_detached),
- app(R.id.cpp_button_app, CalculatorSpecialButton.open_app),
- history(R.id.cpp_button_history, CalculatorSpecialButton.history_detached),
+ left(R.id.cpp_button_left, cursor_left),
+ right(R.id.cpp_button_right, cursor_right),
+ vars(R.id.cpp_button_vars, vars_detached),
+ functions(R.id.cpp_button_functions, functions_detached),
+ operators(R.id.cpp_button_operators, operators_detached),
+ app(R.id.cpp_button_app, open_app),
+ history(R.id.cpp_button_history, history_detached),
/*operations*/
multiplication(R.id.cpp_button_multiplication, "*"),
diff --git a/android-app/res/layout/cpp_app_button_donate.xml b/android-app/res/layout/cpp_app_button_donate.xml
index 213bbeff..0d0ab81e 100644
--- a/android-app/res/layout/cpp_app_button_donate.xml
+++ b/android-app/res/layout/cpp_app_button_donate.xml
@@ -24,6 +24,6 @@
\ 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 04442108..3ed7a4ac 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
@@ -205,7 +205,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
}
public static void likeButtonPressed(@Nonnull final Context context) {
- final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(CalculatorApplication.FACEBOOK_APP_URL));
+ final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.cpp_share_link)));
Android.addIntentFlags(intent, false, context);
context.startActivity(intent);
}
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
index f03a4dd5..be2720c7 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
@@ -72,7 +72,6 @@ public class CalculatorApplication extends android.app.Application implements Sh
*/
private static final String TAG = "Calculator++ Application";
- public static final String FACEBOOK_APP_URL = "http://www.facebook.com/calculatorpp";
public static final String AD_FREE_PRODUCT_ID = "ad_free";
public static final String AD_FREE_P_KEY = "org.solovyev.android.calculator_ad_free";