From 70a6e701dc92884b1ace0d626eab1d2529ab00a3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 27 Nov 2021 19:35:30 +0100 Subject: [PATCH] updating commons + the new fastscroller handling --- app/build.gradle | 2 +- .../activities/NewConversationActivity.kt | 2 +- .../smsmessenger/activities/ThreadActivity.kt | 2 +- .../smsmessenger/adapters/ContactsAdapter.kt | 6 ++-- .../adapters/ConversationsAdapter.kt | 2 +- .../adapters/SearchResultsAdapter.kt | 2 +- .../smsmessenger/adapters/ThreadAdapter.kt | 11 +++--- app/src/main/res/layout/activity_thread.xml | 35 ++++++++----------- 8 files changed, 27 insertions(+), 35 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b653e397..74aebe51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:df457fe86a' + implementation 'com.github.SimpleMobileTools:Simple-Commons:d62d81ca97' implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.klinkerapps:android-smsmms:5.2.6' implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a' diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt index 5bbfd332..a669cfd4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt @@ -140,7 +140,7 @@ class NewConversationActivity : SimpleActivity() { val currAdapter = contacts_list.adapter if (currAdapter == null) { - ContactsAdapter(this, contacts, contacts_list, null) { + ContactsAdapter(this, contacts, contacts_list) { hideKeyboard() val contact = it as SimpleContact val phoneNumbers = contact.phoneNumbers diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 69b52411..3cabd910 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -277,7 +277,7 @@ class ThreadActivity : SimpleActivity() { runOnUiThread { val currAdapter = thread_messages_list.adapter if (currAdapter == null) { - ThreadAdapter(this, threadItems, thread_messages_list, thread_messages_fastscroller) { + ThreadAdapter(this, threadItems, thread_messages_list) { (it as? ThreadError)?.apply { thread_type_message.setText(it.messageText) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt index 1f48eb53..33256a89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt @@ -11,16 +11,14 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.getTextSize import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.activities.SimpleActivity import java.util.* class ContactsAdapter( - activity: SimpleActivity, var contacts: ArrayList, recyclerView: MyRecyclerView, fastScroller: FastScroller?, - itemClick: (Any) -> Unit -) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) { + activity: SimpleActivity, var contacts: ArrayList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit +) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { private var fontSize = activity.getTextSize() override fun getActionMenuId() = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt index 56d8e50a..10f51b85 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt @@ -27,7 +27,7 @@ import kotlinx.android.synthetic.main.item_conversation.view.* class ConversationsAdapter( activity: SimpleActivity, var conversations: ArrayList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit -) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate { +) : MyRecyclerViewAdapter(activity, recyclerView, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate { private var fontSize = activity.getTextSize() private var drafts = HashMap() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt index 01df81e2..86cd5f37 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt @@ -18,7 +18,7 @@ import java.util.* class SearchResultsAdapter( activity: SimpleActivity, var searchResults: ArrayList, recyclerView: MyRecyclerView, highlightText: String, itemClick: (Any) -> Unit -) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { +) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { private var fontSize = activity.getTextSize() private var textToHighlight = highlightText diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt index a294afd8..52686921 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt @@ -26,7 +26,6 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.activities.SimpleActivity @@ -45,9 +44,8 @@ import kotlinx.android.synthetic.main.item_thread_sending.view.* import kotlinx.android.synthetic.main.item_thread_success.view.* class ThreadAdapter( - activity: SimpleActivity, var messages: ArrayList, recyclerView: MyRecyclerView, fastScroller: FastScroller, - itemClick: (Any) -> Unit -) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) { + activity: SimpleActivity, var messages: ArrayList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit +) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { private val roundedCornersRadius = resources.getDimension(R.dimen.normal_margin).toInt() private var fontSize = activity.getTextSize() @@ -227,7 +225,10 @@ class ThreadAdapter( thread_message_sender_photo.beVisible() thread_message_body.setTextColor(textColor) thread_message_body.setLinkTextColor(context.getAdjustedPrimaryColor()) - SimpleContactsHelper(context).loadContactImage(message.senderPhotoUri, thread_message_sender_photo, message.senderName) + + if (!activity.isFinishing && !activity.isDestroyed) { + SimpleContactsHelper(context).loadContactImage(message.senderPhotoUri, thread_message_sender_photo, message.senderName) + } } else { thread_message_sender_photo?.beGone() val background = context.getAdjustedPrimaryColor() diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml index 240c0c39..70b574a9 100644 --- a/app/src/main/res/layout/activity_thread.xml +++ b/app/src/main/res/layout/activity_thread.xml @@ -81,32 +81,25 @@ android:importantForAccessibility="no" /> - + app:supportSwipeToRefresh="true"> - + - - - +