Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c4c826fb
authored
May 07, 2020
by
ibaker
Committed by
Oliver Woodman
May 14, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add StrikethroughSpan support to SpannedToHtmlConverter
PiperOrigin-RevId: 310332708
parent
4e8ea009
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
2 deletions
library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
View file @
c4c826fb
...
@@ -23,6 +23,7 @@ import android.text.style.AbsoluteSizeSpan;
...
@@ -23,6 +23,7 @@ import android.text.style.AbsoluteSizeSpan;
import
android.text.style.BackgroundColorSpan
;
import
android.text.style.BackgroundColorSpan
;
import
android.text.style.ForegroundColorSpan
;
import
android.text.style.ForegroundColorSpan
;
import
android.text.style.RelativeSizeSpan
;
import
android.text.style.RelativeSizeSpan
;
import
android.text.style.StrikethroughSpan
;
import
android.text.style.StyleSpan
;
import
android.text.style.StyleSpan
;
import
android.text.style.TypefaceSpan
;
import
android.text.style.TypefaceSpan
;
import
android.text.style.UnderlineSpan
;
import
android.text.style.UnderlineSpan
;
...
@@ -128,7 +129,9 @@ import java.util.regex.Pattern;
...
@@ -128,7 +129,9 @@ import java.util.regex.Pattern;
@Nullable
@Nullable
private
static
String
getOpeningTag
(
Object
span
,
float
displayDensity
)
{
private
static
String
getOpeningTag
(
Object
span
,
float
displayDensity
)
{
if
(
span
instanceof
ForegroundColorSpan
)
{
if
(
span
instanceof
StrikethroughSpan
)
{
return
"<span style='text-decoration:line-through;'>"
;
}
else
if
(
span
instanceof
ForegroundColorSpan
)
{
ForegroundColorSpan
colorSpan
=
(
ForegroundColorSpan
)
span
;
ForegroundColorSpan
colorSpan
=
(
ForegroundColorSpan
)
span
;
return
Util
.
formatInvariant
(
return
Util
.
formatInvariant
(
"<span style='color:%s;'>"
,
HtmlUtils
.
toCssRgba
(
colorSpan
.
getForegroundColor
()));
"<span style='color:%s;'>"
,
HtmlUtils
.
toCssRgba
(
colorSpan
.
getForegroundColor
()));
...
@@ -186,7 +189,8 @@ import java.util.regex.Pattern;
...
@@ -186,7 +189,8 @@ import java.util.regex.Pattern;
@Nullable
@Nullable
private
static
String
getClosingTag
(
Object
span
)
{
private
static
String
getClosingTag
(
Object
span
)
{
if
(
span
instanceof
ForegroundColorSpan
if
(
span
instanceof
StrikethroughSpan
||
span
instanceof
ForegroundColorSpan
||
span
instanceof
BackgroundColorSpan
||
span
instanceof
BackgroundColorSpan
||
span
instanceof
HorizontalTextInVerticalContextSpan
||
span
instanceof
HorizontalTextInVerticalContextSpan
||
span
instanceof
AbsoluteSizeSpan
||
span
instanceof
AbsoluteSizeSpan
...
...
library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
View file @
c4c826fb
...
@@ -26,6 +26,7 @@ import android.text.style.AbsoluteSizeSpan;
...
@@ -26,6 +26,7 @@ import android.text.style.AbsoluteSizeSpan;
import
android.text.style.BackgroundColorSpan
;
import
android.text.style.BackgroundColorSpan
;
import
android.text.style.ForegroundColorSpan
;
import
android.text.style.ForegroundColorSpan
;
import
android.text.style.RelativeSizeSpan
;
import
android.text.style.RelativeSizeSpan
;
import
android.text.style.StrikethroughSpan
;
import
android.text.style.StyleSpan
;
import
android.text.style.StyleSpan
;
import
android.text.style.TypefaceSpan
;
import
android.text.style.TypefaceSpan
;
import
android.text.style.UnderlineSpan
;
import
android.text.style.UnderlineSpan
;
...
@@ -177,6 +178,22 @@ public class SpannedToHtmlConverterTest {
...
@@ -177,6 +178,22 @@ public class SpannedToHtmlConverterTest {
}
}
@Test
@Test
public
void
convert_supportsStrikethroughSpan
()
{
SpannableString
spanned
=
new
SpannableString
(
"String with crossed-out section"
);
spanned
.
setSpan
(
new
StrikethroughSpan
(),
"String with "
.
length
(),
"String with crossed-out"
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
String
html
=
SpannedToHtmlConverter
.
convert
(
spanned
,
displayDensity
);
assertThat
(
html
)
.
isEqualTo
(
"String with <span style='text-decoration:line-through;'>crossed-out</span> section"
);
}
@Test
public
void
convert_supportsStyleSpan
()
{
public
void
convert_supportsStyleSpan
()
{
SpannableString
spanned
=
SpannableString
spanned
=
new
SpannableString
(
"String with bold, italic and bold-italic sections."
);
new
SpannableString
(
"String with bold, italic and bold-italic sections."
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment