Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,17 @@ class DialpadActivity : SimpleActivity() {
activity = this,
contacts = filtered,
recyclerView = binding.dialpadList,
highlightText = text
) {
val contact = it as Contact
startCallWithConfirmationCheck(contact.getPrimaryNumber() ?: return@ContactsAdapter, contact.getNameToDisplay())
Handler().postDelayed({
binding.dialpadInput.setText("")
}, 1000)
}.apply {
highlightText = text,
itemClick = {
val contact = it as Contact
startCallWithConfirmationCheck(contact.getPrimaryNumber() ?: return@ContactsAdapter, contact.getNameToDisplay())
Handler().postDelayed({
binding.dialpadInput.setText("")
}, 1000)
},
profileIconClick = {
startContactDetailsIntent(it as Contact)
}).apply {
binding.dialpadList.adapter = this
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ class ContactsAdapter(
private val showDeleteButton: Boolean = true,
private val enableDrag: Boolean = false,
private val allowLongClick: Boolean = true,
itemClick: (Any) -> Unit
itemClick: (Any) -> Unit,
val profileIconClick: ((Any) -> Unit)? = null
) : MyRecyclerViewAdapter(activity, recyclerView, itemClick),
ItemTouchHelperContract, MyRecyclerView.MyZoomListener {

Expand Down Expand Up @@ -363,6 +364,25 @@ class ContactsAdapter(
binding.apply {
root.setupViewBackground(activity)
itemContactFrame.isSelected = selectedKeys.contains(contact.rawId)

itemContactImage.apply {
if (profileIconClick != null) {
setBackgroundResource(R.drawable.selector_clickable_circle)

setOnClickListener {
if (!actModeCallback.isSelectable) {
profileIconClick.invoke(contact)
} else {
holder.viewClicked(contact)
}
}
setOnLongClickListener {
holder.viewLongClicked()
true
}
}
}

itemContactName.apply {
setTextColor(textColor)
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class RecentCallsAdapter(
private val showOverflowMenu: Boolean,
private val itemDelete: (List<RecentCall>) -> Unit = {},
itemClick: (Any) -> Unit,
val profileIconClick: ((Any) -> Unit)? = null
) : MyRecyclerViewListAdapter<CallLogItem>(activity, recyclerView, RecentCallsDiffCallback(), itemClick) {

private lateinit var outgoingCallIcon: Drawable
Expand Down Expand Up @@ -434,7 +435,8 @@ class RecentCallsAdapter(

val currentFontSize = fontSize
itemRecentsHolder.isSelected = selectedKeys.contains(call.id)
val name = findContactByCall(call)?.getNameToDisplay() ?: call.name
val matchingContact = findContactByCall(call)
val name = matchingContact?.getNameToDisplay() ?: call.name
val formatPhoneNumbers = activity.config.formatPhoneNumbers
var nameToShow = if (name == call.phoneNumber && formatPhoneNumbers) {
SpannableString(name.formatPhoneNumber())
Expand Down Expand Up @@ -500,6 +502,24 @@ class RecentCallsAdapter(

SimpleContactsHelper(root.context).loadContactImage(call.photoUri, itemRecentsImage, call.name)

itemRecentsImage.apply {
if (profileIconClick != null) {
setBackgroundResource(R.drawable.selector_clickable_circle)

setOnClickListener {
if (!actModeCallback.isSelectable) {
profileIconClick.invoke(call)
} else {
viewClicked(call)
}
}
setOnLongClickListener {
viewLongClicked()
true
}
}
}

val drawable = when (call.type) {
Calls.OUTGOING_TYPE -> outgoingCallIcon
Calls.MISSED_TYPE -> incomingMissedCallIcon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ class SelectContactDialog(val activity: SimpleActivity, val contacts: List<Conta
setupLetterFastScroller(contacts)
configureSearchView()

selectContactList.adapter = ContactsAdapter(activity, contacts.toMutableList(), selectContactList, allowLongClick = false) {
selectContactList.adapter = ContactsAdapter(activity, contacts.toMutableList(), selectContactList, allowLongClick = false, itemClick = {
callback(it as Contact)
dialog?.dismiss()
}
})
}

activity.getAlertDialogBuilder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,10 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
activity = activity as SimpleActivity,
contacts = contacts,
recyclerView = binding.fragmentList,
refreshItemsListener = this
) {
val contact = it as Contact
activity?.startContactDetailsIntent(contact)
}.apply {
refreshItemsListener = this,
itemClick = {
activity?.startContactDetailsIntent(it as Contact)
}).apply {
binding.fragmentList.adapter = this
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.fossify.phone.databinding.FragmentFavoritesBinding
import org.fossify.phone.databinding.FragmentLettersLayoutBinding
import org.fossify.phone.extensions.config
import org.fossify.phone.extensions.setupWithContacts
import org.fossify.phone.extensions.startContactDetailsIntent
import org.fossify.phone.interfaces.RefreshItemsListener

class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment<MyViewPagerFragment.LettersInnerBinding>(context, attributeSet),
Expand Down Expand Up @@ -112,19 +113,22 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
viewType = viewType,
showDeleteButton = false,
enableDrag = true,
) { contact ->
if (context.config.showCallConfirmation) {
CallConfirmationDialog(activity as SimpleActivity, (contact as Contact).getNameToDisplay()) {
itemClick = { it ->
if (context.config.showCallConfirmation) {
CallConfirmationDialog(activity as SimpleActivity, (it as Contact).getNameToDisplay()) {
activity?.apply {
initiateCall(it) { launchCallIntent(it) }
}
}
} else {
activity?.apply {
initiateCall(contact) { launchCallIntent(it) }
initiateCall(it as Contact) { launchCallIntent(it) }
}
}
} else {
activity?.apply {
initiateCall(contact as Contact) { launchCallIntent(it) }
}
}
}.apply {
},
profileIconClick = {
activity?.startContactDetailsIntent(it as Contact)
}).apply {
binding.fragmentList.adapter = this

onDragEndListener = {
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/kotlin/org/fossify/phone/fragments/RecentsFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import org.fossify.commons.helpers.*
import org.fossify.commons.models.contacts.Contact
import org.fossify.commons.views.MyRecyclerView
import org.fossify.phone.R
import org.fossify.phone.activities.MainActivity
import org.fossify.phone.activities.SimpleActivity
import org.fossify.phone.adapters.RecentCallsAdapter
import org.fossify.phone.databinding.FragmentRecentsBinding
import org.fossify.phone.extensions.config
import org.fossify.phone.extensions.startCallWithConfirmationCheck
import org.fossify.phone.extensions.startContactDetailsIntent
import org.fossify.phone.helpers.RecentsHelper
import org.fossify.phone.interfaces.RefreshItemsListener
import org.fossify.phone.models.CallLogItem
Expand Down Expand Up @@ -146,6 +148,12 @@ class RecentsFragment(
itemClick = {
val recentCall = it as RecentCall
activity?.startCallWithConfirmationCheck(recentCall.phoneNumber, recentCall.name)
},
profileIconClick = {
val contact = findContactByCall(it as RecentCall)
if (contact != null) {
activity?.startContactDetailsIntent(contact)
}
}
)

Expand Down Expand Up @@ -278,4 +286,8 @@ class RecentsFragment(

return callLog
}

private fun findContactByCall(recentCall: RecentCall): Contact? {
return (activity as MainActivity).cachedContacts.find { it.name == recentCall.name && it.doesHavePhoneNumber(recentCall.phoneNumber) }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/activated_item_foreground">
<item android:id="@android:id/mask">
<shape android:shape="oval">
<solid android:color="@android:color/white" />
</shape>
</item>
</ripple>
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/selector_clickable_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- this handles the background of clickable items at long pressing, like an SMS conversation -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<selector>
<item
android:state_selected="true" >
<shape android:shape="oval">
<solid android:drawable="@color/activated_item_foreground" />
</shape>
</item>
<item android:drawable="@drawable/ripple_selector_background_circle" />
</selector>
</item>
</layer-list>