diff --git a/app/build.gradle b/app/build.gradle index c20fb57b..0aeace07 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,6 +55,6 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:d62d81ca97' + implementation 'com.github.SimpleMobileTools:Simple-Commons:915bda1e40' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt index a935fb69..215ff3a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt @@ -61,7 +61,7 @@ class RecentCallsAdapter( findItem(R.id.cab_block_number).isVisible = isNougatPlus() findItem(R.id.cab_add_number).isVisible = isOneItemSelected findItem(R.id.cab_copy_number).isVisible = isOneItemSelected - findItem(R.id.cab_show_grouped_calls).isVisible = isOneItemSelected && selectedItems.first().neighbourIDs.isNotEmpty() + findItem(R.id.cab_show_call_details).isVisible = isOneItemSelected } } @@ -77,7 +77,7 @@ class RecentCallsAdapter( R.id.cab_block_number -> askConfirmBlock() R.id.cab_add_number -> addNumberToContact() R.id.cab_send_sms -> sendSMS() - R.id.cab_show_grouped_calls -> showGroupedCalls() + R.id.cab_show_call_details -> showCallDetails() R.id.cab_copy_number -> copyNumber() R.id.cab_remove -> askConfirmRemove() R.id.cab_select_all -> selectAll() @@ -179,7 +179,7 @@ class RecentCallsAdapter( activity.launchSendSMSIntent(recipient) } - private fun showGroupedCalls() { + private fun showCallDetails() { val recentCall = getSelectedItems().firstOrNull() ?: return val callIds = recentCall.neighbourIDs.map { it }.toMutableList() as ArrayList callIds.add(recentCall.id) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt index dbb46846..0071164f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt @@ -21,7 +21,6 @@ class ShowGroupedCallsDialog(val activity: BaseSimpleActivity, callIds: ArrayLis val recents = allRecents.filter { callIds.contains(it.id) }.toMutableList() as ArrayList activity.runOnUiThread { RecentCallsAdapter(activity as SimpleActivity, recents, select_grouped_calls_list, null) { - }.apply { select_grouped_calls_list.adapter = this } diff --git a/app/src/main/res/layout/dialog_show_grouped_calls.xml b/app/src/main/res/layout/dialog_show_grouped_calls.xml index e4a4a6e0..254cfabf 100644 --- a/app/src/main/res/layout/dialog_show_grouped_calls.xml +++ b/app/src/main/res/layout/dialog_show_grouped_calls.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clipToPadding="false" - android:padding="@dimen/activity_margin" + android:overScrollMode="never" android:scrollbars="none" app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/item_recent_call.xml b/app/src/main/res/layout/item_recent_call.xml index 62dae7bd..5c07674e 100644 --- a/app/src/main/res/layout/item_recent_call.xml +++ b/app/src/main/res/layout/item_recent_call.xml @@ -68,13 +68,14 @@ android:id="@+id/item_recents_type" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignStart="@+id/item_recents_name" android:layout_alignTop="@+id/item_recents_date_time" android:layout_alignBottom="@+id/item_recents_date_time" - android:layout_marginEnd="@dimen/tiny_margin" android:layout_toEndOf="@+id/item_recents_sim_image" android:alpha="0.6" - android:paddingTop="@dimen/tiny_margin" - android:paddingBottom="@dimen/tiny_margin" + android:paddingTop="@dimen/one_dp" + android:paddingBottom="@dimen/one_dp" + android:scaleType="fitStart" android:src="@drawable/ic_incoming_call_vector" />