changes, changes, changes

2011-10-13 01:46:44 +04:00
parent 1e2edc2e79
commit c6c5350602
24 changed files with 375 additions and 192 deletions
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -55,7 +55,7 @@
 			<include layout="@layout/calc_eight_digit_button"/>
 			<include layout="@layout/calc_nine_digit_button"/>
 			<include layout="@layout/calc_plus_button"/>
-			<include layout="@layout/calc_paste_button"/>
+			<include layout="@layout/calc_copy_button"/>

 		</LinearLayout>

@@ -65,7 +65,7 @@
 			<include layout="@layout/calc_zero_digit_button"/>
 			<include layout="@layout/calc_square_brackets_button"/>
 			<include layout="@layout/calc_subtraction_button"/>
-			<include layout="@layout/calc_copy_button"/>
+			<include layout="@layout/calc_paste_button"/>

 		</LinearLayout>

--- a/res/layout/calc_clear_button.xml
+++ b/res/layout/calc_clear_button.xml
@@ -6,9 +6,9 @@
  ~ or visit http://se.solovyev.org
  -->

-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   a:id="@+id/clearButton"
-													   a:text="@string/c_clear"
-													   style="@style/control_button_style"
-													   a:onClick="clearButtonClickHandler"/>
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 a:id="@+id/clearButton"
+			 a:drawableTop="@drawable/ic_delete"
+			 style="@style/control_image_button_style"
+			 a:onClick="clearButtonClickHandler"/>
--- a/res/layout/calc_copy_button.xml
+++ b/res/layout/calc_copy_button.xml
@@ -6,10 +6,9 @@
  ~ or visit http://se.solovyev.org
  -->

-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
-			 a:src="@drawable/copy"
-			 style="@style/control_button_style"
-			 a:padding="6dp"
+			 a:drawableTop="@drawable/copy"
+			 style="@style/control_image_button_style"
 			 a:onClick="copyButtonClickHandler"/>
--- a/res/layout/calc_donate_button.xml
+++ b/res/layout/calc_donate_button.xml
@@ -10,6 +10,5 @@
 			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
 			 a:src="@drawable/heart"
-			 style="@style/control_button_style"
-			 a:padding="6dp"
+			 style="@style/control_image_button_style"
 			 a:onClick="donateButtonClickHandler"/>
--- a/res/layout/calc_erase_button.xml
+++ b/res/layout/calc_erase_button.xml
@@ -6,9 +6,9 @@
  ~ or visit http://se.solovyev.org
  -->

-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   a:id="@+id/eraseButton"
-													   a:text="@string/c_erase"
-													   style="@style/control_button_style"
-													   a:onClick="eraseButtonClickHandler"/>
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 a:id="@+id/eraseButton"
+			 a:drawableTop="@drawable/sym_keyboard_delete"
+			 style="@style/control_image_button_style"
+			 a:onClick="eraseButtonClickHandler"/>
--- a/res/layout/calc_paste_button.xml
+++ b/res/layout/calc_paste_button.xml
@@ -6,10 +6,9 @@
  ~ or visit http://se.solovyev.org
  -->

-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
-			 a:src="@drawable/paste"
-			 style="@style/control_button_style"
-			 a:padding="6dp"
+			 a:drawableTop="@drawable/paste"
+			 style="@style/control_image_button_style"
 			 a:onClick="pasteButtonClickHandler"/>
--- a/res/layout/calc_round_brackets_button.xml
+++ b/res/layout/calc_round_brackets_button.xml
@@ -10,5 +10,6 @@
 													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/roundBracketsButton" a:text="()"
 													   calc:textUp="("
-													   calc:textDown=")" style="@style/digit_button_style"
+													   calc:textDown=")"
+													   style="@style/digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_square_brackets_button.xml
+++ b/res/layout/calc_square_brackets_button.xml
@@ -10,5 +10,6 @@
 													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/squareBracketsButton" a:text="[]"
 													   calc:textUp="["
-													   calc:textDown="]" style="@style/digit_button_style"
+													   calc:textDown="]"
+													   style="@style/digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_vars_button.xml
+++ b/res/layout/calc_vars_button.xml
@@ -8,7 +8,7 @@

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   a:id="@+id/varsButton"
-													   a:text="π,e,…"
+													   a:text="π,…"
 													   a:textStyle="italic"
 													   a:onClick="varsButtonClickHandler"
 													   style="@style/control_button_style"/>
--- a/res/layout/vars.xml
+++ b/res/layout/vars.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    a:orientation="vertical"
+    a:layout_width="match_parent"
+    a:layout_height="match_parent">
+
+    <ListView
+        a:layout_width="match_parent"
+        a:layout_height="match_parent"
+        a:layout_weight="1"
+        a:id="@android:id/list"/>
+
+    <Button
+        a:layout_width="wrap_content"
+        a:layout_height="wrap_content"
+        a:layout_gravity="center_horizontal"
+        a:text="@string/c_add"
+		a:paddingLeft="40dp"
+		a:paddingRight="40dp"
+        a:onClick="addVarButtonClickHandler"/>
+
+</LinearLayout>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,7 +20,7 @@

 	<!--ABOUT ACTIVITY-->
 	<string name="c_copyright">Copyright (c) 2009-2011\n\n<b>Программа создана\nserso aka se.solovyev</b>\n\n
-		Эта программа бесплатна и открыта.\nИсходный код может быть найден на \n<a href="https://github.com/serso/android_calculator">http://github.com</a>\n\n
+		Эта программа с открытыми исходным кодом:\nон может быть найден на \n<a href="https://github.com/serso/android_calculator">http://github.com</a>\n\n
 		За подробной информацией, пожалуйста,\nобращайтесь на почту\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n
 		или посетите сайт \n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		Если вы хотите поддержать проект материально\nвы можете сделать это через \n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>
@@ -55,9 +55,10 @@
 	<string name="c_sys.var.cannot.be.changed">Системная переменная не может быть изменена!</string>

 	<string name="c_pi_description">Отношение длины окружности к диаметру</string>
-	<string name="c_e_description">Вещесвтенное число, такое что производная функции f(x) = e^x в точке x = 0 равно 1
-	</string>
+	<string name="c_e_description">Вещесвтенное число, такое что производная функции f(x) = e^x в точке x = 0 равно 1</string>
 	<string name="c_i_description">Мнимая единица, определённая как i^2 = −1</string>
+	<string name="c_nan_description">Не число</string>
+	<string name="c_infinity_description">Бесконечность</string>
 	<string name="c_calc_editor_hint">Введите новое выражение</string>
 	<string name="c_continue">Продолжить</string>
 	<string name="c_press_to_copy">Нажмите для копирования</string>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@

 	<!--ABOUT ACTIVITY-->
 	<string name="c_copyright">Copyright (c) 2009-2011\n\n<b>Created by serso aka se.solovyev</b>\n\n
-		This program is free and open source.\nSource code can be found on\n<a href="https://github.com/serso/android_calculator">http://github.com</a>\n\n
+		This program is open source:\nall source code can be found on\n<a href="https://github.com/serso/android_calculator">http://github.com</a>\n\n
 		For more information please\ncontact the author by email\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
 		\nor visit\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		If you want to support the project\nyou can donate money via\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>
@@ -29,8 +29,8 @@

 	<string name="c_undo">undo</string>
 	<string name="c_redo">redo</string>
-	<string name="c_clear">CE</string>
-	<string name="c_erase">C</string>
+	<string name="c_clear">clear all</string>
+	<string name="c_erase">clear</string>
 	<string name="c_paste">paste</string>
 	<string name="c_vars">vars</string>

@@ -60,6 +60,9 @@
 	<string name="c_pi_description">Ratio of any circle\'s circumference to its diameter</string>
 	<string name="c_e_description">Unique real number such that the value of the derivative (slope of the tangent line) of the function f(x) = e^x at the point x = 0 is equal to 1</string>
 	<string name="c_i_description">Imaginary unit, defined such that i^2 = −1</string>
+	<string name="c_nan_description">Not a number</string>
+	<string name="c_infinity_description">Infinity</string>
+
 	<string name="c_calc_editor_hint">Enter new expression</string>
 	<string name="c_press_to_copy">Press to copy</string>
 	<string name="c_continue">Continue</string>
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <style name="editTextInputStyle">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:typeface">monospace</item>
-    </style>
+	<style name="editTextInputStyle">
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:typeface">monospace</item>
+	</style>

-    <style name="button_style">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:focusable">true</item>
-        <item name="android:background">@drawable/button</item>
-        <item name="android:layout_marginLeft">1dp</item>
-    </style>
+	<style name="button_style">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:focusable">true</item>
+		<item name="android:textSize">20dp</item>
+		<item name="android:background">@drawable/button</item>
+		<item name="android:layout_marginLeft">1dp</item>
+	</style>

-    <style name="digit_button_style" parent="button_style">
-        <item name="android:background">@drawable/blue_button</item>
-    </style>
+	<style name="digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/blue_button</item>
+	</style>

 	<style name="control_button_style" parent="button_style"/>
-
-    <style name="button_small_style" parent="button_style">
-        <item name="android:textSize">30dp</item>
-    </style>
+	<style name="control_image_button_style" parent="control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>

 	<style name="editor_style">
-        <item name="android:textSize">25dp</item>
-        <item name="android:background">#000000</item>
-        <item name="android:textColor">@color/text_color</item>
-        <item name="android:gravity">left|top</item>
+		<item name="android:textSize">25dp</item>
+		<item name="android:background">#000000</item>
+		<item name="android:textColor">@color/text_color</item>
+		<item name="android:gravity">left|top</item>
 		<item name="android:padding">5dp</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+	</style>

-    <style name="display_style">
-        <item name="android:textSize">25dp</item>
-        <item name="android:background">#000000</item>
-        <item name="android:textColor">@color/text_color</item>
-        <item name="android:gravity">right|center_vertical</item>
+	<style name="display_style">
+		<item name="android:textSize">25dp</item>
+		<item name="android:background">#000000</item>
+		<item name="android:textColor">@color/text_color</item>
+		<item name="android:gravity">right|center_vertical</item>
 		<item name="android:padding">5dp</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+	</style>

 	<style name="about_style">
 		<item name="android:textSize">15dp</item>