diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt index 12ea1a5e..34f7624c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt @@ -92,7 +92,7 @@ class SearchActivity : SimpleActivity() { val searchResults = ArrayList() conversations.forEach { conversation -> val date = conversation.date.formatDateOrTime(this, true, true) - val searchResult = SearchResult(conversation.title, conversation.phoneNumber, date, conversation.threadId) + val searchResult = SearchResult(conversation.title, conversation.phoneNumber, date, conversation.threadId, conversation.photoUri, conversation.isGroupConversation) searchResults.add(searchResult) } @@ -104,7 +104,7 @@ class SearchActivity : SimpleActivity() { } val date = message.date.formatDateOrTime(this, true, true) - val searchResult = SearchResult(recipient, message.body, date, message.threadId) + val searchResult = SearchResult(recipient, message.body, date, message.threadId, message.senderPhotoUri, false) searchResults.add(searchResult) } 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 11c1b6a5..660c3e6b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt @@ -4,8 +4,10 @@ import android.util.TypedValue import android.view.Menu import android.view.View import android.view.ViewGroup +import com.bumptech.glide.Glide import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.getTextSize +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.activities.SimpleActivity @@ -65,6 +67,15 @@ class SearchResultsAdapter(activity: SimpleActivity, var searchResults: ArrayLis text = searchResult.date setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f) } + + SimpleContactsHelper(context).loadContactImage(searchResult.photoUri, search_result_image, searchResult.title) + } + } + + override fun onViewRecycled(holder: ViewHolder) { + super.onViewRecycled(holder) + if (!activity.isDestroyed && !activity.isFinishing && holder.itemView.search_result_image != null) { + Glide.with(activity).clear(holder.itemView.search_result_image) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt index c12608ef..2362a544 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt @@ -1,3 +1,3 @@ package com.simplemobiletools.smsmessenger.models -data class SearchResult(val title: String, val snippet: String, val date: String, val threadId: Long) +data class SearchResult(val title: String, val snippet: String, val date: String, val threadId: Long, var photoUri: String, var isGroupConversation: Boolean) diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml index f2e479b7..31d1ab42 100644 --- a/app/src/main/res/layout/item_search_result.xml +++ b/app/src/main/res/layout/item_search_result.xml @@ -4,14 +4,23 @@ android:id="@+id/search_result_holder" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/small_margin" + android:layout_marginBottom="@dimen/small_margin" android:background="?attr/selectableItemBackground" android:padding="@dimen/normal_margin"> + +