improve customization display

This commit is contained in:
Phillip Thelen 2022-07-26 15:33:53 +02:00
parent 4ac860e7d7
commit bfabb0bdee
2 changed files with 5 additions and 8 deletions

View file

@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.adapter.social
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.SystemChatMessageBinding
@ -129,22 +128,20 @@ 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.getDateTimeInstance()
val binding = SystemChatMessageBinding.bind(itemView)
var onShouldExpand: (() -> Unit)? = null
init {
textView.setOnClickListener {
binding.textView.setOnClickListener {
onShouldExpand?.invoke()
}
}
fun bind(chatMessage: ChatMessage?, isExpanded: Boolean) {
textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
timestamp.text = chatMessage?.timestamp?.let { java.util.Date(it) }
binding.textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
binding.systemMessageTimestamp.text = chatMessage?.timestamp?.let { java.util.Date(it) }
?.let { dateTime.format(it) }
if (isExpanded) {
binding.systemMessageTimestamp.visibility = View.VISIBLE

View file

@ -121,7 +121,7 @@ class AvatarCustomizationFragment :
this.loadCustomizations()
userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
currentFilter.onNext(CustomizationFilter())
currentFilter.onNext(CustomizationFilter(false, type != "background"))
binding?.recyclerView?.doOnLayout {
adapter.columnCount = it.width / (80.dpToPx(context))
@ -287,7 +287,7 @@ class AvatarCustomizationFragment :
currentFilter.onNext(filter)
}
binding.clearButton.setOnClickListener {
currentFilter.onNext(CustomizationFilter())
currentFilter.onNext(CustomizationFilter(false, type != "background"))
dialog.dismiss()
}
if (type == "background") {