Prevented adding empty contact (#728)

This commit is contained in:
Agnieszka C
2021-10-24 12:30:54 +02:00
parent 2bfcfa8c3f
commit bbadfa1f2e
34 changed files with 49 additions and 0 deletions

View File

@ -25,6 +25,7 @@ import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.views.MyEditText
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.dialogs.CustomLabelDialog
import com.simplemobiletools.contacts.pro.dialogs.MyDatePickerDialog
@ -63,6 +64,10 @@ class EditContactActivity : ContactActivity() {
private var emailViewToColor: EditText? = null
private var originalContactSource = ""
private lateinit var contactFields: ArrayList<MyEditText>
private val multipleFields = arrayListOf(::getFilledPhoneNumbers, ::getFilledEmails, ::getFilledAddresses, ::getFilledIMs,
::getFilledEvents, ::getFilledWebsites)
override fun onCreate(savedInstanceState: Bundle?) {
showTransparentTop = true
super.onCreate(savedInstanceState)
@ -99,6 +104,12 @@ class EditContactActivity : ContactActivity() {
}
}
override fun onResume() {
super.onResume()
contactFields = arrayListOf(contact_prefix, contact_first_name, contact_middle_name, contact_suffix, contact_nickname,
contact_notes, contact_organization_company, contact_organization_job_position)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData)
if (resultCode == RESULT_OK) {
@ -901,6 +912,11 @@ class EditContactActivity : ContactActivity() {
return
}
if (contactFields.all { it.value.isEmpty() } && multipleFields.all { it().isEmpty() } && currentContactPhotoPath.isEmpty()) {
toast(R.string.fields_empty)
return
}
contact?.apply {
val oldPhotoUri = photoUri