@nativescript-community/ui-label 1.2.1 → 1.2.5

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.5](https://github.com/nativescript-community/ui-label/compare/v1.2.4...v1.2.5) (2022-02-09)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.4](https://github.com/nativescript-community/ui-label/compare/v1.2.3...v1.2.4) (2022-01-14)
+
+
+### Bug Fixes
+
+* uglify fix ([f04189f](https://github.com/nativescript-community/ui-label/commit/f04189f9838615d4eb037a6423fd245538860358))
+
+
+
+
+
+## [1.2.3](https://github.com/nativescript-community/ui-label/compare/v1.2.2...v1.2.3) (2022-01-13)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.2](https://github.com/nativescript-community/ui-label/compare/v1.2.1...v1.2.2) (2022-01-08)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
 ## [1.2.1](https://github.com/nativescript-community/ui-label/compare/v1.2.0...v1.2.1) (2022-01-02)
 
 **Note:** Version bump only for package @nativescript-community/ui-label

package/label-common.js

@@ -9,15 +9,6 @@ import { layout } from '@nativescript/core/utils/utils';
 // }
 // init text to ensure font overrides are called
 init();
-// const CHILD_SPAN = 'Span';
-// const CHILD_FORMATTED_TEXT = 'formattedText';
-// const CHILD_FORMATTED_STRING = 'FormattedString';
-// FormattedString.prototype.addPropertyChangeHandler = function (span: Span) {
-//     span.on(Observable.propertyChangeEvent, this.onPropertyChange, this);
-// };
-// FormattedString.prototype.removePropertyChangeHandler = function (span: Span) {
-//     span.off(Observable.propertyChangeEvent, this.onPropertyChange, this);
-// };
 export const needFormattedStringComputation = function (target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = function (...args) {

package/label.android.d.ts

@@ -42,7 +42,7 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
     linkUnderline: boolean;
     html: string;
     selectable: boolean;
-    _isSingleLine: boolean;
+    mIsSingleLine: boolean;
     text: string;
     formattedText: FormattedString;
     get nativeTextViewProtected(): any;
@@ -76,10 +76,13 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
 }
 export declare class Label extends LabelBase {
     nativeViewProtected: com.nativescript.label.EllipsizingTextView;
-    handleFontSize: boolean;
+    mHandleFontSize: boolean;
+    private mAutoFontSize;
     private _defaultMovementMethod;
     get nativeTextViewProtected(): com.nativescript.label.EllipsizingTextView;
     createNativeView(): com.nativescript.label.EllipsizingTextView;
+    private enableAutoSize;
+    private disableAutoSize;
     createFormattedTextNative(value: any): any;
     createHTMLString(): globalAndroid.text.SpannableStringBuilder;
     _tappable: boolean;

package/label.android.js

@@ -12,9 +12,7 @@ export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript
 export * from './label-common';
 const sdkVersion = lazy(() => parseInt(Device.sdkVersion, 10));
 let TextView;
-const CHILD_SPAN = 'Span';
 const CHILD_FORMATTED_TEXT = 'formattedText';
-const CHILD_FORMATTED_STRING = 'FormattedString';
 const resetSymbol = Symbol('textPropertyDefault');
 var SuspendType;
 (function (SuspendType) {
@@ -159,7 +157,7 @@ let LabelBase = class LabelBase extends View {
         }
     }
     _addChildFromBuilder(name, value) {
-        if (name === CHILD_SPAN) {
+        if (name === Span.name) {
             if (!this.formattedText) {
                 let formattedText;
                 if (overrideSpanAndFormattedStringEnabled) {
@@ -176,7 +174,7 @@ let LabelBase = class LabelBase extends View {
                 this.formattedText.spans.push(value);
             }
         }
-        else if (name === CHILD_FORMATTED_TEXT || name === CHILD_FORMATTED_STRING) {
+        else if (name === CHILD_FORMATTED_TEXT || name === FormattedString.name) {
             this.formattedText = value;
             value.parent = this;
         }
@@ -269,7 +267,8 @@ LabelBase = __decorate([
 export class Label extends LabelBase {
     constructor() {
         super(...arguments);
-        this.handleFontSize = true;
+        this.mHandleFontSize = true;
+        this.mAutoFontSize = false;
         this._tappable = false;
     }
     get nativeTextViewProtected() {
@@ -359,7 +358,7 @@ export class Label extends LabelBase {
     }
     [textAlignmentProperty.setNative](value) {
         const view = this.nativeTextViewProtected;
-        if (android.os.Build.VERSION.SDK_INT >= 25) {
+        if (android.os.Build.VERSION.SDK_INT >= 26) {
             if (value === 'justify') {
                 view.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_INTER_WORD);
             }
@@ -382,12 +381,20 @@ export class Label extends LabelBase {
         }
     }
     [fontSizeProperty.setNative](value) {
+        // setTextSize is ignored if autoFontSize is enabled
+        // so we need to disable autoFontSize just to set textSize
+        if (this.mAutoFontSize) {
+            this.disableAutoSize();
+        }
         if (typeof value === 'number') {
             this.nativeTextViewProtected.setTextSize(value);
         }
         else {
             this.nativeTextViewProtected.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, value.nativeSize);
         }
+        if (this.mAutoFontSize) {
+            this.enableAutoSize();
+        }
     }
     [lineHeightProperty.setNative](value) {
         if (sdkVersion() >= 28) {
@@ -452,12 +459,19 @@ export class Label extends LabelBase {
     [paddingLeftProperty.setNative](value) {
         org.nativescript.widgets.ViewHelper.setPaddingLeft(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0));
     }
+    enableAutoSize() {
+        androidx.core.widget.TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this.nativeView, this.minFontSize || 10, this.maxFontSize || 200, this.autoFontSizeStep || 1, android.util.TypedValue.COMPLEX_UNIT_DIP);
+    }
+    disableAutoSize() {
+        androidx.core.widget.TextViewCompat.setAutoSizeTextTypeWithDefaults(this.nativeView, androidx.core.widget.TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE);
+    }
     [autoFontSizeProperty.setNative](value) {
+        this.mAutoFontSize = value;
         if (value) {
-            androidx.core.widget.TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this.nativeView, this.minFontSize || 10, this.maxFontSize || 200, this.autoFontSizeStep || 1, android.util.TypedValue.COMPLEX_UNIT_DIP);
+            this.enableAutoSize();
         }
         else {
-            androidx.core.widget.TextViewCompat.setAutoSizeTextTypeWithDefaults(this.nativeView, androidx.core.widget.TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE);
+            this.disableAutoSize();
         }
     }
     [selectableProperty.setNative](value) {

package/label.ios.d.ts

@@ -39,5 +39,12 @@ export declare class Label extends LabelBase {
     setFormattedTextDecorationAndTransform(): void;
     fontSizeRatio: number;
     _lastAutoSizeKey: string;
-    textViewDidChange(textView: UITextView, width?: any, height?: any, force?: boolean): void;
+    updateAutoFontSize({ textView, width, height, force, onlyMeasure }: {
+        textView: UITextView;
+        width?: any;
+        height?: any;
+        force?: boolean;
+        onlyMeasure?: boolean;
+    }): any;
+    textViewDidChange(textView: UITextView): void;
 }

package/label.ios.js

@@ -79,7 +79,7 @@ var LabelUITextViewDelegateImpl = /** @class */ (function (_super) {
     LabelUITextViewDelegateImpl.prototype.textViewDidChange = function (textView) {
         var owner = this._owner.get();
         if (owner) {
-            owner.textViewDidChange(textView, undefined, undefined, true);
+            owner.textViewDidChange(textView);
         }
     };
     LabelUITextViewDelegateImpl.ObjCProtocols = [UITextViewDelegate];
@@ -252,14 +252,23 @@ export class Label extends LabelBase {
             const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
             const height = layout.getMeasureSpecSize(heightMeasureSpec);
             const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
+            let resetFont;
             if (this.autoFontSize) {
                 const finiteWidth = widthMode === layout.EXACTLY;
                 const finiteHeight = heightMode === layout.EXACTLY;
                 if (!finiteWidth || !finiteHeight) {
-                    this.textViewDidChange(nativeView, layout.toDeviceIndependentPixels(width), layout.toDeviceIndependentPixels(height));
+                    resetFont = this.updateAutoFontSize({
+                        textView: nativeView,
+                        width: layout.toDeviceIndependentPixels(width),
+                        height: layout.toDeviceIndependentPixels(height),
+                        onlyMeasure: true
+                    });
                 }
             }
             const desiredSize = layout.measureNativeView(nativeView, width, widthMode, height, heightMode);
+            if (resetFont) {
+                nativeView.font = resetFont;
+            }
             const labelWidth = widthMode === layout.AT_MOST ? Math.min(desiredSize.width, width) : desiredSize.width;
             // const labelHeight = heightMode === layout.AT_MOST ? Math.min(desiredSize.height, height) : desiredSize.height;
             const measureWidth = Math.max(labelWidth, this.effectiveMinWidth);
@@ -272,7 +281,7 @@ export class Label extends LabelBase {
     _onSizeChanged() {
         super._onSizeChanged();
         if (this.autoFontSize) {
-            this.textViewDidChange(this.nativeTextViewProtected);
+            this.updateAutoFontSize({ textView: this.nativeTextViewProtected });
         }
     }
     // _htmlTappable = false;
@@ -634,22 +643,24 @@ export class Label extends LabelBase {
             }
         }
     }
-    textViewDidChange(textView, width, height, force = false) {
+    updateAutoFontSize({ textView, width, height, force = false, onlyMeasure = false }) {
+        let currentFont;
         if (textView && this.autoFontSize) {
             if ((!textView.attributedText && !textView.text) ||
                 (width === undefined && height === undefined && CGSizeEqualToSize(textView.bounds.size, CGSizeZero))) {
-                return;
+                return currentFont;
             }
             const textViewSize = textView.frame.size;
             const fixedWidth = Math.floor(width !== undefined ? width : textViewSize.width);
             const fixedHeight = Math.floor(height !== undefined ? height : textViewSize.height);
             if (fixedWidth === 0 || fixedHeight === 0) {
-                return;
+                return currentFont;
             }
             const autoSizeKey = fixedWidth + '_' + fixedHeight;
             if (!force && autoSizeKey === this._lastAutoSizeKey) {
-                return;
+                return null;
             }
+            currentFont = textView.font;
             this._lastAutoSizeKey = autoSizeKey;
             const nbLines = textView.textContainer.maximumNumberOfLines;
             // we need to reset verticalTextAlignment or computation will be wrong
@@ -713,14 +724,20 @@ export class Label extends LabelBase {
                     }
                 }
             }
-            this.fontSizeRatio = expectFont.pointSize / fontSize;
+            if (!onlyMeasure) {
+                this.fontSizeRatio = expectFont.pointSize / fontSize;
+            }
             this.updateTextContainerInset();
         }
+        return currentFont;
+    }
+    textViewDidChange(textView) {
+        this.updateAutoFontSize({ textView, force: true });
     }
     [autoFontSizeProperty.setNative](value) {
         if (value) {
             if (this.isLayoutValid && (this.text || this.html || this.formattedText)) {
-                this.textViewDidChange(this.nativeTextViewProtected, undefined, undefined, true);
+                this.updateAutoFontSize({ textView: this.nativeTextViewProtected, force: true });
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.1",
+    "version": "1.2.5",
     "description": "Alternative to the built-in NativeScript Label but with better performance and additional features such as HTML rendering and more.",
     "main": "./label",
     "sideEffects": false,
@@ -32,7 +32,7 @@
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/text": "^1.4.29"
+        "@nativescript-community/text": "^1.4.32"
     },
-    "gitHead": "9a124d1823a131d3a2cf1753a661b6984b562b7f"
+    "gitHead": "7af7ba4fd7ec88e0d42ec3e36e3497e318f4cb37"
 }

package/platforms/android/java/com/nativescript/label/EllipsizingTextView.java

@@ -1,497 +0,0 @@
-package com.nativescript.label;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.text.Layout;
-import android.text.Layout.Alignment;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.StaticLayout;
-import android.text.TextUtils;
-import android.text.TextUtils.TruncateAt;
-import android.text.style.ForegroundColorSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatTextView;
-
-/**
- * A {@link android.widget.TextView} that ellipsizes more intelligently.
- * This class supports ellipsizing multiline text through setting {@code android:ellipsize}
- * and {@code android:maxLines}.
- * <p/>
- * Note: {@link android.text.TextUtils.TruncateAt#MARQUEE} ellipsizing type is not supported.
- * <p>
- * 学习戚继光，一边儿读别人的源码，一边儿做笔记
- */
-public class EllipsizingTextView extends AppCompatTextView {
-    public static final int ELLIPSIZE_ALPHA = 0x88;
-    private SpannableString ELLIPSIS = new SpannableString("\u2026");
-
-    private static final Pattern DEFAULT_END_PUNCTUATION
-            = Pattern.compile("[\\.!?,;:\u2026]*$", Pattern.DOTALL);
-
-    private final List<EllipsizeListener> mEllipsizeListeners = new ArrayList<>();
-
-    private EllipsizeStrategy mEllipsizeStrategy;
-
-    private boolean isEllipsized;
-
-    //In order to be the reset method only needs to be called once
-    private boolean isStale;
-
-    //The entry used to determine the call setText () is RESETTEXT or otherwhere call, this practice is cool.
-    private boolean programmaticChange;
-
-    //text
-    private CharSequence mFullText;
-    private int mMaxLines;
-
-    //The line spacing, this point is considered, great.
-    private float mLineSpacingMult = 1.0f;
-    private float mLineAddVertPad = 0.0f;
-
-
-    private boolean wordWrap = true;
-    private float minTextSize = 20;
-    private float maxTextSize = 30;
-
-    /**
-     * The end punctuation which will be removed when appending {@link #ELLIPSIS}.
-     */
-    private Pattern mEndPunctPattern;
-
-    public EllipsizingTextView(Context context) {
-        this(context, null);
-    }
-
-
-    public EllipsizingTextView(Context context, AttributeSet attrs) {
-        this(context, attrs, android.R.attr.textViewStyle);
-    }
-
-
-    public EllipsizingTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                new int[]{android.R.attr.maxLines, android.R.attr.ellipsize}, defStyle, 0);
-        setMaxLines(a.getInt(0, Integer.MAX_VALUE));
-        a.recycle();
-        setEndPunctuationPattern(DEFAULT_END_PUNCTUATION);
-        maxTextSize = this.getTextSize();
-        if (maxTextSize < 35) {
-            maxTextSize = 30;
-        }
-        super.setSingleLine(false);
-    }
-
-    public void setEndPunctuationPattern(Pattern pattern) {
-        mEndPunctPattern = pattern;
-    }
-
-    @SuppressWarnings("unused")
-    public void addEllipsizeListener(@NonNull EllipsizeListener listener) {
-        mEllipsizeListeners.add(listener);
-    }
-
-    @SuppressWarnings("unused")
-    public void removeEllipsizeListener(@NonNull EllipsizeListener listener) {
-        mEllipsizeListeners.remove(listener);
-    }
-
-    @SuppressWarnings("unused")
-    public boolean isEllipsized() {
-        return isEllipsized;
-    }
-
-    /**
-     * @return The maximum number of lines displayed in this {@link android.widget.TextView}.
-     */
-    public int getMaxLines() {
-        return mMaxLines;
-    }
-
-    @Override
-    public void setMaxLines(int maxLines) {
-        super.setMaxLines(maxLines);
-        // super.setMaxLines((maxLines == 0) ? Integer.MAX_VALUE : maxLines);
-        // if (maxLines == Integer.MAX_VALUE) {
-        //     maxLines = 0;
-        // }
-        // // super.setMaxLines((maxLines == 0) ? Integer.MAX_VALUE : maxLines);
-        mMaxLines = maxLines;
-        isStale = true;
-    }
-
-    public float getMinTextSize() {
-        return minTextSize;
-    }
-
-    public void setMinTextSize(float minTextSize) {
-        this.minTextSize = minTextSize;
-    }
-
-    public float getMaxTextSize() {
-        return maxTextSize;
-    }
-
-    public void setMaxTextSize(float minTextSize) {
-        this.maxTextSize = minTextSize;
-    }
-
-    /**
-     * Determines if the last fully visible line is being ellipsized.
-     *
-     * @return {@code true} if the last fully visible line is being ellipsized;
-     * otherwise, returns {@code false}.
-     */
-    public boolean ellipsizingLastFullyVisibleLine() {
-        return mMaxLines == Integer.MAX_VALUE;
-    }
-
-    @Override
-    public void setLineSpacing(float add, float mult) {
-        mLineAddVertPad = add;
-        mLineSpacingMult = mult;
-        super.setLineSpacing(add, mult);
-    }
-
-    @Override
-    public void setText(CharSequence text, BufferType type) {
-        if (!programmaticChange) {//Distribution source
-            mFullText = text instanceof Spanned ? (Spanned) text : text;
-            isStale = true;
-        }
-        super.setText(text, type);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int w = View.MeasureSpec.getSize(widthMeasureSpec);
-        // int wm = MeasureSpec.getMode(widthMeasureSpec);
-        int h = View.MeasureSpec.getSize(heightMeasureSpec);
-        int hm = View.MeasureSpec.getMode(heightMeasureSpec);
-        if (hm == 0)
-            h = 100000;
-        if ((hm == View.MeasureSpec.AT_MOST || hm == View.MeasureSpec.UNSPECIFIED)
-                && (mFullText == null || mFullText.length() == 0)) {
-            heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.EXACTLY);
-        }
-
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        if (ellipsizingLastFullyVisibleLine()) {//Rigorous, learning
-            isStale = true;
-        }
-    }
-
-    @Override
-    public void setPadding(int left, int top, int right, int bottom) {
-        super.setPadding(left, top, right, bottom);
-        if (ellipsizingLastFullyVisibleLine()) {//Rigorous, learning
-            isStale = true;
-        }
-    }
-
-    @Override
-    protected void onDraw(@NonNull Canvas canvas) {
-        if (isStale) {
-            resetText();
-        }
-        super.onDraw(canvas);
-    }
-
-    /**
-     * Sets the ellipsized text if appropriate.
-     */
-    private void resetText() {
-        int maxLines = getMaxLines();
-        CharSequence workingText = mFullText;
-        boolean ellipsized = false;
-
-        if (maxLines != -1) {
-            if (mEllipsizeStrategy == null) setEllipsize(null);
-            workingText = mEllipsizeStrategy.processText(mFullText);
-            ellipsized = !mEllipsizeStrategy.isInLayout(mFullText);
-        }
-
-        if (!workingText.equals(getText())) {//Avoid useless operations
-            programmaticChange = true;
-            try {
-                setText(workingText);
-            } finally {
-                programmaticChange = false;
-            }
-        }
-
-        isStale = false;//Switch status
-
-        //Notification listener
-        if (ellipsized != isEllipsized) {
-            isEllipsized = ellipsized;
-            for (EllipsizeListener listener : mEllipsizeListeners) {
-                listener.ellipsizeStateChanged(ellipsized);
-            }
-        }
-    }
-
-    /**
-     * Causes words in the text that are longer than the view is wide to be ellipsized
-     * instead of broken in the middle. Use {@code null} to turn off ellipsizing.
-     * <p/>
-     * Note: Method does nothing for {@link android.text.TextUtils.TruncateAt#MARQUEE}
-     * ellipsizing type.
-     *
-     * @param where part of text to ellipsize
-     */
-    @Override
-    public void setEllipsize(TruncateAt where) {
-        if (where == null) {
-            mEllipsizeStrategy = new EllipsizeNoneStrategy();
-            return;
-        }
-
-        switch (where) {
-            case END:
-                mEllipsizeStrategy = new EllipsizeEndStrategy();
-                break;
-            case START:
-                mEllipsizeStrategy = new EllipsizeStartStrategy();
-                break;
-            case MIDDLE:
-                mEllipsizeStrategy = new EllipsizeMiddleStrategy();
-                break;
-            case MARQUEE:
-            default:
-                mEllipsizeStrategy = new EllipsizeNoneStrategy();
-                break;
-        }
-    }
-
-    /**
-     * A listener that notifies when the ellipsize state has changed.
-     */
-    public interface EllipsizeListener {
-        void ellipsizeStateChanged(boolean ellipsized);
-    }
-
-    /**
-     * A base class for an ellipsize strategy.
-     */
-    private abstract class EllipsizeStrategy {
-        /**
-         * Returns ellipsized text if the text does not fit inside of the layout;
-         * otherwise, returns the full text.
-         *
-         * @param text text to process
-         * @return Ellipsized text if the text does not fit inside of the layout;
-         * otherwise, returns the full text.
-         */
-        public CharSequence processText(CharSequence text) {
-            return !isInLayout(text) ? createEllipsizedText(text) : text;
-        }
-
-        /**
-         * Determines if the text fits inside of the layout.
-         *
-         * @param text text to fit
-         * @return {@code true} if the text fits inside of the layout;
-         * otherwise, returns {@code false}.
-         */
-        public boolean isInLayout(CharSequence text) {
-            Layout layout = createWorkingLayout(text);
-            return layout.getLineCount() <= getLinesCount();
-        }
-
-        /**
-         * Creates a working layout with the given text.
-         *
-         * @param workingText text to create layout with
-         * @return {@link android.text.Layout} with the given text.
-         */
-        protected Layout createWorkingLayout(CharSequence workingText) {
-            return new StaticLayout(workingText, getPaint(),
-                    getWidth() - getCompoundPaddingLeft() - getCompoundPaddingRight(),
-                    Alignment.ALIGN_NORMAL, mLineSpacingMult,
-                    mLineAddVertPad, false /* includepad */);
-        }
-
-        /**
-         * Get how many lines of text we are allowed to display.
-         */
-        protected int getLinesCount() {
-            if (ellipsizingLastFullyVisibleLine()) {
-                int fullyVisibleLinesCount = getFullyVisibleLinesCount();
-                return fullyVisibleLinesCount == -1 ? 1 : fullyVisibleLinesCount;
-            } else {
-                return mMaxLines;
-            }
-        }
-
-        /**
-         * Get how many lines of text we can display so their full height is visible.
-         */
-        protected int getFullyVisibleLinesCount() {
-            Layout layout = createWorkingLayout("");
-            int height = getHeight() - getCompoundPaddingTop() - getCompoundPaddingBottom();
-            int lineHeight = layout.getLineBottom(0);
-            return height / lineHeight;
-        }
-
-        /**
-         * Creates ellipsized text from the given text.
-         *
-         * @param fullText text to ellipsize
-         * @return Ellipsized text
-         */
-        protected abstract CharSequence createEllipsizedText(CharSequence fullText);
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * does not ellipsize text.
-     */
-    private class EllipsizeNoneStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            return fullText;
-        }
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * ellipsizes text at the end.
-     */
-    private class EllipsizeEndStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            Layout layout = createWorkingLayout(fullText);
-            int lineCount = layout.getLineCount();
-            int lastLineIndex = Math.min(mMaxLines - 1, lineCount -1);
-            int cutOffIndex = layout.getLineEnd(lastLineIndex);
-            int textLength = fullText.length();
-            int cutOffLength = textLength - cutOffIndex;
-            if (cutOffLength < ELLIPSIS.length()) cutOffLength = ELLIPSIS.length();
-
-            //True to display text
-            CharSequence workingText = TextUtils.substring(fullText, 0, textLength - cutOffLength).trim();
-
-
-            final int lastLineStart = layout.getLineStart(lastLineIndex);
-            final CharSequence remainder = TextUtils.ellipsize(fullText.subSequence(lastLineStart,
-                    fullText.length()), getPaint(), getWidth(), TextUtils.TruncateAt.END);
-
-            //seems to be handling corner case when there is still too many chars
-            while (!isInLayout(TextUtils.concat(stripEndPunctuation(workingText), ELLIPSIS))) {
-                workingText = workingText.subSequence(0, workingText.length() - 1);
-        
-            }
-
-            //first we copy the text
-            workingText = TextUtils.concat(stripEndPunctuation(workingText), ELLIPSIS);
-            SpannableStringBuilder dest = new SpannableStringBuilder(workingText);
-
-            //then we apply spans if necessary
-            if (fullText instanceof Spanned) {
-                TextUtils.copySpansFrom((Spanned) fullText, 0, workingText.length(), null, dest, 0);
-            }
-            return dest;
-        }
-
-        /**
-         * Strips the end punctuation from a given text according to {@link #mEndPunctPattern}.
-         *
-         * @param workingText text to strip end punctuation from
-         * @return Text without end punctuation.
-         */
-        public String stripEndPunctuation(CharSequence workingText) {
-            return mEndPunctPattern.matcher(workingText).replaceFirst("");
-        }
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * ellipsizes text at the start.
-     */
-    private class EllipsizeStartStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            Layout layout = createWorkingLayout(fullText);
-            int cutOffIndex = layout.getLineEnd(mMaxLines - 1);
-            int textLength = fullText.length();
-            int cutOffLength = textLength - cutOffIndex;
-            if (cutOffLength < ELLIPSIS.length()) cutOffLength = ELLIPSIS.length();
-            CharSequence workingText = TextUtils.substring(fullText, cutOffLength, textLength).trim();
-
-            while (!isInLayout(TextUtils.concat(ELLIPSIS, workingText))) {
-                int firstSpace = TextUtils.indexOf(workingText, ' ');
-                if (firstSpace == -1) {
-                    break;
-                }
-                workingText = TextUtils.substring(workingText, firstSpace, workingText.length()).trim();
-            }
-
-            workingText = TextUtils.concat(ELLIPSIS, workingText);
-            SpannableStringBuilder dest = new SpannableStringBuilder(workingText);
-
-            if (fullText instanceof Spanned) {
-                TextUtils.copySpansFrom((Spanned) fullText, textLength - workingText.length(),
-                        textLength, null, dest, 0);
-            }
-            return dest;
-        }
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * ellipsizes text in the middle.
-     */
-    private class EllipsizeMiddleStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            Layout layout = createWorkingLayout(fullText);
-            int cutOffIndex = layout.getLineEnd(mMaxLines - 1);
-            int textLength = fullText.length();
-            int cutOffLength = textLength - cutOffIndex;
-            if (cutOffLength < ELLIPSIS.length()) cutOffLength = ELLIPSIS.length();
-            cutOffLength += cutOffIndex % 2;    // Make it even.
-            String firstPart = TextUtils.substring(
-                    fullText, 0, textLength / 2 - cutOffLength / 2).trim();
-            String secondPart = TextUtils.substring(
-                    fullText, textLength / 2 + cutOffLength / 2, textLength).trim();
-
-            while (!isInLayout(TextUtils.concat(firstPart, ELLIPSIS, secondPart))) {
-                int lastSpaceFirstPart = firstPart.lastIndexOf(' ');
-                int firstSpaceSecondPart = secondPart.indexOf(' ');
-                if (lastSpaceFirstPart == -1 || firstSpaceSecondPart == -1) break;
-                firstPart = firstPart.substring(0, lastSpaceFirstPart).trim();
-                secondPart = secondPart.substring(firstSpaceSecondPart, secondPart.length()).trim();
-            }
-
-            SpannableStringBuilder firstDest = new SpannableStringBuilder(firstPart);
-            SpannableStringBuilder secondDest = new SpannableStringBuilder(secondPart);
-
-            if (fullText instanceof Spanned) {
-                TextUtils.copySpansFrom((Spanned) fullText, 0, firstPart.length(),
-                        null, firstDest, 0);
-                TextUtils.copySpansFrom((Spanned) fullText, textLength - secondPart.length(),
-                        textLength, null, secondDest, 0);
-            }
-            return TextUtils.concat(firstDest, ELLIPSIS, secondDest);
-        }
-    }
-}