From 0ddfbeb38bcc8ef682d0812e368384e08c89eb63 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 26 Oct 2020 20:46:40 +0100 Subject: [PATCH] lets actually remove the Call/Send action buttons from the Edit screen --- .../pro/activities/EditContactActivity.kt | 8 +-- .../main/res/layout/activity_edit_contact.xml | 56 ++----------------- 2 files changed, 6 insertions(+), 58 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index 89ff8fbc..1b6dedaf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -190,9 +190,6 @@ class EditContactActivity : ContactActivity() { } setupTypePickers() - contact_send_sms.beVisibleIf(contact!!.phoneNumbers.isNotEmpty()) - contact_start_call.beVisibleIf(contact!!.phoneNumbers.isNotEmpty()) - contact_send_email.beVisibleIf(contact!!.emails.isNotEmpty()) if (contact!!.photoUri.isEmpty() && contact!!.photo == null) { showPhotoPlaceholder(contact_photo) @@ -202,7 +199,7 @@ class EditContactActivity : ContactActivity() { } val textColor = config.textColor - arrayOf(contact_send_sms, contact_start_call, contact_send_email, contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, + arrayOf(contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, contact_ims_image, contact_events_image, contact_notes_image, contact_organization_image, contact_websites_image, contact_groups_image, contact_source_image).forEach { it.applyColorFilter(textColor) @@ -222,9 +219,6 @@ class EditContactActivity : ContactActivity() { contact_toggle_favorite.setOnClickListener { toggleFavorite() } contact_photo.setOnClickListener { trySetPhoto() } contact_change_photo.setOnClickListener { trySetPhoto() } - contact_send_sms.setOnClickListener { trySendSMS() } - contact_start_call.setOnClickListener { tryStartCall(contact!!) } - contact_send_email.setOnClickListener { trySendEmail() } contact_numbers_add_new.setOnClickListener { addNewPhoneNumberField() } contact_emails_add_new.setOnClickListener { addNewEmailField() } contact_addresses_add_new.setOnClickListener { addNewAddressField() } diff --git a/app/src/main/res/layout/activity_edit_contact.xml b/app/src/main/res/layout/activity_edit_contact.xml index 7070cac4..eabe713f 100644 --- a/app/src/main/res/layout/activity_edit_contact.xml +++ b/app/src/main/res/layout/activity_edit_contact.xml @@ -49,60 +49,14 @@ android:id="@+id/contact_change_photo" android:layout_width="@dimen/contact_actions_size" android:layout_height="@dimen/contact_actions_size" - android:layout_above="@+id/contact_toggle_favorite" - android:layout_alignStart="@+id/contact_photo" - android:layout_marginStart="@dimen/medium_margin" + android:layout_alignEnd="@+id/contact_photo" + android:layout_alignBottom="@+id/contact_photo" + android:layout_marginEnd="@dimen/medium_margin" + android:layout_marginBottom="@dimen/medium_margin" android:background="?attr/selectableItemBackgroundBorderless" - android:padding="@dimen/medium_margin" + android:padding="@dimen/small_margin" android:src="@drawable/ic_camera_vector" /> - - - - - - - - - -