Commit 7f5f2c3d authored by pcforgeek's avatar pcforgeek

Fixed indentations

parent f882e57c
...@@ -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
......
...@@ -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
} }
} }
......
...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment