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
7f5f2c3d
Commit
7f5f2c3d
authored
Mar 20, 2018
by
pcforgeek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed indentations
parent
f882e57c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
MessageViewHolder.kt
...chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
+1
-1
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+6
-5
ViewModelMapper.kt
...chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
+3
-3
No files found.
app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
View file @
7f5f2c3d
...
@@ -22,7 +22,7 @@ class MessageViewHolder(
...
@@ -22,7 +22,7 @@ class MessageViewHolder(
override
fun
bindViews
(
data
:
MessageViewModel
)
{
override
fun
bindViews
(
data
:
MessageViewModel
)
{
with
(
itemView
)
{
with
(
itemView
)
{
if
(
data
.
showDayMarker
)
{
if
(
data
.
showDayMarker
)
{
day
.
text
=
data
.
currentDayMarkerText
day
.
text
=
data
.
currentDayMarkerText
day_marker_layout
.
visibility
=
View
.
VISIBLE
day_marker_layout
.
visibility
=
View
.
VISIBLE
}
else
day_marker_layout
.
visibility
=
View
.
GONE
}
else
day_marker_layout
.
visibility
=
View
.
GONE
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
7f5f2c3d
...
@@ -169,17 +169,18 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -169,17 +169,18 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
override
fun
showMessages
(
dataSet
:
List
<
BaseViewModel
<*
>>)
{
override
fun
showMessages
(
dataSet
:
List
<
BaseViewModel
<*
>>)
{
var
prevMsgModel
=
dataSet
[
0
]
var
prevMsgModel
=
dataSet
[
0
]
//checking for all messages to assign true to the required showDayMaker
// checking for all messages to assign true to the required showDayMaker
for
(
i
in
dataSet
.
indices
)
{
for
(
i
in
dataSet
.
indices
)
{
val
msgModel
=
dataSet
[
i
]
val
msgModel
=
dataSet
[
i
]
if
(
i
>
0
)
{
if
(
i
>
0
)
{
prevMsgModel
=
dataSet
[
i
-
1
]
prevMsgModel
=
dataSet
[
i
-
1
]
}
}
if
(
msgModel
is
MessageViewModel
&&
prevMsgModel
is
MessageViewModel
){
if
(
msgModel
is
MessageViewModel
&&
prevMsgModel
is
MessageViewModel
)
{
val
currentDayMarkerText
=
msgModel
.
currentDayMarkerText
val
currentDayMarkerText
=
msgModel
.
currentDayMarkerText
val
previousDayMarkerText
=
prevMsgModel
.
currentDayMarkerText
val
previousDayMarkerText
=
prevMsgModel
.
currentDayMarkerText
if
(
previousDayMarkerText
!=
currentDayMarkerText
)
{
if
(
previousDayMarkerText
!=
currentDayMarkerText
)
{
prevMsgModel
.
showDayMarker
=
true
prevMsgModel
.
showDayMarker
=
true
}
}
}
}
...
...
app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
View file @
7f5f2c3d
...
@@ -171,16 +171,16 @@ class ViewModelMapper @Inject constructor(private val context: Context,
...
@@ -171,16 +171,16 @@ class ViewModelMapper @Inject constructor(private val context: Context,
}
}
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
var
dayMarkerText
=
DateTimeHelper
.
getDate
(
localDateTime
,
context
)
var
dayMarkerText
=
DateTimeHelper
.
getDate
(
localDateTime
,
context
)
val
showDayMarker
=
false
val
showDayMarker
=
false
if
(
dayMarkerText
==
getTime
(
message
.
timestamp
))
if
(
dayMarkerText
==
getTime
(
message
.
timestamp
))
dayMarkerText
=
"Today"
dayMarkerText
=
"Today"
val
content
=
getContent
(
context
,
message
,
quote
)
val
content
=
getContent
(
context
,
message
,
quote
)
MessageViewModel
(
message
=
message
,
rawData
=
message
,
messageId
=
message
.
id
,
MessageViewModel
(
message
=
message
,
rawData
=
message
,
messageId
=
message
.
id
,
avatar
=
avatar
!!
,
time
=
time
,
senderName
=
sender
,
avatar
=
avatar
!!
,
time
=
time
,
senderName
=
sender
,
content
=
content
,
isPinned
=
message
.
pinned
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
showDayMarker
,
content
=
content
,
isPinned
=
message
.
pinned
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
showDayMarker
,
reactions
=
getReactions
(
message
),
isFirstUnread
=
false
)
reactions
=
getReactions
(
message
),
isFirstUnread
=
false
)
}
}
...
...
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