@@ -21,12 +21,12 @@ import android.graphics.Canvas
2121import android.graphics.Color
2222import android.graphics.Paint
2323import android.graphics.Rect
24+ import android.support.v4.text.TextDirectionHeuristicCompat
2425import android.support.v4.text.TextDirectionHeuristicsCompat
2526import android.support.v4.text.TextUtilsCompat
2627import android.support.v4.view.ViewCompat
2728import android.text.Layout
2829import android.text.Spanned
29- import android.text.TextUtils
3030import android.text.style.LineBackgroundSpan
3131import android.text.style.LineHeightSpan
3232import android.text.style.QuoteSpan
@@ -126,11 +126,13 @@ class AztecQuoteSpan(
126126 }
127127
128128 private fun isRtlQuote (text : CharSequence , start : Int , end : Int ): Boolean {
129- return if (start == end || TextUtils .isEmpty(text) || text.substring(start, end) == " \n " ) {
130- TextUtilsCompat .getLayoutDirectionFromLocale(Locale .getDefault()) == ViewCompat .LAYOUT_DIRECTION_RTL
131- } else {
132- TextDirectionHeuristicsCompat .FIRSTSTRONG_LTR .isRtl(text, start, end - start)
133- }
129+ val textDirectionHeuristic: TextDirectionHeuristicCompat =
130+ if (TextUtilsCompat .getLayoutDirectionFromLocale(Locale .getDefault()) == ViewCompat .LAYOUT_DIRECTION_RTL ) {
131+ TextDirectionHeuristicsCompat .FIRSTSTRONG_RTL
132+ } else {
133+ TextDirectionHeuristicsCompat .FIRSTSTRONG_LTR
134+ }
135+ return textDirectionHeuristic.isRtl(text, start, end - start)
134136 }
135137
136138}
0 commit comments