From 47aa4b55c317519d3aa8ddf192f0571982b7c0ad Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Tue, 1 Nov 2011 15:04:27 +0400
Subject: [PATCH] Auto adjusted result = fix for Xperia Ray

---
 res/layout/calc_display.xml                           |  5 +----
 res/layout/calc_editor.xml                            |  1 -
 res/values-hdpi/styles.xml                            |  2 +-
 res/values-ldpi/styles.xml                            |  2 +-
 res/values-mdpi/styles.xml                            |  2 +-
 res/values/styles-common.xml                          |  2 +-
 res/values/styles.xml                                 |  2 +-
 .../android/calculator/CalculatorDisplay.java         | 11 +++++++++--
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/res/layout/calc_display.xml b/res/layout/calc_display.xml
index 4660891d..b843dfdc 100644
--- a/res/layout/calc_display.xml
+++ b/res/layout/calc_display.xml
@@ -10,8 +10,5 @@
 		xmlns:a="http://schemas.android.com/apk/res/android"
 		a:id="@+id/calculatorDisplay"
 		style="@style/display_style"
-		a:minLines="1"
-		a:maxLines="1"
-		a:textStyle="bold"
 		a:scrollHorizontally="true"
-		a:scrollbars="none"/>
\ No newline at end of file
+		a:scrollbars="horizontal"/>
\ No newline at end of file
diff --git a/res/layout/calc_editor.xml b/res/layout/calc_editor.xml
index 71790b5d..af5992f6 100644
--- a/res/layout/calc_editor.xml
+++ b/res/layout/calc_editor.xml
@@ -15,7 +15,6 @@
 			a:id="@+id/calculatorEditor"
 			style="@style/editor_style"
 			a:inputType="textMultiLine"
-			a:maxLines="4"
 			a:scrollbars="vertical"
 			a:hint ="@string/c_calc_editor_hint"/>
 
diff --git a/res/values-hdpi/styles.xml b/res/values-hdpi/styles.xml
index 5491e63d..276197f4 100644
--- a/res/values-hdpi/styles.xml
+++ b/res/values-hdpi/styles.xml
@@ -17,7 +17,7 @@
 
 	<style name="display_style_parent" parent="default_text">
 		<item name="android:textSize">25dp</item>
-		<item name="android:padding">5dp</item>
+		<item name="android:padding">3dp</item>
 	</style>
 
 	<style name="editor_style_parent" parent="default_text">
diff --git a/res/values-ldpi/styles.xml b/res/values-ldpi/styles.xml
index 34421468..0b4b67f4 100644
--- a/res/values-ldpi/styles.xml
+++ b/res/values-ldpi/styles.xml
@@ -17,7 +17,7 @@
 
 	<style name="display_style_parent" parent="default_text">
 		<item name="android:textSize">35dp</item>
-		<item name="android:padding">5dp</item>
+		<item name="android:padding">3dp</item>
 	</style>
 
 	<style name="editor_style_parent" parent="default_text">
diff --git a/res/values-mdpi/styles.xml b/res/values-mdpi/styles.xml
index 0c493212..d9050a1c 100644
--- a/res/values-mdpi/styles.xml
+++ b/res/values-mdpi/styles.xml
@@ -17,7 +17,7 @@
 
 	<style name="display_style_parent" parent="default_text">
 		<item name="android:textSize">30dp</item>
-		<item name="android:padding">5dp</item>
+		<item name="android:padding">3dp</item>
 	</style>
 
 	<style name="editor_style_parent" parent="default_text">
diff --git a/res/values/styles-common.xml b/res/values/styles-common.xml
index 624d8e96..c4862a86 100644
--- a/res/values/styles-common.xml
+++ b/res/values/styles-common.xml
@@ -58,7 +58,7 @@
 	</style>
 
 	<style name="display_style" parent="display_style_parent">
-		<item name="android:gravity">right|center_vertical</item>
+		<item name="android:gravity">center_vertical|right</item>
 		<item name="android:layout_width">fill_parent</item>
 		<item name="android:layout_height">fill_parent</item>
 	</style>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5491e63d..276197f4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
 
 	<style name="display_style_parent" parent="default_text">
 		<item name="android:textSize">25dp</item>
-		<item name="android:padding">5dp</item>
+		<item name="android:padding">3dp</item>
 	</style>
 
 	<style name="editor_style_parent" parent="default_text">
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java b/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
index 443fb038..869d173e 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
@@ -10,18 +10,18 @@ import android.graphics.Color;
 import android.text.Html;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.widget.TextView;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.calculator.model.ParseException;
 import org.solovyev.android.calculator.model.TextProcessor;
+import org.solovyev.android.view.AutoResizeTextView;
 
 /**
  * User: serso
  * Date: 9/17/11
  * Time: 10:58 PM
  */
-public class CalculatorDisplay extends TextView {
+public class CalculatorDisplay extends AutoResizeTextView {
 
 	private boolean valid = true;
 
@@ -83,6 +83,13 @@ public class CalculatorDisplay extends TextView {
 			Log.d(this.getClass().getName(), text);
 			super.setText(Html.fromHtml(text), BufferType.EDITABLE);
 		}
+
+		// todo serso: think where to move it (keep in mind org.solovyev.android.view.AutoResizeTextView.resetTextSize())
+		setAddEllipsis(false);
+		setMinTextSize(10);
+		setMaxTextSize(70);
+		setTextSize(70);
+		resizeText();
 	}
 
 }