From fbfe7133ca1d92caf8d06fa0b3d4d08c89fed85d Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 16 Mar 2020 22:49:56 +0100 Subject: [PATCH] allow hiding the path at the exporting destination dialog --- .../contacts/pro/activities/MainActivity.kt | 2 +- .../pro/dialogs/ExportContactsDialog.kt | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt index a3db1421..61095ba2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt @@ -520,7 +520,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } private fun exportContacts() { - ExportContactsDialog(this, config.lastExportPath) { file, ignoredContactSources -> + ExportContactsDialog(this, config.lastExportPath, false) { file, ignoredContactSources -> config.lastExportPath = file.absolutePath.getParentPath() ContactsHelper(this).getContacts(true, ignoredContactSources) { contacts -> if (contacts.isEmpty()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt index 6adf8143..dd3678de 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt @@ -15,7 +15,8 @@ import kotlinx.android.synthetic.main.dialog_export_contacts.view.* import java.io.File import java.util.* -class ExportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (file: File, ignoredContactSources: HashSet) -> Unit) { +class ExportContactsDialog(val activity: SimpleActivity, val path: String, val hidePath: Boolean, + private val callback: (file: File, ignoredContactSources: HashSet) -> Unit) { private var contactSources = ArrayList() private var ignoreClicks = false private var realPath = if (path.isEmpty()) activity.internalStoragePath else path @@ -25,11 +26,16 @@ class ExportContactsDialog(val activity: SimpleActivity, val path: String, priva export_contacts_folder.text = activity.humanizePath(realPath) export_contacts_filename.setText("contacts_${activity.getCurrentFormattedDateTime()}") - export_contacts_folder.setOnClickListener { - activity.hideKeyboard(export_contacts_filename) - FilePickerDialog(activity, realPath, false, showFAB = true) { - export_contacts_folder.text = activity.humanizePath(it) - realPath = it + if (hidePath) { + export_contacts_folder_label.beGone() + export_contacts_folder.beGone() + } else { + export_contacts_folder.setOnClickListener { + activity.hideKeyboard(export_contacts_filename) + FilePickerDialog(activity, realPath, false, showFAB = true) { + export_contacts_folder.text = activity.humanizePath(it) + realPath = it + } } }