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
72c5bbc0
Commit
72c5bbc0
authored
Aug 28, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use resources for size, update buildTools version
parent
96338a2f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+2
-4
dimens.xml
app/src/main/res/values/dimens.xml
+1
-0
dependencies.gradle
dependencies.gradle
+1
-1
build.gradle
emoji/build.gradle
+5
-0
No files found.
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
72c5bbc0
...
...
@@ -26,7 +26,6 @@ import org.commonmark.node.Document
import
org.commonmark.node.ListItem
import
org.commonmark.node.Node
import
org.commonmark.node.OrderedList
import
org.commonmark.node.Paragraph
import
org.commonmark.node.Text
import
ru.noties.markwon.Markwon
import
ru.noties.markwon.SpannableBuilder
...
...
@@ -132,8 +131,7 @@ class MessageParser @Inject constructor(
private
val
builder
:
SpannableBuilder
)
:
SpannableMarkdownVisitor
(
configuration
,
builder
)
{
private
val
density
=
context
.
resources
.
displayMetrics
.
density
private
val
px
=
(
22
*
density
).
toInt
()
private
val
emojiSize
=
context
.
resources
.
getDimensionPixelSize
(
R
.
dimen
.
radius_mention
)
override
fun
visit
(
document
:
Document
)
{
val
spannable
=
EmojiParser
.
parse
(
context
,
builder
.
text
())
...
...
@@ -148,7 +146,7 @@ class MessageParser @Inject constructor(
}
emojiImageSpans
.
forEach
{
it
.
drawable
?.
setBounds
(
0
,
0
,
px
,
px
)
it
.
drawable
?.
setBounds
(
0
,
0
,
emojiSize
,
emojiSize
)
builder
.
setSpan
(
it
,
spannable
.
getSpanStart
(
it
),
spannable
.
getSpanEnd
(
it
),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
)
}
...
...
app/src/main/res/values/dimens.xml
View file @
72c5bbc0
...
...
@@ -31,6 +31,7 @@
<dimen
name=
"supposed_keyboard_height"
>
252dp
</dimen>
<dimen
name=
"picker_popup_height"
>
250dp
</dimen>
<dimen
name=
"picker_popup_width"
>
300dp
</dimen>
<dimen
name=
"emoji_size"
>
22dp
</dimen>
<!--Toolbar-->
<dimen
name=
"toolbar_height"
>
56dp
</dimen>
...
...
dependencies.gradle
View file @
72c5bbc0
...
...
@@ -5,7 +5,7 @@ ext {
compileSdk
:
28
,
targetSdk
:
28
,
minSdk
:
21
,
buildTools
:
'28.0.
1
'
,
buildTools
:
'28.0.
2
'
,
dokka
:
'0.9.16'
,
// For app
...
...
emoji/build.gradle
View file @
72c5bbc0
...
...
@@ -15,6 +15,11 @@ android {
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions
{
annotationProcessorOptions
{
arguments
=
[
"room.schemaLocation"
:
"$projectDir/schemas"
.
toString
()]
}
}
}
buildTypes
{
...
...
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