From 16385653d98b78567ab1ac10a920ab2aec8ed0af Mon Sep 17 00:00:00 2001
From: Solovyev_S <Win72282>
Date: Tue, 2 Jul 2013 16:29:49 +0400
Subject: [PATCH] facebook button substituted with operators in the widget

---
 .../res/drawable-hdpi/kb_facebook.png         | Bin 473 -> 0 bytes
 .../res/drawable-ldpi/kb_facebook.png         | Bin 386 -> 0 bytes
 .../res/drawable-mdpi/kb_facebook.png         | Bin 458 -> 0 bytes
 .../res/drawable-xhdpi/kb_facebook.png        | Bin 645 -> 0 bytes
 .../res/drawable-xlarge-hdpi/kb_facebook.png  | Bin 645 -> 0 bytes
 .../res/layout/cpp_simple_button_like.xml     |   2 +-
 .../layout/cpp_simple_button_operators.xml    |  29 ++++++++++++++++++
 .../res/layout/cpp_simple_keyboard.xml        |   2 +-
 android-app-core/res/values-ru/text_about.xml |   9 ++----
 android-app-core/res/values/text_about.xml    |   3 +-
 .../android/calculator/CalculatorButton.java  |  25 ++++++++++-----
 .../res/layout/cpp_app_button_donate.xml      |   2 +-
 .../CalculatorActivityLauncher.java           |   2 +-
 .../calculator/CalculatorApplication.java     |   1 -
 14 files changed, 56 insertions(+), 19 deletions(-)
 delete mode 100644 android-app-core/res/drawable-hdpi/kb_facebook.png
 delete mode 100644 android-app-core/res/drawable-ldpi/kb_facebook.png
 delete mode 100644 android-app-core/res/drawable-mdpi/kb_facebook.png
 delete mode 100644 android-app-core/res/drawable-xhdpi/kb_facebook.png
 delete mode 100644 android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png
 create mode 100644 android-app-core/res/layout/cpp_simple_button_operators.xml

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 6af63acf1abb47e8896fa89fa778902e64a4380c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 473
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*bK<(E-n9)gNb_Gz7y~NYkmHiGEr;xVg3U}oNKvN<;T^vI)?!BF9
z>&@&a(DvN6IU!Yai%65b!q%nN%F3GlpT3`x?xolzAi(YK)H88Me`{Rvo!BBTvudOK
z-P?;l^L*Y|o&K!oujj38%m)N4CYJEYcv=~3wl$tT^Cr&>uUQ^ezFI{G6h9oOidy#U
zkLZRUg?eik4SY}jOny-8dz{<$`pwhZ4j3?Pn)dbkJQjumwl`jjp6;u>8>L_LMPJ3V
zbpOtocV|b&m3SUd=?y;lzc6@FyTC6`e%XYZ5B`76&pEcPac<kw*-se5UaWo1@Qfig
zB)|D+R9@%LuH4@a_s^{2vYl+wSvH4Hkw@ij=*G~!!VW=(TUIe8MNZR<;_~FmeJ8JV
zY;#C@{>7J444?d%J*wVTiJ$tfdtlkE7wt=Ke{%G@wBcFh<S!h1RxFy-7$}s;v+$!>
z<x6)?_5ub})S##NO@CQqZT(zr?*o%}#(ezBI`4JDgXe!LfPu`w;OXk;vd$@?2>>R;
B#BTrq

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 bb6591ff4a94b5829c701033b291c82a46320ee6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 386
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=f!eQwFr$;k><XYDdx@v7EBhTTP9Yt=l&b~{fTl2cx;Tb-9Dh5_
zFz=9oNZWsV6<z1@yaSn51?<;k8hYn7&NMdISmN$<htZ79#d_luk&plQZcOcD2vqOz
zdOLZI%D2ze=kMo7GydD+c}nH!q_jz9lkDzpeqDQs>)>pLdki*HCr_&Ra^JI+^-D~_
zPBzcFH;4BdnC+Um)?-`D1EvEFPwoU(s_tBI<o+3v8(-$cn<#zC__+I)Fw35YrWUC$
z`J3&SUohO5_UrbfHph#~lOE4l^_%g#vfw^z{##ErcIZrb*mQqaUvYuwpYJ!;-kdPS
zGG?LgovjmR-fUKJ>zt!<QtrUNki1E|qqe`i>Uy<g^*uAkmm&X^f2DR@;wp}35aGM{
dDbJoQ{)_S^p|z8>Re=G-;OXk;vd$@?2>@&Mq(%S$

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 194c8425daf1a2777ac91060799aa331aa1eeef8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*bK<(E-n9)gNb_Gz7y~NYkmHiGEr;v{1os6mLfu?wQx;TbJ9DX}>
zqZf-KPuu=A>Pkvkt2xBN#FT!BZTrRWYIely;*8|n$IKDjVT+C~YF(gIQBl=hzTdYc
z@kX)uT+xYt70(#V_W9>)#JR<T$5VLHHWgX#T@$~ktyF*Mc&T$qtJ>W49#)q#VmzX_
za;-S$`ZKy8cqN|2`aw=Eg_C)Mw8eC9Nw!`Wh8uj}p0N}?5UKdIIeNkEkbm78_hUU@
zhn8su8^ld|zxuvPfYc0o{{^3$=bUFc9d~uFVEKB_D!#fc{4uj5?blp;FLZ-}Z|^Er
z9XBoK2j{N)$4@`dH}k3HyoV|VkA>Q9H+?zhZuXsV;gi}0ekR=0Ra`B?f(lkSZt@Uq
zEKWGjy_$h<(fjoW_N{+5iCJHBcf6YB=h_~3&*FviRJ_0OFrLYYSZK83QuZ#v&_${j
ygfcj{u*_01h)s7|CUboD#Wnhq_~zAj^LxBF!g*qS%{5>^GkCiCxvX<aXaWGv*0gf~

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 8555071ebadf57e820ae5d1e01b276384f01a196..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 645
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=f!eQwFr$;k><XYDdx@v7EBhTTP9bgOP}N(v7#NsXJzX3_DsH`<
zy+2DNP~=#BdUA`3lpxch8!T&%uy5GBL3rb)&0Ps=p9ntE{vot2^Ap#y>xUXRgj_kA
zPN^08Zkpd(uGo_LY@PLto!0l+x8K@a{_M}Yo$2Rh+9yPYO&47{XT=iB2SNqh6)bmH
z*D+sjSbc!uhP~-NMtS8&nIBiHyzE;tebP6RnSE&of0laA_qQ~i!*C$(<+=USO8)ep
z^S+dK*HCZEji0;^KF+i;%{(V1!s&3y_JQSv*+r`kTQ$dV&)v^q!#s`A*YfTH3x=1Q
zzAag}vu^4RR=J+0g-Pf8>#V(2*D&#%f710cgj<CDL89*=Y0LfGdzkJq%x|dcdf~Bn
z`exQ!GZ@N^^b50nW!CpvK5%P0%brjj#;B8e<ICk4o(z`1=DMXbny4`wFfeOu4rc3{
zJ>$jx@TN&jJ2+$HF29jU^V`gE=iH8mhT?+xt9c&DFz7JNKJd5e>RHX!%_4#qx5YV_
znpVv%o~#p9A6D$JuC7e>K)JiaamGIdEEY^rVH~QmAHKIe-7&4q^6`K5l^IfDH*^@b
z`nR21EWni@y2EIhkPXAVbf3?B6%%E8x?cPf5{y5s_385#-OQz@&jy%mt-Z@9-M}b;
z8;LBal&V^G@!0gG+gJSaQ)rMiifcU|_}Xsv<Si2t&3ZZ*r=>;)zvBO}zoapsJGlXv
PMi@L@{an^LB{Ts5l_m-L

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 8555071ebadf57e820ae5d1e01b276384f01a196..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 645
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=f!eQwFr$;k><XYDdx@v7EBhTTP9bgOP}N(v7#NsXJzX3_DsH`<
zy+2DNP~=#BdUA`3lpxch8!T&%uy5GBL3rb)&0Ps=p9ntE{vot2^Ap#y>xUXRgj_kA
zPN^08Zkpd(uGo_LY@PLto!0l+x8K@a{_M}Yo$2Rh+9yPYO&47{XT=iB2SNqh6)bmH
z*D+sjSbc!uhP~-NMtS8&nIBiHyzE;tebP6RnSE&of0laA_qQ~i!*C$(<+=USO8)ep
z^S+dK*HCZEji0;^KF+i;%{(V1!s&3y_JQSv*+r`kTQ$dV&)v^q!#s`A*YfTH3x=1Q
zzAag}vu^4RR=J+0g-Pf8>#V(2*D&#%f710cgj<CDL89*=Y0LfGdzkJq%x|dcdf~Bn
z`exQ!GZ@N^^b50nW!CpvK5%P0%brjj#;B8e<ICk4o(z`1=DMXbny4`wFfeOu4rc3{
zJ>$jx@TN&jJ2+$HF29jU^V`gE=iH8mhT?+xt9c&DFz7JNKJd5e>RHX!%_4#qx5YV_
znpVv%o~#p9A6D$JuC7e>K)JiaamGIdEEY^rVH~QmAHKIe-7&4q^6`K5l^IfDH*^@b
z`nR21EWni@y2EIhkPXAVbf3?B6%%E8x?cPf5{y5s_385#-OQz@&jy%mt-Z@9-M}b;
z8;LBal&V^G@!0gG+gJSaQ)rMiifcU|_}Xsv<Si2t&3ZZ*r=>;)zvBO}zoapsJGlXv
PMi@L@{an^LB{Ts5l_m-L

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 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_like"
-			 a:src="@drawable/kb_facebook"
+			 a:src="@drawable/kb_share"
 			 style="@style/cpp_simple_metro_control_image_button_style"
 			 a:contentDescription="Like"/>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<Button xmlns:a="http://schemas.android.com/apk/res/android"
+		a:id="@id/cpp_button_operators"
+		a:text="∂,…"
+		a:textStyle="italic"
+		style="@style/cpp_simple_metro_control_button_style"/>
\ 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 @@
 
 		<include layout="@layout/cpp_simple_button_plus"/>
 
-		<include layout="@layout/cpp_simple_button_like"/>
+		<include layout="@layout/cpp_simple_button_operators"/>
 
 		<include layout="@layout/cpp_simple_button_copy"/>
 
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 @@
 
 	<string name="c_about">О программе</string>
 
-	<string name="c_about_content">Copyright (c) 2009-2011\n\n<b>Программа создана\nserso aka se.solovyev</b>\n\n
-		Сайт приложения:<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
+	<string name="c_about_content">Copyright (c) 2009-2013\n\n<b>Программа создана\nserso aka se.solovyev</b>\n\n
+		Сайт приложения: <a href="https://vk.com/calculatorpp">https://vk.com/calculatorpp</a>\n\n
 		Эта программа с открытыми исходным кодом:\nон может быть найден на \n
 		<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
 		За подробной информацией, пожалуйста,\nобращайтесь на почту\n<a href="mailto:se.solovyev@gmail.com">
@@ -34,13 +34,10 @@
 		Если вы хотите поддержать проект материально\nвы можете купить специальную опцию из настроек приложения\n\n
 		Если вам понравилось приложение -\nпоставьте 5 звёздочек в\n
 		<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
-		Спасибо тем, кто переводил Калькулятор++:\n
-		на итальянский - Gabriele Ravanetti\n
-		на испанский - Jordi Luna\n
-		на украинский - Андрій Бандура\n\n
 		Это приложение использует следующие открытые библиотеки:\n
 		<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
 		<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>
 	</string>
+	<string name="cpp_share_link">https://vk.com/calculatorpp</string>
 
 </resources>
\ 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 @@
 	<string name="c_about">About</string>
 
 	<string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n
-		We are on Facebook:<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
+		We are on Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
 		This program is distributed under Apache 2.0 License:\nsource code can be found on\n
 		<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
 		For more information please\ncontact the author by email\n
@@ -41,5 +41,6 @@
 
 	<string name="c_release_notes">Release notes</string>
 	<string name="c_release_notes_for_title">"Release notes for version "</string>
+	<string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
 
 </resources>
\ 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 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_like"
-			 a:src="@drawable/kb_facebook"
+			 a:src="@drawable/kb_share"
 			 style="?cpp_control_image_button_style"
 			 a:onClick="likeButtonClickHandler"/>
\ 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";