diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt index f9a54c63..b33a1d07 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt @@ -3,20 +3,26 @@ package com.simplemobiletools.contacts.pro.activities import android.content.Intent import android.net.Uri import android.os.Bundle +import com.simplemobiletools.commons.extensions.beGone import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.activity_dialer.* class DialerActivity : SimpleActivity() { + private var number = "" + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_dialer) if (intent.action == Intent.ACTION_CALL && intent.data != null && intent.dataString?.contains("tel:") == true) { - val number = Uri.decode(intent.dataString).substringAfter("tel:") + number = Uri.decode(intent.dataString).substringAfter("tel:") ContactsHelper(this).getContactWithNumber(number) { - + runOnUiThread { + updateCallee(it) + } } } } @@ -25,4 +31,14 @@ class DialerActivity : SimpleActivity() { super.onResume() updateTextColors(dialer_holder) } + + private fun updateCallee(contact: Contact?) { + if (contact != null) { + callee_big_name_number.text = contact.getNameToDisplay() + callee_number.text = number + } else { + callee_big_name_number.text = number + callee_number.beGone() + } + } } diff --git a/app/src/main/res/layout/activity_dialer.xml b/app/src/main/res/layout/activity_dialer.xml index 5f860524..4920eb40 100644 --- a/app/src/main/res/layout/activity_dialer.xml +++ b/app/src/main/res/layout/activity_dialer.xml @@ -1,10 +1,50 @@ + android:layout_height="match_parent"> + + + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b0496177..2756e68c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -7,5 +7,7 @@ 56dp 68dp 60dp + 150dp + 34sp