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
8aa843bc
Unverified
Commit
8aa843bc
authored
Nov 01, 2018
by
Lucio Maciel
Committed by
GitHub
Nov 01, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'beta' into fix/cas
parents
8127853f
a9009bac
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
279 additions
and
108 deletions
+279
-108
ChatRoomAdapter.kt
...a/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
+5
-1
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+56
-1
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+4
-1
MessageActionsBottomSheet.kt
...roid/chatroom/ui/bottomsheet/MessageActionsBottomSheet.kt
+1
-1
ActionsAttachmentUiModel.kt
...cket/android/chatroom/uimodel/ActionsAttachmentUiModel.kt
+2
-1
AudioAttachmentUiModel.kt
...rocket/android/chatroom/uimodel/AudioAttachmentUiModel.kt
+15
-14
AuthorAttachmentUiModel.kt
...ocket/android/chatroom/uimodel/AuthorAttachmentUiModel.kt
+1
-1
BaseUiModel.kt
.../java/chat/rocket/android/chatroom/uimodel/BaseUiModel.kt
+1
-0
ColorAttachmentUiModel.kt
...rocket/android/chatroom/uimodel/ColorAttachmentUiModel.kt
+2
-1
GenericFileAttachmentUiModel.kt
.../android/chatroom/uimodel/GenericFileAttachmentUiModel.kt
+2
-1
ImageAttachmentUiModel.kt
...rocket/android/chatroom/uimodel/ImageAttachmentUiModel.kt
+2
-1
MessageAttachmentUiModel.kt
...cket/android/chatroom/uimodel/MessageAttachmentUiModel.kt
+2
-1
MessageReplyUiModel.kt
...at/rocket/android/chatroom/uimodel/MessageReplyUiModel.kt
+2
-1
MessageUiModel.kt
...va/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt
+2
-1
UiModelMapper.kt
...ava/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+90
-50
UrlPreviewUiModel.kt
...chat/rocket/android/chatroom/uimodel/UrlPreviewUiModel.kt
+2
-1
VideoAttachmentUiModel.kt
...rocket/android/chatroom/uimodel/VideoAttachmentUiModel.kt
+15
-14
ChatRoomSuggestionUiModel.kt
.../chatroom/uimodel/suggestion/ChatRoomSuggestionUiModel.kt
+6
-4
CommandSuggestionUiModel.kt
...d/chatroom/uimodel/suggestion/CommandSuggestionUiModel.kt
+5
-3
PeopleSuggestionUiModel.kt
...id/chatroom/uimodel/suggestion/PeopleSuggestionUiModel.kt
+9
-7
MessageHelper.kt
...src/main/java/chat/rocket/android/helper/MessageHelper.kt
+3
-2
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+1
-0
ic_action_message_link_24dp.xml
app/src/main/res/drawable/ic_action_message_link_24dp.xml
+10
-0
message_actions.xml
app/src/main/res/menu/message_actions.xml
+5
-0
strings.xml
app/src/main/res/values-de/strings.xml
+4
-0
strings.xml
app/src/main/res/values-es/strings.xml
+3
-0
strings.xml
app/src/main/res/values-fr/strings.xml
+4
-0
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+4
-1
strings.xml
app/src/main/res/values-ja/strings.xml
+4
-0
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+3
-0
strings.xml
app/src/main/res/values-ru-rRU/strings.xml
+4
-0
strings.xml
app/src/main/res/values-tr/strings.xml
+4
-0
strings.xml
app/src/main/res/values-uk/strings.xml
+4
-0
strings.xml
app/src/main/res/values/strings.xml
+2
-0
No files found.
app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
View file @
8aa843bc
...
@@ -291,6 +291,9 @@ class ChatRoomAdapter(
...
@@ -291,6 +291,9 @@ class ChatRoomAdapter(
R
.
id
.
action_menu_msg_react
->
{
R
.
id
.
action_menu_msg_react
->
{
actionSelectListener
?.
showReactions
(
id
)
actionSelectListener
?.
showReactions
(
id
)
}
}
R
.
id
.
action_message_permalink
->
{
actionSelectListener
?.
copyPermalink
(
id
)
}
else
->
{
else
->
{
TODO
(
"Not implemented"
)
TODO
(
"Not implemented"
)
}
}
...
@@ -310,5 +313,6 @@ class ChatRoomAdapter(
...
@@ -310,5 +313,6 @@ class ChatRoomAdapter(
fun
showReactions
(
id
:
String
)
fun
showReactions
(
id
:
String
)
fun
openDirectMessage
(
roomName
:
String
,
message
:
String
)
fun
openDirectMessage
(
roomName
:
String
,
message
:
String
)
fun
sendMessage
(
chatRoomId
:
String
,
text
:
String
)
fun
sendMessage
(
chatRoomId
:
String
,
text
:
String
)
fun
copyPermalink
(
id
:
String
)
}
}
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
8aa843bc
...
@@ -541,7 +541,7 @@ class ChatRoomPresenter @Inject constructor(
...
@@ -541,7 +541,7 @@ class ChatRoomPresenter @Inject constructor(
val
messages
=
val
messages
=
retryIO
(
description
=
"history($chatRoomId, $roomType, $instant)"
)
{
retryIO
(
description
=
"history($chatRoomId, $roomType, $instant)"
)
{
client
.
history
(
client
.
history
(
chatRoomId
,
roomType
,
count
=
50
,
chatRoomId
,
roomType
,
count
=
50
,
oldest
=
instant
oldest
=
instant
)
)
}
}
...
@@ -658,6 +658,7 @@ class ChatRoomPresenter @Inject constructor(
...
@@ -658,6 +658,7 @@ class ChatRoomPresenter @Inject constructor(
try
{
try
{
messagesRepository
.
getById
(
messageId
)
?.
let
{
m
->
messagesRepository
.
getById
(
messageId
)
?.
let
{
m
->
view
.
copyToClipboard
(
m
.
message
)
view
.
copyToClipboard
(
m
.
message
)
view
.
showMessage
(
R
.
string
.
msg_message_copied
)
}
}
}
catch
(
e
:
RocketChatException
)
{
}
catch
(
e
:
RocketChatException
)
{
Timber
.
e
(
e
)
Timber
.
e
(
e
)
...
@@ -895,6 +896,42 @@ class ChatRoomPresenter @Inject constructor(
...
@@ -895,6 +896,42 @@ class ChatRoomPresenter @Inject constructor(
}
}
}
}
// TODO: move this to new interactor or FetchChatRoomsInteractor?
private
suspend
fun
getChatRoomAsync
(
roomId
:
String
):
ChatRoom
?
=
withContext
(
CommonPool
)
{
return
@withContext
dbManager
.
chatRoomDao
().
get
(
roomId
)
?.
let
{
with
(
it
.
chatRoom
)
{
ChatRoom
(
id
=
id
,
subscriptionId
=
subscriptionId
,
type
=
roomTypeOf
(
type
),
unread
=
unread
,
broadcast
=
broadcast
?:
false
,
alert
=
alert
,
fullName
=
fullname
,
name
=
name
,
favorite
=
favorite
?:
false
,
default
=
isDefault
?:
false
,
readonly
=
readonly
,
open
=
open
,
lastMessage
=
null
,
archived
=
false
,
status
=
null
,
user
=
null
,
userMentions
=
userMentions
,
client
=
client
,
announcement
=
null
,
description
=
null
,
groupMentions
=
groupMentions
,
roles
=
null
,
topic
=
null
,
lastSeen
=
this
.
lastSeen
,
timestamp
=
timestamp
,
updatedAt
=
updatedAt
)
}
}
}
// TODO: move this to new interactor or FetchChatRoomsInteractor?
// TODO: move this to new interactor or FetchChatRoomsInteractor?
private
suspend
fun
getChatRoomsAsync
(
name
:
String
?
=
null
):
List
<
ChatRoom
>
=
withContext
(
CommonPool
)
{
private
suspend
fun
getChatRoomsAsync
(
name
:
String
?
=
null
):
List
<
ChatRoom
>
=
withContext
(
CommonPool
)
{
return
@withContext
dbManager
.
chatRoomDao
().
getAllSync
().
filter
{
return
@withContext
dbManager
.
chatRoomDao
().
getAllSync
().
filter
{
...
@@ -977,6 +1014,24 @@ class ChatRoomPresenter @Inject constructor(
...
@@ -977,6 +1014,24 @@ class ChatRoomPresenter @Inject constructor(
}
}
}
}
fun
copyPermalink
(
messageId
:
String
)
{
launchUI
(
strategy
)
{
try
{
messagesRepository
.
getById
(
messageId
)
?.
let
{
message
->
getChatRoomAsync
(
message
.
roomId
)
?.
let
{
chatRoom
->
val
models
=
mapper
.
map
(
message
)
models
.
firstOrNull
()
?.
permalink
?.
let
{
view
.
copyToClipboard
(
it
)
view
.
showMessage
(
R
.
string
.
msg_permalink_copied
)
}
}
}
}
catch
(
ex
:
Exception
)
{
Timber
.
e
(
ex
)
}
}
}
/**
/**
* Send an emoji reaction to a message.
* Send an emoji reaction to a message.
*/
*/
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
8aa843bc
...
@@ -621,7 +621,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -621,7 +621,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
ui
{
ui
{
val
clipboard
=
it
.
getSystemService
(
Context
.
CLIPBOARD_SERVICE
)
as
ClipboardManager
val
clipboard
=
it
.
getSystemService
(
Context
.
CLIPBOARD_SERVICE
)
as
ClipboardManager
clipboard
.
primaryClip
=
ClipData
.
newPlainText
(
""
,
message
)
clipboard
.
primaryClip
=
ClipData
.
newPlainText
(
""
,
message
)
showToast
(
R
.
string
.
msg_message_copied
)
}
}
}
}
...
@@ -1059,6 +1058,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -1059,6 +1058,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
}
}
}
}
override
fun
copyPermalink
(
id
:
String
)
{
presenter
.
copyPermalink
(
id
)
}
override
fun
showReactions
(
id
:
String
)
{
override
fun
showReactions
(
id
:
String
)
{
presenter
.
showReactions
(
id
)
presenter
.
showReactions
(
id
)
}
}
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/MessageActionsBottomSheet.kt
View file @
8aa843bc
...
@@ -73,4 +73,4 @@ class MessageActionsBottomSheet : BottomSheetDialogFragment() {
...
@@ -73,4 +73,4 @@ class MessageActionsBottomSheet : BottomSheetDialogFragment() {
}
}
}
}
}
}
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/chatroom/uimodel/ActionsAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -20,7 +20,8 @@ data class ActionsAttachmentUiModel(
...
@@ -20,7 +20,8 @@ data class ActionsAttachmentUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseAttachmentUiModel
<
ActionsAttachment
>
{
)
:
BaseAttachmentUiModel
<
ActionsAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
ACTIONS_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
ACTIONS_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/AudioAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -5,20 +5,21 @@ import chat.rocket.core.model.Message
...
@@ -5,20 +5,21 @@ import chat.rocket.core.model.Message
import
chat.rocket.core.model.attachment.AudioAttachment
import
chat.rocket.core.model.attachment.AudioAttachment
data class
AudioAttachmentUiModel
(
data class
AudioAttachmentUiModel
(
override
val
message
:
Message
,
override
val
message
:
Message
,
override
val
rawData
:
AudioAttachment
,
override
val
rawData
:
AudioAttachment
,
override
val
messageId
:
String
,
override
val
messageId
:
String
,
override
val
attachmentUrl
:
String
,
override
val
attachmentUrl
:
String
,
override
val
attachmentTitle
:
CharSequence
,
override
val
attachmentTitle
:
CharSequence
,
override
val
id
:
Long
,
override
val
id
:
Long
,
override
var
reactions
:
List
<
ReactionUiModel
>,
override
var
reactions
:
List
<
ReactionUiModel
>,
override
var
nextDownStreamMessage
:
BaseUiModel
<*>?
=
null
,
override
var
nextDownStreamMessage
:
BaseUiModel
<*>?
=
null
,
override
var
preview
:
Message
?
=
null
,
override
var
preview
:
Message
?
=
null
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseFileAttachmentUiModel
<
AudioAttachment
>
{
)
:
BaseFileAttachmentUiModel
<
AudioAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
AUDIO_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
AUDIO_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/AuthorAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -20,7 +20,7 @@ data class AuthorAttachmentUiModel(
...
@@ -20,7 +20,7 @@ data class AuthorAttachmentUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseAttachmentUiModel
<
AuthorAttachment
>
{
)
:
BaseAttachmentUiModel
<
AuthorAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
AUTHOR_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
AUTHOR_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/BaseUiModel.kt
View file @
8aa843bc
...
@@ -17,6 +17,7 @@ interface BaseUiModel<out T> {
...
@@ -17,6 +17,7 @@ interface BaseUiModel<out T> {
var
currentDayMarkerText
:
String
var
currentDayMarkerText
:
String
var
showDayMarker
:
Boolean
var
showDayMarker
:
Boolean
var
menuItemsToHide
:
MutableList
<
Int
>
var
menuItemsToHide
:
MutableList
<
Int
>
var
permalink
:
String
enum
class
ViewType
(
val
viewType
:
Int
)
{
enum
class
ViewType
(
val
viewType
:
Int
)
{
MESSAGE
(
0
),
MESSAGE
(
0
),
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/ColorAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -20,7 +20,8 @@ data class ColorAttachmentUiModel(
...
@@ -20,7 +20,8 @@ data class ColorAttachmentUiModel(
override
var
unread
:
Boolean
?,
override
var
unread
:
Boolean
?,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseAttachmentUiModel
<
ColorAttachment
>
{
)
:
BaseAttachmentUiModel
<
ColorAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
COLOR_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
COLOR_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/GenericFileAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -18,7 +18,8 @@ data class GenericFileAttachmentUiModel(
...
@@ -18,7 +18,8 @@ data class GenericFileAttachmentUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseFileAttachmentUiModel
<
GenericFileAttachment
>
{
)
:
BaseFileAttachmentUiModel
<
GenericFileAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
GENERIC_FILE_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
GENERIC_FILE_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/ImageAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -20,7 +20,8 @@ data class ImageAttachmentUiModel(
...
@@ -20,7 +20,8 @@ data class ImageAttachmentUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseFileAttachmentUiModel
<
ImageAttachment
>
{
)
:
BaseFileAttachmentUiModel
<
ImageAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
IMAGE_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
IMAGE_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -19,7 +19,8 @@ data class MessageAttachmentUiModel(
...
@@ -19,7 +19,8 @@ data class MessageAttachmentUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseUiModel
<
Message
>
{
)
:
BaseUiModel
<
Message
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageReplyUiModel.kt
View file @
8aa843bc
...
@@ -15,7 +15,8 @@ data class MessageReplyUiModel(
...
@@ -15,7 +15,8 @@ data class MessageReplyUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseUiModel
<
MessageReply
>
{
)
:
BaseUiModel
<
MessageReply
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE_REPLY
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE_REPLY
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt
View file @
8aa843bc
...
@@ -20,7 +20,8 @@ data class MessageUiModel(
...
@@ -20,7 +20,8 @@ data class MessageUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
var
isFirstUnread
:
Boolean
,
var
isFirstUnread
:
Boolean
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
()
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
permalink
:
String
)
:
BaseMessageUiModel
<
Message
>
{
)
:
BaseMessageUiModel
<
Message
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
View file @
8aa843bc
...
@@ -131,23 +131,26 @@ class UiModelMapper @Inject constructor(
...
@@ -131,23 +131,26 @@ class UiModelMapper @Inject constructor(
withContext
(
CommonPool
)
{
withContext
(
CommonPool
)
{
val
list
=
ArrayList
<
BaseUiModel
<*>>()
val
list
=
ArrayList
<
BaseUiModel
<*>>()
message
.
urls
?.
forEach
{
url
->
getChatRoomAsync
(
message
.
roomId
)
?.
let
{
chatRoom
->
mapUrl
(
message
,
url
)
?.
let
{
list
.
add
(
it
)
}
message
.
urls
?.
forEach
{
url
->
}
mapUrl
(
message
,
url
,
chatRoom
)
?.
let
{
list
.
add
(
it
)
}
}
message
.
attachments
?.
mapNotNull
{
attachment
->
message
.
attachments
?.
mapNotNull
{
attachment
->
mapAttachment
(
message
,
attachment
)
mapAttachment
(
message
,
attachment
,
chatRoom
)
}
?.
asReversed
()
?.
let
{
}
?.
asReversed
()
?.
let
{
list
.
addAll
(
it
)
list
.
addAll
(
it
)
}
}
mapMessage
(
message
).
let
{
mapMessage
(
message
,
chatRoom
).
let
{
if
(
list
.
isNotEmpty
())
{
if
(
list
.
isNotEmpty
())
{
it
.
preview
=
list
.
first
().
preview
it
.
preview
=
list
.
first
().
preview
}
list
.
add
(
it
)
}
}
list
.
add
(
it
)
}
}
for
(
i
in
list
.
size
-
1
downTo
0
)
{
for
(
i
in
list
.
size
-
1
downTo
0
)
{
val
next
=
if
(
i
-
1
<
0
)
null
else
list
[
i
-
1
]
val
next
=
if
(
i
-
1
<
0
)
null
else
list
[
i
-
1
]
list
[
i
].
nextDownStreamMessage
=
next
list
[
i
].
nextDownStreamMessage
=
next
...
@@ -214,24 +217,26 @@ class UiModelMapper @Inject constructor(
...
@@ -214,24 +217,26 @@ class UiModelMapper @Inject constructor(
withContext
(
CommonPool
)
{
withContext
(
CommonPool
)
{
val
list
=
ArrayList
<
BaseUiModel
<*>>()
val
list
=
ArrayList
<
BaseUiModel
<*>>()
mapMessage
(
message
).
let
{
getChatRoomAsync
(
message
.
roomId
)
?.
let
{
chatRoom
->
if
(
list
.
isNotEmpty
())
{
mapMessage
(
message
,
chatRoom
).
let
{
it
.
preview
=
list
.
first
().
preview
if
(
list
.
isNotEmpty
())
{
it
.
preview
=
list
.
first
().
preview
}
list
.
add
(
it
)
}
}
list
.
add
(
it
)
}
message
.
attachments
?.
forEach
{
message
.
attachments
?.
forEach
{
val
attachment
=
mapAttachment
(
message
,
it
)
val
attachment
=
mapAttachment
(
message
,
it
,
chatRoom
)
attachment
?.
let
{
attachment
?.
let
{
list
.
add
(
attachment
)
list
.
add
(
attachment
)
}
}
}
}
message
.
urls
?.
forEach
{
message
.
urls
?.
forEach
{
val
url
=
mapUrl
(
message
,
it
)
val
url
=
mapUrl
(
message
,
it
,
chatRoom
)
url
?.
let
{
url
?.
let
{
list
.
add
(
url
)
list
.
add
(
url
)
}
}
}
}
}
...
@@ -283,11 +288,12 @@ class UiModelMapper @Inject constructor(
...
@@ -283,11 +288,12 @@ class UiModelMapper @Inject constructor(
nextDownStreamMessage
=
null
,
nextDownStreamMessage
=
null
,
unread
=
message
.
unread
,
unread
=
message
.
unread
,
currentDayMarkerText
=
dayMarkerText
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
showDayMarker
=
false
,
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
)
)
}
}
private
fun
mapUrl
(
message
:
Message
,
url
:
Url
):
BaseUiModel
<
*
>?
{
private
fun
mapUrl
(
message
:
Message
,
url
:
Url
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
if
(
url
.
ignoreParse
||
url
.
meta
==
null
)
return
null
if
(
url
.
ignoreParse
||
url
.
meta
==
null
)
return
null
val
hostname
=
url
.
parsedUrl
?.
hostname
?:
""
val
hostname
=
url
.
parsedUrl
?.
hostname
?:
""
...
@@ -297,39 +303,53 @@ class UiModelMapper @Inject constructor(
...
@@ -297,39 +303,53 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
return
UrlPreviewUiModel
(
message
,
url
,
message
.
id
,
title
,
hostname
,
description
,
thumb
,
return
UrlPreviewUiModel
(
message
,
url
,
message
.
id
,
title
,
hostname
,
description
,
thumb
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
url
.
url
),
unread
=
message
.
unread
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
url
.
url
),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
}
}
private
fun
mapAttachment
(
message
:
Message
,
attachment
:
Attachment
):
BaseUiModel
<
*
>?
{
private
fun
mapAttachment
(
message
:
Message
,
attachment
:
Attachment
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
return
when
(
attachment
)
{
return
when
(
attachment
)
{
is
FileAttachment
->
mapFileAttachment
(
message
,
attachment
)
is
FileAttachment
->
mapFileAttachment
(
message
,
attachment
,
chatRoom
)
is
MessageAttachment
->
mapMessageAttachment
(
message
,
attachment
)
is
MessageAttachment
->
mapMessageAttachment
(
message
,
attachment
,
chatRoom
)
is
AuthorAttachment
->
mapAuthorAttachment
(
message
,
attachment
)
is
AuthorAttachment
->
mapAuthorAttachment
(
message
,
attachment
,
chatRoom
)
is
ColorAttachment
->
mapColorAttachment
(
message
,
attachment
)
is
ColorAttachment
->
mapColorAttachment
(
message
,
attachment
,
chatRoom
)
is
ActionsAttachment
->
mapActionsAttachment
(
message
,
attachment
)
is
ActionsAttachment
->
mapActionsAttachment
(
message
,
attachment
,
chatRoom
)
else
->
null
else
->
null
}
}
}
}
private
fun
mapActionsAttachment
(
message
:
Message
,
attachment
:
ActionsAttachment
):
BaseUiModel
<
*
>?
{
private
fun
mapActionsAttachment
(
message
:
Message
,
attachment
:
ActionsAttachment
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
return
with
(
attachment
)
{
return
with
(
attachment
)
{
val
content
=
stripMessageQuotes
(
message
)
val
content
=
stripMessageQuotes
(
message
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
ActionsAttachmentUiModel
(
attachmentUrl
=
url
,
title
=
title
,
ActionsAttachmentUiModel
(
attachmentUrl
=
url
,
title
=
title
,
actions
=
actions
,
buttonAlignment
=
buttonAlignment
,
message
=
message
,
rawData
=
attachment
,
actions
=
actions
,
buttonAlignment
=
buttonAlignment
,
message
=
message
,
rawData
=
attachment
,
messageId
=
message
.
id
,
reactions
=
getReactions
(
message
),
messageId
=
message
.
id
,
reactions
=
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
}
}
}
}
private
fun
mapColorAttachment
(
message
:
Message
,
attachment
:
ColorAttachment
):
BaseUiModel
<
*
>?
{
private
fun
mapColorAttachment
(
message
:
Message
,
attachment
:
ColorAttachment
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
return
with
(
attachment
)
{
return
with
(
attachment
)
{
val
content
=
stripMessageQuotes
(
message
)
val
content
=
stripMessageQuotes
(
message
)
val
id
=
attachmentId
(
message
,
attachment
)
val
id
=
attachmentId
(
message
,
attachment
)
...
@@ -337,12 +357,13 @@ class UiModelMapper @Inject constructor(
...
@@ -337,12 +357,13 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
fieldsText
=
mapFields
(
fields
)
val
fieldsText
=
mapFields
(
fields
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
ColorAttachmentUiModel
(
attachmentUrl
=
url
,
id
=
id
,
color
=
color
.
color
,
ColorAttachmentUiModel
(
attachmentUrl
=
url
,
id
=
id
,
color
=
color
.
color
,
text
=
text
,
fields
=
fieldsText
,
message
=
message
,
rawData
=
attachment
,
text
=
text
,
fields
=
fieldsText
,
message
=
message
,
rawData
=
attachment
,
messageId
=
message
.
id
,
reactions
=
getReactions
(
message
),
messageId
=
message
.
id
,
reactions
=
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
}
}
}
}
...
@@ -364,7 +385,11 @@ class UiModelMapper @Inject constructor(
...
@@ -364,7 +385,11 @@ class UiModelMapper @Inject constructor(
}
}
}
}
private
fun
mapAuthorAttachment
(
message
:
Message
,
attachment
:
AuthorAttachment
):
AuthorAttachmentUiModel
{
private
fun
mapAuthorAttachment
(
message
:
Message
,
attachment
:
AuthorAttachment
,
chatRoom
:
ChatRoom
):
AuthorAttachmentUiModel
{
return
with
(
attachment
)
{
return
with
(
attachment
)
{
val
content
=
stripMessageQuotes
(
message
)
val
content
=
stripMessageQuotes
(
message
)
...
@@ -373,16 +398,21 @@ class UiModelMapper @Inject constructor(
...
@@ -373,16 +398,21 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
AuthorAttachmentUiModel
(
attachmentUrl
=
url
,
id
=
id
,
name
=
authorName
,
AuthorAttachmentUiModel
(
attachmentUrl
=
url
,
id
=
id
,
name
=
authorName
,
icon
=
authorIcon
,
fields
=
fieldsText
,
message
=
message
,
rawData
=
attachment
,
icon
=
authorIcon
,
fields
=
fieldsText
,
message
=
message
,
rawData
=
attachment
,
messageId
=
message
.
id
,
reactions
=
getReactions
(
message
),
messageId
=
message
.
id
,
reactions
=
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
}
}
}
}
private
fun
mapMessageAttachment
(
message
:
Message
,
attachment
:
MessageAttachment
):
MessageAttachmentUiModel
{
private
fun
mapMessageAttachment
(
message
:
Message
,
attachment
:
MessageAttachment
,
chatRoom
:
ChatRoom
):
MessageAttachmentUiModel
{
val
attachmentAuthor
=
attachment
.
author
val
attachmentAuthor
=
attachment
.
author
val
time
=
attachment
.
timestamp
?.
let
{
getTime
(
it
)
}
val
time
=
attachment
.
timestamp
?.
let
{
getTime
(
it
)
}
val
attachmentText
=
when
(
attachment
.
attachments
.
orEmpty
().
firstOrNull
())
{
val
attachmentText
=
when
(
attachment
.
attachments
.
orEmpty
().
firstOrNull
())
{
...
@@ -397,15 +427,20 @@ class UiModelMapper @Inject constructor(
...
@@ -397,15 +427,20 @@ class UiModelMapper @Inject constructor(
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
content
=
stripMessageQuotes
(
message
)
val
content
=
stripMessageQuotes
(
message
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
return
MessageAttachmentUiModel
(
message
=
content
,
rawData
=
message
,
return
MessageAttachmentUiModel
(
message
=
content
,
rawData
=
message
,
messageId
=
message
.
id
,
time
=
time
,
senderName
=
attachmentAuthor
,
messageId
=
message
.
id
,
time
=
time
,
senderName
=
attachmentAuthor
,
content
=
attachmentText
,
isPinned
=
message
.
pinned
,
reactions
=
getReactions
(
message
),
content
=
attachmentText
,
isPinned
=
message
.
pinned
,
reactions
=
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
content
.
message
),
unread
=
message
.
unread
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
)
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
,
permalink
=
permalink
)
}
}
private
fun
mapFileAttachment
(
message
:
Message
,
attachment
:
FileAttachment
):
BaseUiModel
<
*
>?
{
private
fun
mapFileAttachment
(
message
:
Message
,
attachment
:
FileAttachment
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
val
attachmentUrl
=
attachmentUrl
(
attachment
)
val
attachmentUrl
=
attachmentUrl
(
attachment
)
val
attachmentTitle
=
attachmentTitle
(
attachment
)
val
attachmentTitle
=
attachmentTitle
(
attachment
)
val
attachmentText
=
attachmentText
(
attachment
)
val
attachmentText
=
attachmentText
(
attachment
)
...
@@ -414,24 +449,25 @@ class UiModelMapper @Inject constructor(
...
@@ -414,24 +449,25 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
return
when
(
attachment
)
{
return
when
(
attachment
)
{
is
ImageAttachment
->
ImageAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
is
ImageAttachment
->
ImageAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
attachmentUrl
,
attachmentTitle
,
attachmentText
,
attachmentDescription
,
id
,
getReactions
(
message
),
attachmentUrl
,
attachmentTitle
,
attachmentText
,
attachmentDescription
,
id
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_photo
)),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_photo
)),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
is
VideoAttachment
->
VideoAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
is
VideoAttachment
->
VideoAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
attachmentUrl
,
attachmentTitle
,
id
,
getReactions
(
message
),
attachmentUrl
,
attachmentTitle
,
id
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_video
)),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_video
)),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
is
AudioAttachment
->
AudioAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
is
AudioAttachment
->
AudioAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
attachmentUrl
,
attachmentTitle
,
id
,
getReactions
(
message
),
attachmentUrl
,
attachmentTitle
,
id
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_audio
)),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_audio
)),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
is
GenericFileAttachment
->
GenericFileAttachmentUiModel
(
message
,
attachment
,
is
GenericFileAttachment
->
GenericFileAttachmentUiModel
(
message
,
attachment
,
message
.
id
,
attachmentUrl
,
attachmentTitle
,
id
,
getReactions
(
message
),
message
.
id
,
attachmentUrl
,
attachmentTitle
,
id
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_file
)),
unread
=
message
.
unread
,
preview
=
message
.
copy
(
message
=
context
.
getString
(
R
.
string
.
msg_preview_file
)),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
else
->
null
else
->
null
}
}
}
}
...
@@ -479,7 +515,10 @@ class UiModelMapper @Inject constructor(
...
@@ -479,7 +515,10 @@ class UiModelMapper @Inject constructor(
return
attachment
.
description
return
attachment
.
description
}
}
private
suspend
fun
mapMessage
(
message
:
Message
):
MessageUiModel
=
withContext
(
CommonPool
)
{
private
suspend
fun
mapMessage
(
message
:
Message
,
chatRoom
:
ChatRoom
):
MessageUiModel
=
withContext
(
CommonPool
)
{
val
sender
=
getSenderName
(
message
)
val
sender
=
getSenderName
(
message
)
val
time
=
getTime
(
message
.
timestamp
)
val
time
=
getTime
(
message
.
timestamp
)
val
avatar
=
getUserAvatar
(
message
)
val
avatar
=
getUserAvatar
(
message
)
...
@@ -493,13 +532,14 @@ class UiModelMapper @Inject constructor(
...
@@ -493,13 +532,14 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
val
content
=
getContent
(
stripMessageQuotes
(
message
))
val
content
=
getContent
(
stripMessageQuotes
(
message
))
MessageUiModel
(
message
=
stripMessageQuotes
(
message
),
rawData
=
message
,
MessageUiModel
(
message
=
stripMessageQuotes
(
message
),
rawData
=
message
,
messageId
=
message
.
id
,
avatar
=
avatar
!!
,
time
=
time
,
senderName
=
sender
,
messageId
=
message
.
id
,
avatar
=
avatar
!!
,
time
=
time
,
senderName
=
sender
,
content
=
content
,
isPinned
=
message
.
pinned
,
currentDayMarkerText
=
dayMarkerText
,
content
=
content
,
isPinned
=
message
.
pinned
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
,
reactions
=
getReactions
(
message
),
isFirstUnread
=
false
,
showDayMarker
=
false
,
reactions
=
getReactions
(
message
),
isFirstUnread
=
false
,
preview
=
preview
,
isTemporary
=
!
synced
,
unread
=
unread
)
preview
=
preview
,
isTemporary
=
!
synced
,
unread
=
unread
,
permalink
=
permalink
)
}
}
private
fun
mapMessagePreview
(
message
:
Message
):
Message
{
private
fun
mapMessagePreview
(
message
:
Message
):
Message
{
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/UrlPreviewUiModel.kt
View file @
8aa843bc
...
@@ -19,7 +19,8 @@ data class UrlPreviewUiModel(
...
@@ -19,7 +19,8 @@ data class UrlPreviewUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseUiModel
<
Url
>
{
)
:
BaseUiModel
<
Url
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
URL_PREVIEW
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
URL_PREVIEW
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/VideoAttachmentUiModel.kt
View file @
8aa843bc
...
@@ -5,20 +5,21 @@ import chat.rocket.core.model.Message
...
@@ -5,20 +5,21 @@ import chat.rocket.core.model.Message
import
chat.rocket.core.model.attachment.VideoAttachment
import
chat.rocket.core.model.attachment.VideoAttachment
data class
VideoAttachmentUiModel
(
data class
VideoAttachmentUiModel
(
override
val
message
:
Message
,
override
val
message
:
Message
,
override
val
rawData
:
VideoAttachment
,
override
val
rawData
:
VideoAttachment
,
override
val
messageId
:
String
,
override
val
messageId
:
String
,
override
val
attachmentUrl
:
String
,
override
val
attachmentUrl
:
String
,
override
val
attachmentTitle
:
CharSequence
,
override
val
attachmentTitle
:
CharSequence
,
override
val
id
:
Long
,
override
val
id
:
Long
,
override
var
reactions
:
List
<
ReactionUiModel
>,
override
var
reactions
:
List
<
ReactionUiModel
>,
override
var
nextDownStreamMessage
:
BaseUiModel
<*>?
=
null
,
override
var
nextDownStreamMessage
:
BaseUiModel
<*>?
=
null
,
override
var
preview
:
Message
?
=
null
,
override
var
preview
:
Message
?
=
null
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
unread
:
Boolean
?
=
null
,
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseFileAttachmentUiModel
<
VideoAttachment
>
{
)
:
BaseFileAttachmentUiModel
<
VideoAttachment
>
{
override
val
viewType
:
Int
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
VIDEO_ATTACHMENT
.
viewType
get
()
=
BaseUiModel
.
ViewType
.
VIDEO_ATTACHMENT
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/suggestion/ChatRoomSuggestionUiModel.kt
View file @
8aa843bc
...
@@ -2,7 +2,9 @@ package chat.rocket.android.chatroom.uimodel.suggestion
...
@@ -2,7 +2,9 @@ package chat.rocket.android.chatroom.uimodel.suggestion
import
chat.rocket.android.suggestions.model.SuggestionModel
import
chat.rocket.android.suggestions.model.SuggestionModel
class
ChatRoomSuggestionUiModel
(
text
:
String
,
class
ChatRoomSuggestionUiModel
(
val
fullName
:
String
,
text
:
String
,
val
name
:
String
,
val
fullName
:
String
,
searchList
:
List
<
String
>)
:
SuggestionModel
(
text
,
searchList
,
false
)
val
name
:
String
,
\ No newline at end of file
searchList
:
List
<
String
>
)
:
SuggestionModel
(
text
,
searchList
,
false
)
app/src/main/java/chat/rocket/android/chatroom/uimodel/suggestion/CommandSuggestionUiModel.kt
View file @
8aa843bc
...
@@ -2,6 +2,8 @@ package chat.rocket.android.chatroom.uimodel.suggestion
...
@@ -2,6 +2,8 @@ package chat.rocket.android.chatroom.uimodel.suggestion
import
chat.rocket.android.suggestions.model.SuggestionModel
import
chat.rocket.android.suggestions.model.SuggestionModel
class
CommandSuggestionUiModel
(
text
:
String
,
class
CommandSuggestionUiModel
(
val
description
:
String
,
text
:
String
,
searchList
:
List
<
String
>)
:
SuggestionModel
(
text
,
searchList
)
val
description
:
String
,
\ No newline at end of file
searchList
:
List
<
String
>
)
:
SuggestionModel
(
text
,
searchList
)
\ No newline at end of file
app/src/main/java/chat/rocket/android/chatroom/uimodel/suggestion/PeopleSuggestionUiModel.kt
View file @
8aa843bc
...
@@ -3,13 +3,15 @@ package chat.rocket.android.chatroom.uimodel.suggestion
...
@@ -3,13 +3,15 @@ package chat.rocket.android.chatroom.uimodel.suggestion
import
chat.rocket.android.suggestions.model.SuggestionModel
import
chat.rocket.android.suggestions.model.SuggestionModel
import
chat.rocket.common.model.UserStatus
import
chat.rocket.common.model.UserStatus
class
PeopleSuggestionUiModel
(
val
imageUri
:
String
?,
class
PeopleSuggestionUiModel
(
text
:
String
,
val
imageUri
:
String
?,
val
username
:
String
,
text
:
String
,
val
name
:
String
,
val
username
:
String
,
val
status
:
UserStatus
?,
val
name
:
String
,
pinned
:
Boolean
=
false
,
val
status
:
UserStatus
?,
searchList
:
List
<
String
>)
:
SuggestionModel
(
text
,
searchList
,
pinned
)
{
pinned
:
Boolean
=
false
,
searchList
:
List
<
String
>
)
:
SuggestionModel
(
text
,
searchList
,
pinned
)
{
override
fun
toString
():
String
{
override
fun
toString
():
String
{
return
"PeopleSuggestionUiModel(imageUri='$imageUri', username='$username', name='$name', status=$status, pinned=$pinned)"
return
"PeopleSuggestionUiModel(imageUri='$imageUri', username='$username', name='$name', status=$status, pinned=$pinned)"
...
...
app/src/main/java/chat/rocket/android/helper/MessageHelper.kt
View file @
8aa843bc
...
@@ -17,7 +17,7 @@ class MessageHelper @Inject constructor(
...
@@ -17,7 +17,7 @@ class MessageHelper @Inject constructor(
private
val
currentServer
=
serverInteractor
.
get
()
!!
private
val
currentServer
=
serverInteractor
.
get
()
!!
private
val
settings
:
PublicSettings
=
getSettingsInteractor
.
get
(
currentServer
)
private
val
settings
:
PublicSettings
=
getSettingsInteractor
.
get
(
currentServer
)
fun
createPermalink
(
message
:
Message
,
chatRoom
:
ChatRoom
):
String
{
fun
createPermalink
(
message
:
Message
,
chatRoom
:
ChatRoom
,
markdownSyntax
:
Boolean
=
true
):
String
{
val
type
=
when
(
chatRoom
.
type
)
{
val
type
=
when
(
chatRoom
.
type
)
{
is
RoomType
.
PrivateGroup
->
"group"
is
RoomType
.
PrivateGroup
->
"group"
is
RoomType
.
Channel
->
"channel"
is
RoomType
.
Channel
->
"channel"
...
@@ -30,7 +30,8 @@ class MessageHelper @Inject constructor(
...
@@ -30,7 +30,8 @@ class MessageHelper @Inject constructor(
}
else
{
}
else
{
chatRoom
.
name
chatRoom
.
name
}
}
return
"[ ]($currentServer/$type/$name?msg=${message.id}) "
val
permalink
=
"$currentServer/$type/$name?msg=${message.id}"
return
if
(
markdownSyntax
)
"[ ]($permalink) "
else
permalink
}
}
fun
messageIdFromPermalink
(
permalink
:
String
):
String
?
{
fun
messageIdFromPermalink
(
permalink
:
String
):
String
?
{
...
...
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
8aa843bc
...
@@ -14,6 +14,7 @@ import android.view.View
...
@@ -14,6 +14,7 @@ import android.view.View
import
androidx.core.content.res.ResourcesCompat
import
androidx.core.content.res.ResourcesCompat
import
androidx.core.util.PatternsCompat
import
androidx.core.util.PatternsCompat
import
chat.rocket.android.R
import
chat.rocket.android.R
import
androidx.core.util.PatternsCompat
import
chat.rocket.android.chatroom.ui.StrikethroughDelimiterProcessor
import
chat.rocket.android.chatroom.ui.StrikethroughDelimiterProcessor
import
chat.rocket.android.emoji.EmojiParser
import
chat.rocket.android.emoji.EmojiParser
import
chat.rocket.android.emoji.EmojiRepository
import
chat.rocket.android.emoji.EmojiRepository
...
...
app/src/main/res/drawable/ic_action_message_link_24dp.xml
0 → 100644
View file @
8aa843bc
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"20"
android:viewportHeight=
"20"
>
<path
android:fillColor=
"@color/actionMenuColor"
android:pathData=
"M9.548,14.23l-2.651,2.652a2.676,2.676 0,0 1,-3.78 0,2.676 2.676,0 0,1 0,-3.78L6.91,9.311a2.677,2.677 0,0 1,3.781 0,0.669 0.669,0 0,0 0.945,-0.946 4.015,4.015 0,0 0,-5.67 0l-3.792,3.792a4.014,4.014 0,0 0,0 5.67,4.014 4.014,0 0,0 5.67,0l2.65,-2.65a0.669,0.669 0,0 0,-0.945 -0.947zM17.828,2.173a4.014,4.014 0,0 0,-5.67 0L9.506,4.824a0.668,0.668 0,1 0,0.946 0.945l2.651,-2.651a2.676,2.676 0,0 1,3.78 0,2.676 2.676,0 0,1 0,3.78L13.09,10.69a2.678,2.678 0,0 1,-3.781 0,0.668 0.668,0 1,0 -0.945,0.945 4.015,4.015 0,0 0,5.67 0l3.793,-3.792a4.014,4.014 0,0 0,0 -5.67z"
/>
</vector>
app/src/main/res/menu/message_actions.xml
View file @
8aa843bc
...
@@ -12,6 +12,11 @@
...
@@ -12,6 +12,11 @@
android:icon=
"@drawable/ic_action_message_reply_24dp"
android:icon=
"@drawable/ic_action_message_reply_24dp"
android:title=
"@string/action_msg_reply"
/>
android:title=
"@string/action_msg_reply"
/>
<item
android:id=
"@+id/action_message_permalink"
android:icon=
"@drawable/ic_action_message_link_24dp"
android:title=
"@string/action_msg_copy_permalink"
/>
<item
<item
android:id=
"@+id/action_message_quote"
android:id=
"@+id/action_message_quote"
android:icon=
"@drawable/ic_action_message_quote_24dp"
android:icon=
"@drawable/ic_action_message_quote_24dp"
...
...
app/src/main/res/values-de/strings.xml
View file @
8aa843bc
...
@@ -163,6 +163,8 @@
...
@@ -163,6 +163,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
...
@@ -199,6 +201,8 @@
...
@@ -199,6 +201,8 @@
<string
name=
"action_msg_share"
>
Teilen
</string>
<string
name=
"action_msg_share"
>
Teilen
</string>
<string
name=
"action_title_editing"
>
Nachricht bearbeiten
</string>
<string
name=
"action_title_editing"
>
Nachricht bearbeiten
</string>
<string
name=
"action_msg_add_reaction"
>
Reaktion hinzufügen
</string>
<string
name=
"action_msg_add_reaction"
>
Reaktion hinzufügen
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Bearbeiten nicht erlaubt
</string>
<string
name=
"permission_editing_not_allowed"
>
Bearbeiten nicht erlaubt
</string>
...
...
app/src/main/res/values-es/strings.xml
View file @
8aa843bc
...
@@ -159,6 +159,8 @@
...
@@ -159,6 +159,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
...
@@ -195,6 +197,7 @@
...
@@ -195,6 +197,7 @@
<string
name=
"action_msg_share"
>
Compartir
</string>
<string
name=
"action_msg_share"
>
Compartir
</string>
<string
name=
"action_title_editing"
>
Edición de mensaje
</string>
<string
name=
"action_title_editing"
>
Edición de mensaje
</string>
<string
name=
"action_msg_add_reaction"
>
Añadir una reacción
</string>
<string
name=
"action_msg_add_reaction"
>
Añadir una reacción
</string>
<string
name=
"action_msg_copy_permalink"
>
Copiar permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
La edición no és permitida
</string>
<string
name=
"permission_editing_not_allowed"
>
La edición no és permitida
</string>
...
...
app/src/main/res/values-fr/strings.xml
View file @
8aa843bc
...
@@ -154,6 +154,8 @@
...
@@ -154,6 +154,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Privé
</string>
<string
name=
"msg_private_channel"
>
Privé
</string>
...
@@ -203,6 +205,8 @@
...
@@ -203,6 +205,8 @@
<string
name=
"action_msg_share"
>
Partager
</string>
<string
name=
"action_msg_share"
>
Partager
</string>
<string
name=
"action_title_editing"
>
Modification du message
</string>
<string
name=
"action_title_editing"
>
Modification du message
</string>
<string
name=
"action_msg_add_reaction"
>
Ajouter une réaction
</string>
<string
name=
"action_msg_add_reaction"
>
Ajouter une réaction
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
L\'édition n\'est pas autorisée
</string>
<string
name=
"permission_editing_not_allowed"
>
L\'édition n\'est pas autorisée
</string>
...
...
app/src/main/res/values-hi-rIN/strings.xml
View file @
8aa843bc
...
@@ -165,6 +165,8 @@
...
@@ -165,6 +165,8 @@
<string
name=
"msg_channel_created_successfully"
>
चैनल सफलतापूर्वक बनाया गया
</string>
<string
name=
"msg_channel_created_successfully"
>
चैनल सफलतापूर्वक बनाया गया
</string>
<string
name=
"msg_view_more"
>
और देखें
</string>
<string
name=
"msg_view_more"
>
और देखें
</string>
<string
name=
"msg_view_less"
>
कम देखें
</string>
<string
name=
"msg_view_less"
>
कम देखें
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
एनालिटिक्स ट्रैकिंग
</string>
<string
name=
"msg_analytics_tracking"
>
एनालिटिक्स ट्रैकिंग
</string>
...
@@ -187,7 +189,6 @@
...
@@ -187,7 +189,6 @@
<string
name=
"message_role_removed"
>
%1$s अब %3$s द्वारा %2$s नहीं है
</string>
<string
name=
"message_role_removed"
>
%1$s अब %3$s द्वारा %2$s नहीं है
</string>
<string
name=
"message_credentials_saved_successfully"
>
प्रमाण पत्र सफलतापूर्वक सहेजे गए
</string>
<string
name=
"message_credentials_saved_successfully"
>
प्रमाण पत्र सफलतापूर्वक सहेजे गए
</string>
<!-- Message actions -->
<!-- Message actions -->
<string
name=
"action_msg_reply"
>
जवाब दें
</string>
<string
name=
"action_msg_reply"
>
जवाब दें
</string>
<string
name=
"action_msg_info"
>
संदेश जानकारी
</string>
<string
name=
"action_msg_info"
>
संदेश जानकारी
</string>
...
@@ -202,6 +203,8 @@
...
@@ -202,6 +203,8 @@
<string
name=
"action_msg_share"
>
शेयर करें
</string>
<string
name=
"action_msg_share"
>
शेयर करें
</string>
<string
name=
"action_title_editing"
>
संपादन संदेश
</string>
<string
name=
"action_title_editing"
>
संपादन संदेश
</string>
<string
name=
"action_msg_add_reaction"
>
प्रतिक्रिया जोड़ें
</string>
<string
name=
"action_msg_add_reaction"
>
प्रतिक्रिया जोड़ें
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
संपादन की अनुमति नहीं है
</string>
<string
name=
"permission_editing_not_allowed"
>
संपादन की अनुमति नहीं है
</string>
...
...
app/src/main/res/values-ja/strings.xml
View file @
8aa843bc
...
@@ -169,6 +169,8 @@
...
@@ -169,6 +169,8 @@
<string
name=
"msg_message_copied"
>
メッセージをコピー
</string>
<string
name=
"msg_message_copied"
>
メッセージをコピー
</string>
<string
name=
"msg_delete_message"
>
メッセージを削除
</string>
<string
name=
"msg_delete_message"
>
メッセージを削除
</string>
<string
name=
"msg_delete_description"
>
このメッセージを削除してもよろしいですか?
</string>
<string
name=
"msg_delete_description"
>
このメッセージを削除してもよろしいですか?
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
...
@@ -205,6 +207,8 @@
...
@@ -205,6 +207,8 @@
<string
name=
"action_msg_share"
>
Share
</string>
<string
name=
"action_msg_share"
>
Share
</string>
<string
name=
"action_title_editing"
>
メッセージの編集
</string>
<string
name=
"action_title_editing"
>
メッセージの編集
</string>
<string
name=
"action_msg_add_reaction"
>
リアクションする
</string>
<string
name=
"action_msg_add_reaction"
>
リアクションする
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
編集は許可されていません
</string>
<string
name=
"permission_editing_not_allowed"
>
編集は許可されていません
</string>
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
8aa843bc
...
@@ -152,6 +152,8 @@
...
@@ -152,6 +152,8 @@
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<!-- TODO Add translation -->
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<!-- TODO Add translation -->
<string
name=
"msg_view_more"
>
visualizar mais
</string>
<string
name=
"msg_view_more"
>
visualizar mais
</string>
<string
name=
"msg_view_less"
>
visualizar menos
</string>
<string
name=
"msg_view_less"
>
visualizar menos
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copiado
</string>
<!-- Create channel messages -->
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Privado
</string>
<string
name=
"msg_private_channel"
>
Privado
</string>
...
@@ -201,6 +203,7 @@
...
@@ -201,6 +203,7 @@
<string
name=
"action_msg_share"
>
Compartilhar
</string>
<string
name=
"action_msg_share"
>
Compartilhar
</string>
<string
name=
"action_title_editing"
>
Editando mensagem
</string>
<string
name=
"action_title_editing"
>
Editando mensagem
</string>
<string
name=
"action_msg_add_reaction"
>
Adicionar reação
</string>
<string
name=
"action_msg_add_reaction"
>
Adicionar reação
</string>
<string
name=
"action_msg_copy_permalink"
>
Copiar permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Edição não permitida
</string>
<string
name=
"permission_editing_not_allowed"
>
Edição não permitida
</string>
...
...
app/src/main/res/values-ru-rRU/strings.xml
View file @
8aa843bc
...
@@ -150,6 +150,8 @@
...
@@ -150,6 +150,8 @@
<string
name=
"msg__your_2fa_code"
>
Ваш код 2FA?
</string>
<string
name=
"msg__your_2fa_code"
>
Ваш код 2FA?
</string>
<string
name=
"msg_view_more"
>
больше
</string>
<string
name=
"msg_view_more"
>
больше
</string>
<string
name=
"msg_view_less"
>
меньше
</string>
<string
name=
"msg_view_less"
>
меньше
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Приватный
</string>
<string
name=
"msg_private_channel"
>
Приватный
</string>
...
@@ -198,6 +200,8 @@
...
@@ -198,6 +200,8 @@
<string
name=
"action_msg_share"
>
Поделиться
</string>
<string
name=
"action_msg_share"
>
Поделиться
</string>
<string
name=
"action_title_editing"
>
Редактирование сообщения
</string>
<string
name=
"action_title_editing"
>
Редактирование сообщения
</string>
<string
name=
"action_msg_add_reaction"
>
Отреагировать
</string>
<string
name=
"action_msg_add_reaction"
>
Отреагировать
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Редактирование запрещено
</string>
<string
name=
"permission_editing_not_allowed"
>
Редактирование запрещено
</string>
...
...
app/src/main/res/values-tr/strings.xml
View file @
8aa843bc
...
@@ -166,6 +166,8 @@
...
@@ -166,6 +166,8 @@
<string
name=
"msg_delete_description"
>
Bu mesajı silmek istediğinizden emin misiniz
</string>
<string
name=
"msg_delete_description"
>
Bu mesajı silmek istediğinizden emin misiniz
</string>
<string
name=
"msg_view_more"
>
Daha fazla göster
</string>
<string
name=
"msg_view_more"
>
Daha fazla göster
</string>
<string
name=
"msg_view_less"
>
Daha az göster
</string>
<string
name=
"msg_view_less"
>
Daha az göster
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
İstatistik takibi
</string>
<string
name=
"msg_analytics_tracking"
>
İstatistik takibi
</string>
...
@@ -202,6 +204,8 @@
...
@@ -202,6 +204,8 @@
<string
name=
"action_msg_share"
>
Paylaş
</string>
<string
name=
"action_msg_share"
>
Paylaş
</string>
<string
name=
"action_title_editing"
>
Mesaj Düzenleniyor
</string>
<string
name=
"action_title_editing"
>
Mesaj Düzenleniyor
</string>
<string
name=
"action_msg_add_reaction"
>
Tepki Ekle
</string>
<string
name=
"action_msg_add_reaction"
>
Tepki Ekle
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Düzenlemeye izin verilmiyor
</string>
<string
name=
"permission_editing_not_allowed"
>
Düzenlemeye izin verilmiyor
</string>
...
...
app/src/main/res/values-uk/strings.xml
View file @
8aa843bc
...
@@ -151,6 +151,8 @@
...
@@ -151,6 +151,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Приватний
</string>
<string
name=
"msg_private_channel"
>
Приватний
</string>
...
@@ -199,6 +201,8 @@
...
@@ -199,6 +201,8 @@
<string
name=
"action_msg_share"
>
Поділитися
</string>
<string
name=
"action_msg_share"
>
Поділитися
</string>
<string
name=
"action_title_editing"
>
Редагування повідомлення
</string>
<string
name=
"action_title_editing"
>
Редагування повідомлення
</string>
<string
name=
"action_msg_add_reaction"
>
Відреагувати
</string>
<string
name=
"action_msg_add_reaction"
>
Відреагувати
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Редагування заборонено
</string>
<string
name=
"permission_editing_not_allowed"
>
Редагування заборонено
</string>
...
...
app/src/main/res/values/strings.xml
View file @
8aa843bc
...
@@ -161,6 +161,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -161,6 +161,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"msg_continue_with_wordpress"
>
Continue with
<b>
WordPress
</b></string>
<string
name=
"msg_continue_with_wordpress"
>
Continue with
<b>
WordPress
</b></string>
<string
name=
"msg_two_factor_authentication"
>
Two-factor Authentication
</string>
<string
name=
"msg_two_factor_authentication"
>
Two-factor Authentication
</string>
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Private
</string>
<string
name=
"msg_private_channel"
>
Private
</string>
...
@@ -214,6 +215,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -214,6 +215,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"action_msg_share"
>
Share
</string>
<string
name=
"action_msg_share"
>
Share
</string>
<string
name=
"action_title_editing"
>
Editing Message
</string>
<string
name=
"action_title_editing"
>
Editing Message
</string>
<string
name=
"action_msg_add_reaction"
>
Add reaction
</string>
<string
name=
"action_msg_add_reaction"
>
Add reaction
</string>
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Editing is not allowed
</string>
<string
name=
"permission_editing_not_allowed"
>
Editing is not allowed
</string>
...
...
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