Skip to content

Commit 32c6d8d

Browse files
authored
Merge pull request #360 from VinsonGuo/conference-ui-fix
Adjust conference call name and image colors
2 parents 0d70119 + fd5cd50 commit 32c6d8d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Diff for: app/src/main/kotlin/org/fossify/phone/adapters/ConferenceCallsAdapter.kt

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.view.Menu
55
import android.view.ViewGroup
66
import com.bumptech.glide.Glide
77
import org.fossify.commons.adapters.MyRecyclerViewAdapter
8+
import org.fossify.commons.extensions.applyColorFilter
89
import org.fossify.commons.extensions.toast
910
import org.fossify.commons.helpers.LOWER_ALPHA
1011
import org.fossify.commons.helpers.SimpleContactsHelper
@@ -50,11 +51,14 @@ class ConferenceCallsAdapter(
5051
getCallContact(itemView.context, call) { callContact ->
5152
root.post {
5253
itemConferenceCallName.text = callContact.name.ifEmpty { itemView.context.getString(R.string.unknown_caller) }
54+
itemConferenceCallName.setTextColor(textColor)
55+
val contactDrawable = activity.getDrawable(R.drawable.ic_person_vector)
56+
contactDrawable?.applyColorFilter(textColor)
5357
SimpleContactsHelper(activity).loadContactImage(
5458
callContact.photoUri,
5559
itemConferenceCallImage,
5660
callContact.name,
57-
activity.getDrawable(R.drawable.ic_person_vector)
61+
contactDrawable
5862
)
5963
}
6064
}
@@ -63,6 +67,7 @@ class ConferenceCallsAdapter(
6367
val canDisconnect = call.hasCapability(Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE)
6468
itemConferenceCallSplit.isEnabled = canSeparate
6569
itemConferenceCallSplit.alpha = if (canSeparate) 1.0f else LOWER_ALPHA
70+
itemConferenceCallSplit.setColorFilter(textColor)
6671
itemConferenceCallSplit.setOnClickListener {
6772
call.splitFromConference()
6873
data.removeAt(position)
@@ -81,6 +86,7 @@ class ConferenceCallsAdapter(
8186

8287
itemConferenceCallEnd.isEnabled = canDisconnect
8388
itemConferenceCallEnd.alpha = if (canDisconnect) 1.0f else LOWER_ALPHA
89+
itemConferenceCallEnd.setColorFilter(textColor)
8490
itemConferenceCallEnd.setOnClickListener {
8591
call.disconnect()
8692
data.removeAt(position)

0 commit comments

Comments
 (0)