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
de2270bb
Commit
de2270bb
authored
Apr 26, 2018
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few typo fixes
parent
ea6006ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
ChatRoomAdapter.kt
...a/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
+1
-1
ViewModelMapper.kt
...chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
+3
-4
No files found.
app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
View file @
de2270bb
...
...
@@ -175,7 +175,7 @@ class ChatRoomAdapter(
}
}
val
actionsListener
=
object
:
BaseViewHolder
.
ActionsListener
{
private
val
actionsListener
=
object
:
BaseViewHolder
.
ActionsListener
{
override
fun
isActionsEnabled
():
Boolean
=
enableActions
override
fun
onActionSelected
(
item
:
MenuItem
,
message
:
Message
)
{
...
...
app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
View file @
de2270bb
...
...
@@ -5,7 +5,6 @@ import android.content.Context
import
android.graphics.Color
import
android.graphics.Typeface
import
android.support.v4.content.ContextCompat
import
android.text.Html
import
android.text.SpannableStringBuilder
import
android.text.style.ForegroundColorSpan
import
android.text.style.StyleSpan
...
...
@@ -46,7 +45,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
private
val
baseUrl
=
settings
.
baseUrl
()
private
val
token
=
tokenRepository
.
get
(
currentServer
)
private
val
currentUsername
:
String
?
=
localRepository
.
get
(
LocalRepository
.
CURRENT_USERNAME_KEY
)
private
val
sec
u
ndaryTextColor
=
ContextCompat
.
getColor
(
context
,
R
.
color
.
colorSecondaryText
)
private
val
sec
o
ndaryTextColor
=
ContextCompat
.
getColor
(
context
,
R
.
color
.
colorSecondaryText
)
suspend
fun
map
(
message
:
Message
):
List
<
BaseViewModel
<*
>>
{
return
translate
(
message
)
...
...
@@ -261,7 +260,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
return
reactions
?:
emptyList
()
}
private
suspend
fun
stripMessageQuotes
(
message
:
Message
):
Message
{
private
fun
stripMessageQuotes
(
message
:
Message
):
Message
{
val
baseUrl
=
settings
.
baseUrl
()
return
message
.
copy
(
message
=
message
.
message
.
replace
(
"\\[[^\\]]+\\]\\($baseUrl[^)]+\\)"
.
toRegex
(),
""
).
trim
()
...
...
@@ -276,7 +275,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
username
?.
let
{
append
(
" "
)
scale
(
0.8f
)
{
color
(
sec
u
ndaryTextColor
)
{
color
(
sec
o
ndaryTextColor
)
{
append
(
"@$username"
)
}
}
...
...
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