Extend font size to all views (b3-2)

Jaxo · Sep 5, 2014 · b557fd2 · b557fd2
1 parent 9a40923
commit b557fd2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/android/res/layout/console.xml b/android/res/layout/console.xml
@@ -20,7 +20,7 @@
       android:layout_height="wrap_content"
       android:inputType="textMultiLine"
       android:scrollbars="vertical"
-      android:textSize="12sp"
+      android:textSize="@dimen/FontSizeNormal"
       android:textColor="#000000"
       android:background="@drawable/say"
    >

diff --git a/android/res/layout/script_editor.xml b/android/res/layout/script_editor.xml
@@ -31,7 +31,7 @@
          android:layout_height="wrap_content"
          android:hint="@string/Title"
          android:maxLines="1"
-         android:textSize="12sp" />
+         android:textSize="@dimen/FontSizeNormal"/>
 
       <ScrollView
          android:id="@+id/scroll"
@@ -49,7 +49,7 @@
             android:minLines="10"
             android:scrollHorizontally="true"
             android:scrollbars="vertical|horizontal"
-            android:textSize="12sp" />
+            android:textSize="@dimen/FontSizeNormal"/>
       </ScrollView>
    </LinearLayout>
 

diff --git a/android/res/layout/scripts_list_item.xml b/android/res/layout/scripts_list_item.xml
@@ -31,6 +31,7 @@
       android:layout_weight="10"
       android:singleLine="true"
       android:text="PI value"
+      android:textSize="@dimen/FontSizeNormal"
    />
    <TextView
       android:id="@+id/date"
@@ -39,6 +40,6 @@
       android:paddingRight="5dp"
       android:layout_gravity="bottom|right"
       android:lines="2"
-      android:text="2011/08/12 12:30"
-      android:textSize="10sp"/>
+      android:text="2011/08/12 12:30"/>
+   >
 </LinearLayout>
diff --git a/android/res/values/dimensions.xml b/android/res/values/dimensions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="FontSizeSmall">9sp</dimen>
-    <dimen name="FontSizeNormal">11sp</dimen>
-    <dimen name="FontSizeLarge">14sp</dimen>
+    <dimen name="FontSizeNormal">12sp</dimen>
+    <dimen name="FontSizeLarge">15sp</dimen>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
@@ -7,7 +7,7 @@
     <!-- name="versionname">Silverheels (#1) -->
     <!-- name="versionname">Hagerman Peak (#2) -->
     <!-- name="versionname">Horseshoe (#3) -->
-    <string name="versionname">Emerald b3-1</string>
+    <string name="versionname">Emerald b3-2</string>
     <string name="forandroid">for Android&#8482; %1$s and up</string>
     <string name="Edition">%1$s Edition"</string>
     <string name="Ok">OK</string>

diff --git a/android/src/com/jaxo/android/rexx/ZoomableText.java b/android/src/com/jaxo/android/rexx/ZoomableText.java
@@ -60,7 +60,8 @@ class PinchZoomer extends ScaleGestureDetector.SimpleOnScaleGestureListener
 
       PinchZoomer(Context context) {
          m_scale = 1.f;
-         m_baseSize = getTextSize();
+         m_baseSize = Preferences.getTextSizeInSp(context);
+         setTextSize(m_baseSize);
          m_detector = new ScaleGestureDetector(context, this);
       }
       public boolean onTouchEvent(MotionEvent event) {