From 54cb75d8f9ddfe53510d53fb58da96dafd0d0d17 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jan 2023 17:50:39 +0100 Subject: [PATCH] some minor code cleanup --- .../activities/InsertOrEditContactActivity.kt | 17 ----------------- .../contacts/pro/activities/MainActivity.kt | 2 +- .../contacts/pro/adapters/ContactsAdapter.kt | 6 +++--- .../pro/adapters/SelectContactsAdapter.kt | 11 ----------- .../pro/dialogs/ExportContactsDialog.kt | 1 - .../pro/dialogs/SelectContactsDialog.kt | 4 ++-- ...ct_contact.xml => dialog_select_contact.xml} | 0 7 files changed, 6 insertions(+), 35 deletions(-) rename app/src/main/res/layout/{layout_select_contact.xml => dialog_select_contact.xml} (100%) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt index 8893742e..7d3c0e6d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt @@ -8,7 +8,6 @@ import android.os.Bundle import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds.Email import android.provider.ContactsContract.CommonDataKinds.Phone -import android.view.MenuItem import android.widget.ImageView import android.widget.TextView import androidx.viewpager.widget.ViewPager @@ -35,8 +34,6 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { private val START_INSERT_ACTIVITY = 1 private val START_EDIT_ACTIVITY = 2 - private var isSearchOpen = false - private var searchMenuItem: MenuItem? = null private var isSelectContactIntent = false private var specialMimeType: String? = null @@ -89,11 +86,6 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { setupTabColors() } - override fun onStop() { - super.onStop() - searchMenuItem?.collapseActionView() - } - private fun setupOptionsMenu() { insert_edit_menu.getToolbar().inflateMenu(R.menu.menu_insert_or_edit) insert_edit_menu.toggleHideOnScroll(false) @@ -344,15 +336,6 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { } } - private fun closeSearch() { - if (isSearchOpen) { - getAllFragments().forEach { - it?.onSearchQueryChanged("") - } - searchMenuItem?.collapseActionView() - } - } - private fun showSortingDialog() { ChangeSortingDialog(this) { refreshContacts(getTabsMask()) 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 933bdc0a..406d0940 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 @@ -513,7 +513,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { try { startActivityForResult(this, PICK_EXPORT_FILE_INTENT) } catch (e: ActivityNotFoundException) { - toast(R.string.system_service_disabled, Toast.LENGTH_LONG) + toast(R.string.no_app_found, Toast.LENGTH_LONG) } catch (e: Exception) { showErrorToast(e) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt index e86e59f6..1fa90c5d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt @@ -55,6 +55,7 @@ class ContactsAdapter( private val enableDrag: Boolean = false, itemClick: (Any) -> Unit ) : MyRecyclerViewAdapter(activity, recyclerView, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate, ItemTouchHelperContract { + private val NEW_GROUP_ID = -1 private var config = activity.config @@ -64,12 +65,11 @@ class ContactsAdapter( var showContactThumbnails = config.showContactThumbnails var showPhoneNumbers = config.showPhoneNumbers var fontSize = activity.getTextSize() + var onDragEndListener: (() -> Unit)? = null private val itemLayout = if (showPhoneNumbers) R.layout.item_contact_with_number else R.layout.item_contact_without_number - private var touchHelper: ItemTouchHelper? = null private var startReorderDragListener: StartReorderDragListener? = null - var onDragEndListener: (() -> Unit)? = null init { setupDragListener(true) @@ -465,7 +465,7 @@ class ContactsAdapter( notifyItemMoved(fromPosition, toPosition) } - override fun onRowSelected(myViewHolder: ViewHolder?) { } + override fun onRowSelected(myViewHolder: ViewHolder?) {} override fun onRowClear(myViewHolder: ViewHolder?) { onDragEndListener?.invoke() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt index b0420660..50ac9a8b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt @@ -78,17 +78,6 @@ class SelectContactsAdapter( override fun getItemCount() = contacts.size - fun updateItems(newItems: ArrayList, highlightText: String = "") { - if (newItems.hashCode() != contacts.hashCode()) { - contacts = newItems.clone() as ArrayList - textToHighlight = highlightText - notifyDataSetChanged() - } else if (textToHighlight != highlightText) { - textToHighlight = highlightText - notifyDataSetChanged() - } - } - override fun onViewRecycled(holder: ViewHolder) { super.onViewRecycled(holder) if (!activity.isDestroyed && !activity.isFinishing) { 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 05e6c551..3ead5655 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 @@ -35,7 +35,6 @@ class ExportContactsDialog( if (hidePath) { export_contacts_folder_hint.beGone() - export_contacts_folder.beGone() } else { export_contacts_folder.setOnClickListener { activity.hideKeyboard(export_contacts_filename) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt index 8e4b04b6..57fb9351 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt @@ -9,7 +9,7 @@ import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources import com.simplemobiletools.contacts.pro.models.Contact -import kotlinx.android.synthetic.main.layout_select_contact.view.* +import kotlinx.android.synthetic.main.dialog_select_contact.view.* import java.util.* class SelectContactsDialog( @@ -17,7 +17,7 @@ class SelectContactsDialog( selectContacts: ArrayList? = null, val callback: (addedContacts: ArrayList, removedContacts: ArrayList) -> Unit ) { private var dialog: AlertDialog? = null - private var view = activity.layoutInflater.inflate(R.layout.layout_select_contact, null) + private var view = activity.layoutInflater.inflate(R.layout.dialog_select_contact, null) private var initiallySelectedContacts = ArrayList() init { diff --git a/app/src/main/res/layout/layout_select_contact.xml b/app/src/main/res/layout/dialog_select_contact.xml similarity index 100% rename from app/src/main/res/layout/layout_select_contact.xml rename to app/src/main/res/layout/dialog_select_contact.xml