Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
052402b4
Commit
052402b4
authored
Aug 31, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'beta' of github.com:RocketChat/Rocket.Chat.Android into fix/out-of-memory
parents
aac6631e
8c7da0f8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
282 additions
and
4 deletions
+282
-4
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+1
-1
strings.xml
app/src/main/res/values-ja/strings.xml
+278
-0
EmojiParser.kt
emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt
+3
-3
No files found.
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
052402b4
...
...
@@ -131,7 +131,7 @@ class MessageParser @Inject constructor(
private
val
builder
:
SpannableBuilder
)
:
SpannableMarkdownVisitor
(
configuration
,
builder
)
{
private
val
emojiSize
=
context
.
resources
.
getDimensionPixelSize
(
R
.
dimen
.
radius_mention
)
private
val
emojiSize
=
context
.
resources
.
getDimensionPixelSize
(
R
.
dimen
.
custom_emoji_small
)
override
fun
visit
(
document
:
Document
)
{
val
spannable
=
EmojiParser
.
parse
(
context
,
builder
.
text
())
...
...
app/src/main/res/values-ja/strings.xml
0 → 100644
View file @
052402b4
This diff is collapsed.
Click to expand it.
emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt
View file @
052402b4
...
...
@@ -79,10 +79,10 @@ class EmojiParser {
val
px
=
context
.
resources
.
getDimensionPixelSize
(
R
.
dimen
.
custom_emoji_small
)
return
spannable
.
also
{
return
spannable
.
also
{
sp
->
regex
.
findAll
(
spannable
).
iterator
().
forEach
{
match
->
customEmojis
.
find
{
it
.
shortname
.
toLowerCase
()
==
match
.
value
.
toLowerCase
()
}
?.
let
{
it
.
url
?.
let
{
url
->
customEmojis
.
find
{
it
.
shortname
.
toLowerCase
()
==
match
.
value
.
toLowerCase
()
}
?.
let
{
emoji
->
emoji
.
url
?.
let
{
url
->
try
{
val
glideRequest
=
if
(
url
.
endsWith
(
"gif"
,
true
))
{
GlideApp
.
with
(
context
).
asGif
()
...
...
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