Skip to content

Commit 1d0ecc6

Browse files
committed
updating some group chat related coloring issues
1 parent 65ae360 commit 1d0ecc6

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,14 +469,15 @@ class ThreadActivity : SimpleActivity() {
469469

470470
private fun showSelectedContacts() {
471471
val adjustedColor = getAdjustedPrimaryColor()
472-
val selectedContactBg = resources.getDrawable(R.drawable.item_selected_contact_background)
473-
(selectedContactBg as LayerDrawable).findDrawableByLayerId(R.id.selected_contact_bg).applyColorFilter(adjustedColor)
474472

475473
val views = ArrayList<View>()
476474
participants.forEach {
477475
val contact = it
478476
layoutInflater.inflate(R.layout.item_selected_contact, null).apply {
477+
val selectedContactBg = resources.getDrawable(R.drawable.item_selected_contact_background)
478+
(selectedContactBg as LayerDrawable).findDrawableByLayerId(R.id.selected_contact_bg).applyColorFilter(adjustedColor)
479479
selected_contact_holder.background = selectedContactBg
480+
480481
selected_contact_name.text = contact.name
481482
selected_contact_name.setTextColor(adjustedColor.getContrastColor())
482483
selected_contact_remove.applyColorFilter(adjustedColor.getContrastColor())

app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ import android.view.View
55
import android.view.ViewGroup
66
import android.widget.ArrayAdapter
77
import android.widget.Filter
8+
import android.widget.RelativeLayout
89
import android.widget.TextView
10+
import com.simplemobiletools.commons.extensions.darkenColor
11+
import com.simplemobiletools.commons.extensions.getContrastColor
912
import com.simplemobiletools.commons.extensions.normalizeString
1013
import com.simplemobiletools.commons.helpers.SimpleContactsHelper
1114
import com.simplemobiletools.commons.models.SimpleContact
1215
import com.simplemobiletools.smsmessenger.R
1316
import com.simplemobiletools.smsmessenger.activities.SimpleActivity
17+
import com.simplemobiletools.smsmessenger.extensions.config
1418

1519
class AutoCompleteTextViewAdapter(val activity: SimpleActivity, val contacts: ArrayList<SimpleContact>) : ArrayAdapter<SimpleContact>(activity, 0, contacts) {
1620
var resultList = ArrayList<SimpleContact>()
@@ -30,8 +34,13 @@ class AutoCompleteTextViewAdapter(val activity: SimpleActivity, val contacts: Ar
3034
isFocusable = false
3135
}
3236

37+
val backgroundColor = activity.config.backgroundColor
3338
findViewById<TextView>(R.id.item_contact_name).text = contact.name
3439
findViewById<TextView>(R.id.item_contact_number).text = contact.phoneNumbers.first()
40+
findViewById<RelativeLayout>(R.id.item_contact_holder).setBackgroundColor(backgroundColor.darkenColor())
41+
42+
findViewById<TextView>(R.id.item_contact_name).setTextColor(backgroundColor.getContrastColor())
43+
findViewById<TextView>(R.id.item_contact_number).setTextColor(backgroundColor.getContrastColor())
3544

3645
SimpleContactsHelper(context).loadContactImage(contact.photoUri, findViewById(R.id.item_contact_image), contact.name)
3746
}

app/src/main/res/layout/item_suggested_contact.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:id="@+id/suggested_contact_holder"
55
android:layout_width="wrap_content"
6-
android:background="?selectableItemBackground"
7-
android:layout_height="wrap_content">
6+
android:layout_height="wrap_content"
7+
android:background="?selectableItemBackground">
88

99
<ImageView
1010
android:id="@+id/suggested_contact_image"

0 commit comments

Comments
 (0)