jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Clear drafts instead of deleting them

Browse source 
Closes https://github.com/FossifyOrg/Messages/issues/13
This commit is contained in:
Naveen Singh 2025-01-04 03:23:59 +05:30
parent 4434d187bc
commit f343085703
No known key found for this signature in database
GPG key ID: AF5D43C216778C0B
3 changed files with 65 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/kotlin/org/fossify/messages/adapters/BaseConversationsAdapter.kt
View file

@ -1,5 +1,6 @@
package org.fossify.messages.adapters
import android.annotation.SuppressLint
import android.graphics.Typeface
import android.os.Parcelable
import android.util.TypedValue
@ -10,7 +11,11 @@ import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
import org.fossify.commons.adapters.MyRecyclerViewListAdapter
import org.fossify.commons.extensions.*
import org.fossify.commons.extensions.applyColorFilter
import org.fossify.commons.extensions.beVisibleIf
import org.fossify.commons.extensions.formatDateOrTime
import org.fossify.commons.extensions.getTextSize
import org.fossify.commons.extensions.setupViewBackground
import org.fossify.commons.helpers.SimpleContactsHelper
import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.commons.views.MyRecyclerView
@ -22,11 +27,20 @@ import org.fossify.messages.models.Conversation
@Suppress("LeakingThis")
abstract class BaseConversationsAdapter(
activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit
) : MyRecyclerViewListAdapter<Conversation>(activity, recyclerView, ConversationDiffCallback(), itemClick, onRefresh),
activity: SimpleActivity,
recyclerView: MyRecyclerView,
onRefresh: () -> Unit,
itemClick: (Any) -> Unit
) : MyRecyclerViewListAdapter<Conversation>(
activity,
recyclerView,
ConversationDiffCallback(),
itemClick,
onRefresh
),
RecyclerViewFastScroller.OnPopupTextUpdate {
private var fontSize = activity.getTextSize()
private var drafts = HashMap<Long, String?>()
private var drafts = HashMap<Long, String>()
private var recyclerViewState: Parcelable? = null
@ -39,24 +53,32 @@ abstract class BaseConversationsAdapter(
registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
override fun onChanged() = restoreRecyclerViewState()
override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) = restoreRecyclerViewState()
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) = restoreRecyclerViewState()
override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) =
restoreRecyclerViewState()
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) =
restoreRecyclerViewState()
})
}
@SuppressLint("NotifyDataSetChanged")
fun updateFontSize() {
fontSize = activity.getTextSize()
notifyDataSetChanged()
}
fun updateConversations(newConversations: ArrayList<Conversation>, commitCallback: (() -> Unit)? = null) {
fun updateConversations(
newConversations: ArrayList<Conversation>,
commitCallback: (() -> Unit)? = null
) {
saveRecyclerViewState()
submitList(newConversations.toList(), commitCallback)
}
@SuppressLint("NotifyDataSetChanged")
fun updateDrafts() {
ensureBackgroundThread {
val newDrafts = HashMap<Long, String?>()
val newDrafts = HashMap<Long, String>()
fetchDrafts(newDrafts)
if (drafts.hashCode() != newDrafts.hashCode()) {
drafts = newDrafts
@ -69,7 +91,8 @@ abstract class BaseConversationsAdapter(
override fun getSelectableItemCount() = itemCount
protected fun getSelectedItems() = currentList.filter { selectedKeys.contains(it.hashCode()) } as ArrayList<Conversation>
protected fun getSelectedItems() =
currentList.filter { selectedKeys.contains(it.hashCode()) } as ArrayList<Conversation>
override fun getIsItemSelectable(position: Int) = true
@ -88,7 +111,11 @@ abstract class BaseConversationsAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val conversation = getItem(position)
holder.bindView(conversation, allowSingleClick = true, allowLongClick = true) { itemView, _ ->
holder.bindView(
conversation,
allowSingleClick = true,
allowLongClick = true
) { itemView, _ ->
setupView(itemView, conversation)
}
bindViewHolder(holder)
@ -104,7 +131,7 @@ abstract class BaseConversationsAdapter(
}
}
private fun fetchDrafts(drafts: HashMap<Long, String?>) {
private fun fetchDrafts(drafts: HashMap<Long, String>) {
drafts.clear()
for ((threadId, draft) in activity.getAllDrafts()) {
drafts[threadId] = draft
@ -115,7 +142,7 @@ abstract class BaseConversationsAdapter(
ItemConversationBinding.bind(view).apply {
root.setupViewBackground(activity)
val smsDraft = drafts[conversation.threadId]
draftIndicator.beVisibleIf(smsDraft != null)
draftIndicator.beVisibleIf(!smsDraft.isNullOrEmpty())
draftIndicator.setTextColor(properPrimaryColor)
pinIndicator.beVisibleIf(activity.config.pinnedConversations.contains(conversation.threadId.toString()))
@ -160,7 +187,12 @@ abstract class BaseConversationsAdapter(
null
}
SimpleContactsHelper(activity).loadContactImage(conversation.photoUri, conversationImage, conversation.title, placeholder)
SimpleContactsHelper(activity).loadContactImage(
conversation.photoUri,
conversationImage,
conversation.title,
placeholder
)
}
}