fixed line height size

Author: Salvatore Ranieri

html-textview-master/HtmlSpanner/src/main/java/net/nightwhistler/htmlspanner/HtmlSpanner.java

@@ -71,7 +71,7 @@ public class HtmlSpanner {
      * Temporary constant for the width of 1 horizontal em
      * Used for calculating margins.
      */
-    public static final int HORIZONTAL_EM_WIDTH = 5;
+    public static final int HORIZONTAL_EM_WIDTH = 10;
 
 
     private Map<String, TagNodeHandler> handlers;
@@ -88,6 +88,8 @@ public class HtmlSpanner {
 
     private float textSize;
 
+    private boolean textAlignCenter;
+
     /**
      * Switch to determine if CSS is used
      */
@@ -298,7 +300,7 @@ public Spannable fromHtml(String html) {
                html=replaceHtmlTags(html);
             }
         }
-        Log.i("HTML_UPDATE",html);
+        Log.i("HTML_UPDATE_1",html);
         return fromTagNode(this.htmlCleaner.clean(html), null);
     }
 

html-textview-master/HtmlSpanner/src/main/java/net/nightwhistler/htmlspanner/spans/LineHeightSpanImpl.java

@@ -33,26 +33,31 @@ public void chooseHeight(CharSequence text, int start, int end, int spanstartv,
         Log.i("fmTop",""+fm.top);
         Log.i("fmBottom",""+fm.bottom);
 
-        if(ascent==0&&descent==0){
-
-            int top = Math.abs(fm.top)-Math.abs(fm.ascent);
-            int bottom= Math.abs(fm.bottom)-Math.abs(fm.descent);
-            int lineHeight = Math.abs(fm.ascent)-fm.descent;
-
-            mSize = mSize-lineHeight > 0 ? mSize-lineHeight : 0;
-
-            Log.i("mSize",""+mSize);
-
-            ascent=fm.top -= mSize/2;
-            descent=fm.bottom += mSize/2;
-
-            fm.top -= top;
-            fm.bottom += bottom;
-        }
-
-        if(mSize > 0) {
-            fm.ascent = ascent;
-            fm.descent = descent;
+        if (fm.descent > mSize) {
+            // Show as much descent as possible
+            fm.bottom = fm.descent = Math.min(mSize, fm.descent);
+            fm.top = fm.ascent = 0;
+        } else if (-fm.ascent + fm.descent > mSize) {
+            // Show all descent, and as much ascent as possible
+            fm.bottom = fm.descent;
+            fm.top = fm.ascent = -mSize + fm.descent;
+        } else if (-fm.ascent + fm.bottom > mSize) {
+            // Show all ascent, descent, as much bottom as possible
+            fm.top = fm.ascent;
+            fm.bottom = fm.ascent + mSize;
+        } else if (-fm.top + fm.bottom > mSize) {
+            // Show all ascent, descent, bottom, as much top as possible
+            fm.top = fm.bottom - mSize;
+        } else {
+            // Show proportionally additional ascent / top & descent / bottom
+            final int additional = mSize - (-fm.top + fm.bottom);
+
+            // Round up for the negative values and down for the positive values  (arbritary choice)
+            // So that bottom - top equals additional even if it's an odd number.
+            fm.top -= Math.ceil(additional / 2.0f);
+            fm.bottom += Math.floor(additional / 2.0f);
+            fm.ascent = fm.top;
+            fm.descent = fm.bottom;
         }
     }
 

html-textview-master/HtmlSpanner/src/main/java/net/nightwhistler/htmlspanner/style/StyleCallback.java

@@ -1,8 +1,10 @@
 package net.nightwhistler.htmlspanner.style;
 
+import android.content.res.Resources;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.*;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import net.nightwhistler.htmlspanner.FontFamily;
 import net.nightwhistler.htmlspanner.HtmlSpanner;
@@ -26,6 +28,8 @@ public class StyleCallback implements SpanCallback {
     private FontFamily defaultFont;
     private Style useStyle;
 
+    private static final float SCREEN_DENSITY=(Resources.getSystem().getDisplayMetrics().densityDpi)/ DisplayMetrics.DENSITY_DEFAULT;
+
     public StyleCallback( FontFamily defaultFont, Style style, int start, int end ) {
         this.defaultFont = defaultFont;
         this.useStyle = style;
@@ -78,7 +82,7 @@ public void applySpan(HtmlSpanner spanner, SpannableStringBuilder builder) {
         //If there's a line height, we use an implementation of LineHeightSpan to draw space behind the text
         if ( useStyle.getLineHeight() != null) {
             //Log.d("StyleCallback", "Applying LineHeightSpan with value " + useStyle.getLineHeight().getIntValue() + " from " + start + " to " + end + " on text " + builder.subSequence(start, end));
-            builder.setSpan(new LineHeightSpanImpl(useStyle.getLineHeight().getIntValue()),start,end,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            builder.setSpan(new LineHeightSpanImpl((int)Math.ceil(useStyle.getLineHeight().getIntValue() * SCREEN_DENSITY)),start,end,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
         //If there is a border, the BorderSpan will also draw the background colour if needed.

html-textview-master/example/src/main/assets/example.html

@@ -1 +1 @@
-<h1>That's a header 1</h1><h2>That's a header 2</h2><h3>That's a header 3</h3><h4>That's a header 4</h4><h5>That's a header 5</h5><h6>That's a header 6</h6>NomeCognome<br />MarioRossi<div style="text-align:center">Some text displayed in center position into a paragraph <span style="background-color:blue; color:white">other text</span> (<code>span</code> markup used);<br /><big>big thing</big> (<code>big</code> markup used)<br /><small>this is not that important</small> (<code>small</code> markup used)<br />this is <em>very</em> simple (<code>em</code> markup used for emphasizing a word)<br /><cite>Origin of Species</cite> (a book title;<code>cite</code> markup used)<br /><em>Homo sapiens</em> (should appear in italics; <code>i</code> markup used)<br /><br /><strong>bolded</strong> (<code>b</code> markup used - just bolding with unspecified semantics)<div style="line-height:24px"><br />&nbsp;</div><tt>text in monospace font</tt> (<code>tt</code> markup used)<br /><u>underlined</u> text (<code>u</code> markup used)<br /><strong>bolded</strong> (<code>strong</code> markup used)<ul><li>Test: <span>large size</span> (<code>font size=30px</code> markup used)</li><li>Test: <span style="color:red">red text</span> (<code>font color=red</code> markup used)</li></ul>a<sub>B</sub> (<code>sub</code> markup used)<br />a<sup>C</sup> (<code>sup</code> markup used)</div><ol><li>list element 1</li><li>list element 2</li></ol><div style="line-height:50px">that's a div body and a line-height<br />with a <code>br</code> inside and a font styling<br /><span style="font-size:30px">large size</span> (<code>style=&quot;font-size:30px&quot;</code> markup used)<br /><span style="font-family:Courier">Courier font</span> (<code>style=&quot;font-family:Courier&quot;</code> markup used)<br /><span style="color:red">red text</span> (<code>style=&quot;color:red&quot;</code> markup used)<br /><em>italic text</em> (<code>style=&quot;font-style:italic&quot;</code> markup used)<p style="text-align:left">left text</p><p style="text-align:center">centered text</p><p style="text-align:right">right text</p>deleted text</div>
+<h1>That's a header 1</h1><h2>That's a header 2</h2><h3>That's a header 3</h3><h4>That's a header 4</h4><h5>That's a header 5</h5><h6>That's a header 6</h6>NomeCognome<br />MarioRossi<div style="line-height:30px">Some text displayed in center position into a paragraph <span style="background-color:blue; color:white">other text</span> (<code>span</code> markup used);<br /><big>big thing</big> (<code>big</code> markup used)<br /><small>this is not that important</small> (<code>small</code> markup used)<br />this is <em>very</em> simple (<code>em</code> markup used for emphasizing a word)<br /><cite>Origin of Species</cite> (a book title;<code>cite</code> markup used)<br /><em>Homo sapiens</em> (should appear in italics; <code>i</code> markup used)<br /><br /><strong>bolded</strong> (<code>b</code> markup used - just bolding with unspecified semantics)<div style="line-height:24px"><br />&nbsp;</div><tt>text in monospace font</tt> (<code>tt</code> markup used)<br /><u>underlined</u> text (<code>u</code> markup used)<br /><strong>bolded</strong> (<code>strong</code> markup used)<ul><li>Test: <span>large size</span> (<code>font size=30px</code> markup used)</li><li>Test: <span style="color:red">red text</span> (<code>font color=red</code> markup used)</li></ul>a<sub>B</sub> (<code>sub</code> markup used)<br />a<sup>C</sup> (<code>sup</code> markup used)</div><ol style="list-style-position:inside;"><li>list element 1</li><li>list element 2</li></ol><div style="line-height:50px">that's a div body and a line-height<br />with a <code>br</code> inside and a font styling<br /><span style="font-size:30px">large size</span> (<code>style=&quot;font-size:30px&quot;</code> markup used)<br /><span style="font-family:Courier">Courier font</span> (<code>style=&quot;font-family:Courier&quot;</code> markup used)<br /><span style="color:red">red text</span> (<code>style=&quot;color:red&quot;</code> markup used)<br /><em>italic text</em> (<code>style=&quot;font-style:italic&quot;</code> markup used)<p style="text-align:left">left text</p><p style="text-align:center">centered text</p><p style="text-align:right">right text</p>deleted text</div>

html-textview-master/example/src/main/java/org/sufficientlysecure/htmltextview/example/MainActivity.java

@@ -18,9 +18,13 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.Paint;
 import android.os.Bundle;
+import android.text.Layout;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
 import android.widget.TextView;
 
 import net.nightwhistler.htmlspanner.HtmlSpanner;