From 538e0933cad5d0a7d0bbfe3fc5edd862c3748e7a Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Tue, 27 Dec 2011 11:28:57 +0400
Subject: [PATCH] fixes for android4

---
 AndroidManifest.xml                                      | 4 ++--
 res/values-ru/text_about.xml                             | 7 ++++++-
 res/values/text_about.xml                                | 5 +++++
 .../solovyev/android/calculator/CalculatorEditor.java    | 9 ++++++---
 .../calculator/about/CalculatorReleaseNotesActivity.java | 2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c7f23a7..d80ff689 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
 		  package="org.solovyev.android.calculator"
 		  a:installLocation="auto"
-		  a:versionCode="21"
-		  a:versionName="1.2.21">
+		  a:versionCode="23"
+		  a:versionName="1.2.23">
 
 	<uses-permission a:name="android.permission.VIBRATE"/>
 
diff --git a/res/values-ru/text_about.xml b/res/values-ru/text_about.xml
index 664f0ce9..571cea9e 100644
--- a/res/values-ru/text_about.xml
+++ b/res/values-ru/text_about.xml
@@ -118,11 +118,16 @@
 
 	<string name="c_release_notes_for_21">
 		1. Добавлен экран примечаний к выпуску\n
-		2. Добавлены категории функция и переменных\n
+		2. Добавлены категории функций и переменных\n
 		3. Добавлены дополнительные действия для функций, операторов и переменных - контекстное меню вызывается долгим нажатием по элементу\n
 		4. Добавлен логарифм по любому основанию\n
 		5. Настройка кнопки Назад\n
 		6. Вариант константы π независимой от единиц измерения углов
 	</string>
 
+	<string name="c_release_notes_for_22">
+		1. Исправлена проблема с отсутствием курсора на устройствах с андроидом 3 и выше\n
+		2. Исправлена проблема с заменой 3.14... на Π
+	</string>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/text_about.xml b/res/values/text_about.xml
index b700cf40..1f482bbd 100644
--- a/res/values/text_about.xml
+++ b/res/values/text_about.xml
@@ -125,4 +125,9 @@
 		6. Variant of π constant independent from angle units
 	</string>
 
+	<string name="c_release_notes_for_22">
+		1. Fix for missing cursor in Android 3 and higher\n
+		2. Fix for substituting 3.14... with Π constant
+	</string>
+
 </resources>
\ No newline at end of file
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java b/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
index 22126f0d..9e659742 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
@@ -50,16 +50,19 @@ public class CalculatorEditor extends EditText implements SharedPreferences.OnSh
 
 	@Override
 	public boolean onCheckIsTextEditor() {
-		// fix for missing cursor in android
+		// Main goal of this implementation is to hide android soft keyboard from appearing when working with text input
+
+		// todo serso: refactor
+		// NOTE: do not copy or reuse code below, it's completely SHIT!!!
+
 		if ( Build.VERSION.SDK_INT >= 11 ) {
-			// cannot be applied as in that case soft keyboard appears on application start
+			// fix for missing cursor in android 3 and higher
 			for (StackTraceElement stackTraceElement : CollectionsUtils.asList(Thread.currentThread().getStackTrace())) {
 				if ( "isCursorVisible".equals(stackTraceElement.getMethodName()) ) {
 					return true;
 				}
 			}
 			return false;
-			//return true;
 		} else {
 			return false;
 		}
diff --git a/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java b/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
index 7aa4cd44..58e75dcb 100644
--- a/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
@@ -64,7 +64,7 @@ public class CalculatorReleaseNotesActivity extends Activity {
 					first = false;
 				}
 				releaseNotesForVersion = releaseNotesForVersion.replace("\n", "<br/>");
-				result.append("<b>").append(releaseNotesForTitle).append(i).append("</b><br/>");
+				result.append("<b>").append(releaseNotesForTitle).append(i).append("</b><br/><br/>");
 				result.append(releaseNotesForVersion);
 			}
 		}