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
e11ae734
authored
May 01, 2020
by
ibaker
Committed by
Oliver Woodman
May 01, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add RelativeSizeSpan support to SpannedHtmlConverter
PiperOrigin-RevId: 309391401
parent
192b6832
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 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 @
e11ae734
...
@@ -22,6 +22,7 @@ import android.text.Spanned;
...
@@ -22,6 +22,7 @@ import android.text.Spanned;
import
android.text.style.AbsoluteSizeSpan
;
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.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
;
...
@@ -145,6 +146,9 @@ import java.util.regex.Pattern;
...
@@ -145,6 +146,9 @@ import java.util.regex.Pattern;
?
absoluteSizeSpan
.
getSize
()
?
absoluteSizeSpan
.
getSize
()
:
absoluteSizeSpan
.
getSize
()
/
displayDensity
;
:
absoluteSizeSpan
.
getSize
()
/
displayDensity
;
return
Util
.
formatInvariant
(
"<span style='font-size:%.2fpx;'>"
,
sizeCssPx
);
return
Util
.
formatInvariant
(
"<span style='font-size:%.2fpx;'>"
,
sizeCssPx
);
}
else
if
(
span
instanceof
RelativeSizeSpan
)
{
return
Util
.
formatInvariant
(
"<span style='font-size:%.2f%%;'>"
,
((
RelativeSizeSpan
)
span
).
getSizeChange
());
}
else
if
(
span
instanceof
TypefaceSpan
)
{
}
else
if
(
span
instanceof
TypefaceSpan
)
{
@Nullable
String
fontFamily
=
((
TypefaceSpan
)
span
).
getFamily
();
@Nullable
String
fontFamily
=
((
TypefaceSpan
)
span
).
getFamily
();
return
fontFamily
!=
null
return
fontFamily
!=
null
...
@@ -185,7 +189,8 @@ import java.util.regex.Pattern;
...
@@ -185,7 +189,8 @@ import java.util.regex.Pattern;
if
(
span
instanceof
ForegroundColorSpan
if
(
span
instanceof
ForegroundColorSpan
||
span
instanceof
BackgroundColorSpan
||
span
instanceof
BackgroundColorSpan
||
span
instanceof
HorizontalTextInVerticalContextSpan
||
span
instanceof
HorizontalTextInVerticalContextSpan
||
span
instanceof
AbsoluteSizeSpan
)
{
||
span
instanceof
AbsoluteSizeSpan
||
span
instanceof
RelativeSizeSpan
)
{
return
"</span>"
;
return
"</span>"
;
}
else
if
(
span
instanceof
TypefaceSpan
)
{
}
else
if
(
span
instanceof
TypefaceSpan
)
{
@Nullable
String
fontFamily
=
((
TypefaceSpan
)
span
).
getFamily
();
@Nullable
String
fontFamily
=
((
TypefaceSpan
)
span
).
getFamily
();
...
...
library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
View file @
e11ae734
...
@@ -25,6 +25,7 @@ import android.text.Spanned;
...
@@ -25,6 +25,7 @@ import android.text.Spanned;
import
android.text.style.AbsoluteSizeSpan
;
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.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
;
...
@@ -131,6 +132,20 @@ public class SpannedToHtmlConverterTest {
...
@@ -131,6 +132,20 @@ public class SpannedToHtmlConverterTest {
}
}
@Test
@Test
public
void
convert_supportsRelativeSizeSpan
()
{
SpannableString
spanned
=
new
SpannableString
(
"String with 10% section"
);
spanned
.
setSpan
(
new
RelativeSizeSpan
(
/* proportion= */
10
),
"String with "
.
length
(),
"String with 10%"
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
String
html
=
SpannedToHtmlConverter
.
convert
(
spanned
,
displayDensity
);
assertThat
(
html
).
isEqualTo
(
"String with <span style='font-size:10.00%;'>10%</span> section"
);
}
@Test
public
void
convert_supportsTypefaceSpan
()
{
public
void
convert_supportsTypefaceSpan
()
{
SpannableString
spanned
=
new
SpannableString
(
"String with Times New Roman section"
);
SpannableString
spanned
=
new
SpannableString
(
"String with Times New Roman section"
);
spanned
.
setSpan
(
spanned
.
setSpan
(
...
...
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