sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-08 21:37:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1484 from ilally93/system-message-timestamp

Browse source 
Added system message timestamps
This commit is contained in:
Phillip Thelen 2021-06-01 10:31:06 +02:00 committed by GitHub
commit 4f97cd19f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Habitica/res/layout/system_chat_message.xml
View file

@ -19,4 +19,16 @@
android:textColor="@color/text_brand_neon"
tools:text="System message"
style="@style/Body1"/>
<TextView
android:id="@+id/system_message_timestamp"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:singleLine="true"
android:lines="1"
android:ellipsize="end"
tools:text="Apr 20, 2:32 PM"
android:textSize="12sp"
android:textColor="@color/text_quad"/>
</LinearLayout>

28
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
View file

@ -1,10 +1,14 @@
package com.habitrpg.android.habitica.ui.adapter.social
import android.os.Build
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.annotation.RequiresApi
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ChatItemBinding
import com.habitrpg.android.habitica.databinding.SystemChatMessageBinding
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.models.social.ChatMessage
import com.habitrpg.android.habitica.models.user.User
@ -45,7 +49,10 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : Base
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
if (data[position].isSystemMessage) {
(holder as? SystemChatMessageViewHolder)?.bind(data[position])
val sysChatHolder = holder as? SystemChatMessageViewHolder ?: return
sysChatHolder.bind(data[position],
expandedMessageId == data[position].id)
sysChatHolder.onShouldExpand = { expandMessage(data[position].id, position)}
} else {
val chatHolder = holder as? ChatRecyclerMessageViewHolder ?: return
val message = data[position]
@ -103,9 +110,26 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : Base
class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
private val textView: TextView = itemView.findViewById(R.id.text_view)
private val timestamp: TextView = itemView.findViewById(R.id.system_message_timestamp)
private val dateTime = java.text.SimpleDateFormat("MMM dd, hh:mm aaa")
val binding = SystemChatMessageBinding.bind(itemView)
fun bind(chatMessage: ChatMessage?) {
var onShouldExpand: (() -> Unit)? = null
init{
textView.setOnClickListener {
onShouldExpand?.invoke()
}
}
fun bind(chatMessage: ChatMessage?, isExpanded: Boolean) {
textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
timestamp.text = dateTime.format(chatMessage?.timestamp?.let { java.util.Date(it) })
if(isExpanded) {
binding.systemMessageTimestamp.visibility = View.VISIBLE
} else {
binding.systemMessageTimestamp.visibility = View.GONE
}
}
}