Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
ac3c41f9
Commit
ac3c41f9
authored
3 years ago
by
Robert Stone
Committed by
Nicolas Pomepuy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add bidirectional text marking to handle RTL languages
parent
26bfa3e9
No related branches found
No related tags found
1 merge request
!1020
Android Auto: Update play-from-here and library pagination
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/tools/src/main/java/org/videolan/tools/Strings.kt
+26
-0
26 additions, 0 deletions
...ication/tools/src/main/java/org/videolan/tools/Strings.kt
application/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
+2
-2
2 additions, 2 deletions
...tion/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
with
28 additions
and
2 deletions
application/tools/src/main/java/org/videolan/tools/Strings.kt
+
26
−
0
View file @
ac3c41f9
...
...
@@ -96,4 +96,30 @@ fun String.firstLetterUppercase(): String {
return
if
(
length
==
1
)
{
toUpperCase
(
Locale
.
getDefault
())
}
else
Character
.
toUpperCase
(
this
[
0
])
+
substring
(
1
).
toLowerCase
(
Locale
.
getDefault
())
}
fun
String
.
abbreviate
(
maxLen
:
Int
):
String
{
val
ellipsis
=
"\u2026"
val
trimmed
=
this
.
trim
()
return
if
(
trimmed
.
length
>
maxLen
)
trimmed
.
take
(
maxLen
-
1
).
trim
().
plus
(
ellipsis
)
else
trimmed
}
fun
String
.
markBidi
():
String
{
//right-to-left isolate
val
rli
=
"\u2067"
//pop directional isolate
val
pdi
=
"\u2069"
for
(
ch
in
this
)
{
when
(
Character
.
getDirectionality
(
ch
))
{
Character
.
DIRECTIONALITY_RIGHT_TO_LEFT
,
Character
.
DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC
,
Character
.
DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING
,
Character
.
DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE
->
return
rli
+
this
+
pdi
Character
.
DIRECTIONALITY_LEFT_TO_RIGHT
,
Character
.
DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING
,
Character
.
DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE
->
return
this
}
}
return
this
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
application/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
+
2
−
2
View file @
ac3c41f9
...
...
@@ -31,13 +31,13 @@ import org.videolan.resources.util.getFromMl
import
org.videolan.tools.AppScope
import
org.videolan.tools.Settings
import
org.videolan.tools.localBroadcastManager
import
org.videolan.tools.markBidi
import
org.videolan.tools.safeOffer
import
org.videolan.vlc.PlaybackService
import
org.videolan.vlc.R
import
org.videolan.vlc.gui.AudioPlayerContainerActivity
import
org.videolan.vlc.gui.DialogActivity
import
org.videolan.vlc.gui.dialogs.SubtitleDownloaderDialogFragment
import
org.videolan.vlc.gui.helpers.UiTools
import
org.videolan.vlc.providers.medialibrary.FoldersProvider
import
org.videolan.vlc.providers.medialibrary.MedialibraryProvider
import
org.videolan.vlc.providers.medialibrary.VideoGroupsProvider
...
...
@@ -390,7 +390,7 @@ object MediaUtils {
val
artist
=
getMediaArtist
(
ctx
,
media
)
val
album
=
getMediaAlbum
(
ctx
,
media
)
val
desc
=
if
(
artist
!=
getMediaString
(
ctx
,
R
.
string
.
unknown_artist
)
&&
album
!=
getMediaString
(
ctx
,
R
.
string
.
unknown_album
))
getMediaDescription
(
artist
,
album
)
else
""
getMediaDescription
(
artist
.
markBidi
(),
album
.
markBidi
()
)
else
""
sb
.
append
(
if
(
desc
.
isNotEmpty
())
(
if
(
sb
.
isNotEmpty
())
" • $desc"
else
desc
)
else
""
)
//Replace full-spaces with thin-spaces (Unicode 2009)
return
sb
.
toString
().
replace
(
" "
,
"\u2009"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment