From 8a84e84a8d66a0457c10c77566b6708b6c173d5b Mon Sep 17 00:00:00 2001 From: ismailnurudeen Date: Thu, 23 Feb 2023 20:53:09 +0100 Subject: [PATCH] fix: removed reference to `this` when using baseConfig --- .../pro/activities/EditContactActivity.kt | 6 +-- .../activities/InsertOrEditContactActivity.kt | 4 +- .../contacts/pro/activities/MainActivity.kt | 50 ++++++++--------- .../pro/activities/SettingsActivity.kt | 54 +++++++++---------- .../pro/activities/ViewContactActivity.kt | 8 +-- .../contacts/pro/extensions/Activity.kt | 4 +- .../pro/fragments/MyViewPagerFragment.kt | 2 +- 7 files changed, 64 insertions(+), 64 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 d4007a7e..4d1d1812 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 @@ -388,7 +388,7 @@ class EditContactActivity : ContactActivity() { } private fun setupFieldVisibility() { - val showFields = this.baseConfig.showContactFields + val showFields = baseConfig.showContactFields if (showFields and (SHOW_PREFIX_FIELD or SHOW_FIRST_NAME_FIELD or SHOW_MIDDLE_NAME_FIELD or SHOW_SURNAME_FIELD or SHOW_SUFFIX_FIELD) == 0) { contact_name_image.beInvisible() } @@ -744,7 +744,7 @@ class EditContactActivity : ContactActivity() { } private fun setupNewContact() { - originalContactSource = if (hasContactPermissions()) this.baseConfig.lastUsedContactSource else SMT_PRIVATE + originalContactSource = if (hasContactPermissions()) baseConfig.lastUsedContactSource else SMT_PRIVATE contact = getEmptyContact() getPublicContactSource(contact!!.source) { contact_source.text = if (it == "") getString(R.string.phone_storage) else it @@ -1049,7 +1049,7 @@ class EditContactActivity : ContactActivity() { contact = contactValues ensureBackgroundThread { - this.baseConfig.lastUsedContactSource = contact!!.source + baseConfig.lastUsedContactSource = contact!!.source when { contact!!.id == 0 -> insertNewContact(false) originalContactSource != contact!!.source -> insertNewContact(true) 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 6a7f51d7..9de04ac0 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 @@ -159,7 +159,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { private fun setupTabs() { insert_edit_tabs_holder.removeAllTabs() contactsFavoritesList.forEachIndexed { index, value -> - if (this.baseConfig.showTabs and value != 0) { + if (baseConfig.showTabs and value != 0) { insert_edit_tabs_holder.newTab().setCustomView(R.layout.bottom_tablayout_item).apply { customView?.findViewById(R.id.tab_item_icon)?.setImageDrawable(getTabIcon(index)) customView?.findViewById(R.id.tab_item_label)?.text = getTabLabel(index) @@ -349,7 +349,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { private fun getTabsMask(): Int { var mask = TAB_CONTACTS - if (this.baseConfig.showTabs and TAB_FAVORITES != 0) { + if (baseConfig.showTabs and TAB_FAVORITES != 0) { mask += TAB_FAVORITES } return mask 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 fccc2537..14a394e4 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 @@ -90,19 +90,19 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { override fun onResume() { super.onResume() - if (storedShowPhoneNumbers != this.baseConfig.showPhoneNumbers) { + if (storedShowPhoneNumbers != baseConfig.showPhoneNumbers) { System.exit(0) return } - if (storedShowTabs != this.baseConfig.showTabs) { - this.baseConfig.lastUsedViewPagerPage = 0 + if (storedShowTabs != baseConfig.showTabs) { + baseConfig.lastUsedViewPagerPage = 0 finish() startActivity(intent) return } - val configShowContactThumbnails = this.baseConfig.showContactThumbnails + val configShowContactThumbnails = baseConfig.showContactThumbnails if (storedShowContactThumbnails != configShowContactThumbnails) { getAllFragments().forEach { it?.showContactThumbnailsChanged(configShowContactThumbnails) @@ -119,13 +119,13 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { updateMenuColors() setupTabColors() - val configStartNameWithSurname = this.baseConfig.startNameWithSurname + val configStartNameWithSurname = baseConfig.startNameWithSurname if (storedStartNameWithSurname != configStartNameWithSurname) { contacts_fragment?.startNameWithSurnameChanged(configStartNameWithSurname) favorites_fragment?.startNameWithSurnameChanged(configStartNameWithSurname) } - val configFontSize = this.baseConfig.fontSize + val configFontSize = baseConfig.fontSize if (storedFontSize != configFontSize) { getAllFragments().forEach { it?.fontSizeChanged() @@ -144,23 +144,23 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { main_dialpad_button.apply { setImageDrawable(dialpadIcon) background.applyColorFilter(properPrimaryColor) - beVisibleIf(this@MainActivity.baseConfig.showDialpadButton) + beVisibleIf(baseConfig.showDialpadButton) } isFirstResume = false checkShortcuts() - if (!this.baseConfig.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.contacts")) { + if (!baseConfig.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.contacts")) { val dialogText = getString(R.string.upgraded_to_pro_contacts, getString(R.string.phone_storage_hidden)) ConfirmationDialog(this, dialogText, 0, R.string.ok, 0, false) {} - this.baseConfig.wasUpgradedFromFreeShown = true + baseConfig.wasUpgradedFromFreeShown = true } } override fun onPause() { super.onPause() storeStateVariables() - this.baseConfig.lastUsedViewPagerPage = view_pager.currentItem + baseConfig.lastUsedViewPagerPage = view_pager.currentItem } override fun onDestroy() { @@ -197,7 +197,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { main_menu.getToolbar().menu.apply { findItem(R.id.sort).isVisible = currentFragment != groups_fragment findItem(R.id.filter).isVisible = currentFragment != groups_fragment - findItem(R.id.dialpad).isVisible = !this@MainActivity.baseConfig.showDialpadButton + findItem(R.id.dialpad).isVisible = !baseConfig.showDialpadButton findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations) } } @@ -239,7 +239,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } private fun storeStateVariables() { - this.baseConfig.apply { + baseConfig.apply { storedShowContactThumbnails = showContactThumbnails storedShowPhoneNumbers = showPhoneNumbers storedStartNameWithSurname = startNameWithSurname @@ -250,13 +250,13 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { @SuppressLint("NewApi") private fun checkShortcuts() { - val appIconColor = this.baseConfig.appIconColor - if (isNougatMR1Plus() && this.baseConfig.lastHandledShortcutColor != appIconColor) { + val appIconColor = baseConfig.appIconColor + if (isNougatMR1Plus() && baseConfig.lastHandledShortcutColor != appIconColor) { val createNewContact = getCreateNewContactShortcut(appIconColor) try { shortcutManager.dynamicShortcuts = Arrays.asList(createNewContact) - this.baseConfig.lastHandledShortcutColor = appIconColor + baseConfig.lastHandledShortcutColor = appIconColor } catch (ignored: Exception) { } } @@ -280,7 +280,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } private fun getCurrentFragment(): MyViewPagerFragment? { - val showTabs = this.baseConfig.showTabs + val showTabs = baseConfig.showTabs val fragments = arrayListOf() if (showTabs and TAB_CONTACTS != 0) { fragments.add(contacts_fragment) @@ -314,7 +314,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun getInactiveTabIndexes(activeIndex: Int) = (0 until main_tabs_holder.tabCount).filter { it != activeIndex } private fun getSelectedTabDrawableIds(): ArrayList { - val showTabs = this.baseConfig.showTabs + val showTabs = baseConfig.showTabs val icons = ArrayList() if (showTabs and TAB_CONTACTS != 0) { @@ -333,7 +333,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } private fun getDeselectedTabDrawableIds(): ArrayList { - val showTabs = this.baseConfig.showTabs + val showTabs = baseConfig.showTabs val icons = ArrayList() if (showTabs and TAB_CONTACTS != 0) { @@ -385,7 +385,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun setupTabs() { main_tabs_holder.removeAllTabs() tabsList.forEachIndexed { index, value -> - if (this.baseConfig.showTabs and value != 0) { + if (baseConfig.showTabs and value != 0) { main_tabs_holder.newTab().setCustomView(R.layout.bottom_tablayout_item).apply { customView?.findViewById(R.id.tab_item_icon)?.setImageDrawable(getTabIcon(index)) customView?.findViewById(R.id.tab_item_label)?.text = getTabLabel(index) @@ -499,7 +499,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun tryExportContacts() { if (isQPlus()) { - ExportContactsDialog(this, this.baseConfig.lastExportPath, true) { file, ignoredContactSources -> + ExportContactsDialog(this, baseConfig.lastExportPath, true) { file, ignoredContactSources -> ignoredExportContactSources = ignoredContactSources Intent(Intent.ACTION_CREATE_DOCUMENT).apply { @@ -519,7 +519,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } else { handlePermission(PERMISSION_WRITE_STORAGE) { if (it) { - ExportContactsDialog(this, this.baseConfig.lastExportPath, false) { file, ignoredContactSources -> + ExportContactsDialog(this, baseConfig.lastExportPath, false) { file, ignoredContactSources -> getFileOutputStream(file.toFileDirItem(this), true) { exportContactsTo(ignoredContactSources, it) } @@ -577,7 +577,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { isGettingContacts = true if (view_pager.adapter == null) { - view_pager.adapter = ViewPagerAdapter(this, tabsList, this.baseConfig.showTabs) + view_pager.adapter = ViewPagerAdapter(this, tabsList, baseConfig.showTabs) view_pager.currentItem = getDefaultTab() } @@ -617,9 +617,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, groups_fragment) private fun getDefaultTab(): Int { - val showTabsMask = this.baseConfig.showTabs - return when (this.baseConfig.defaultTab) { - TAB_LAST_USED -> this.baseConfig.lastUsedViewPagerPage + val showTabsMask = baseConfig.showTabs + return when (baseConfig.defaultTab) { + TAB_LAST_USED -> baseConfig.lastUsedViewPagerPage TAB_CONTACTS -> 0 TAB_FAVORITES -> if (showTabsMask and TAB_CONTACTS > 0) 1 else 0 else -> { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt index feb3e2cd..57edb7ec 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt @@ -77,15 +77,15 @@ class SettingsActivity : SimpleActivity() { RadioItem(TAB_LAST_USED, getString(R.string.last_used_tab)) ) - RadioGroupDialog(this@SettingsActivity, items, this.baseConfig.defaultTab) { - this.baseConfig.defaultTab = it as Int + RadioGroupDialog(this@SettingsActivity, items, baseConfig.defaultTab) { + baseConfig.defaultTab = it as Int settings_default_tab.text = getDefaultTabText() } } } private fun getDefaultTabText() = getString( - when (this.baseConfig.defaultTab) { + when (baseConfig.defaultTab) { TAB_CONTACTS -> R.string.contacts_tab TAB_FAVORITES -> R.string.favorites_tab TAB_GROUPS -> R.string.groups_tab @@ -103,19 +103,19 @@ class SettingsActivity : SimpleActivity() { RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)) ) - RadioGroupDialog(this@SettingsActivity, items, this.baseConfig.fontSize) { - this.baseConfig.fontSize = it as Int + RadioGroupDialog(this@SettingsActivity, items, baseConfig.fontSize) { + baseConfig.fontSize = it as Int settings_font_size.text = getFontSizeText() } } } private fun setupUseEnglish() { - settings_use_english_holder.beVisibleIf((this.baseConfig.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus()) - settings_use_english.isChecked = this.baseConfig.useEnglish + settings_use_english_holder.beVisibleIf((baseConfig.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus()) + settings_use_english.isChecked = baseConfig.useEnglish settings_use_english_holder.setOnClickListener { settings_use_english.toggle() - this.baseConfig.useEnglish = settings_use_english.isChecked + baseConfig.useEnglish = settings_use_english.isChecked System.exit(0) } } @@ -129,50 +129,50 @@ class SettingsActivity : SimpleActivity() { } private fun setupShowContactThumbnails() { - settings_show_contact_thumbnails.isChecked = this.baseConfig.showContactThumbnails + settings_show_contact_thumbnails.isChecked = baseConfig.showContactThumbnails settings_show_contact_thumbnails_holder.setOnClickListener { settings_show_contact_thumbnails.toggle() - this.baseConfig.showContactThumbnails = settings_show_contact_thumbnails.isChecked + baseConfig.showContactThumbnails = settings_show_contact_thumbnails.isChecked } } private fun setupShowPhoneNumbers() { - settings_show_phone_numbers.isChecked = this.baseConfig.showPhoneNumbers + settings_show_phone_numbers.isChecked = baseConfig.showPhoneNumbers settings_show_phone_numbers_holder.setOnClickListener { settings_show_phone_numbers.toggle() - this.baseConfig.showPhoneNumbers = settings_show_phone_numbers.isChecked + baseConfig.showPhoneNumbers = settings_show_phone_numbers.isChecked } } private fun setupShowContactsWithNumbers() { - settings_show_only_contacts_with_numbers.isChecked = this.baseConfig.showOnlyContactsWithNumbers + settings_show_only_contacts_with_numbers.isChecked = baseConfig.showOnlyContactsWithNumbers settings_show_only_contacts_with_numbers_holder.setOnClickListener { settings_show_only_contacts_with_numbers.toggle() - this.baseConfig.showOnlyContactsWithNumbers = settings_show_only_contacts_with_numbers.isChecked + baseConfig.showOnlyContactsWithNumbers = settings_show_only_contacts_with_numbers.isChecked } } private fun setupStartNameWithSurname() { - settings_start_name_with_surname.isChecked = this.baseConfig.startNameWithSurname + settings_start_name_with_surname.isChecked = baseConfig.startNameWithSurname settings_start_name_with_surname_holder.setOnClickListener { settings_start_name_with_surname.toggle() - this.baseConfig.startNameWithSurname = settings_start_name_with_surname.isChecked + baseConfig.startNameWithSurname = settings_start_name_with_surname.isChecked } } private fun setupShowDialpadButton() { - settings_show_dialpad_button.isChecked = this.baseConfig.showDialpadButton + settings_show_dialpad_button.isChecked = baseConfig.showDialpadButton settings_show_dialpad_button_holder.setOnClickListener { settings_show_dialpad_button.toggle() - this.baseConfig.showDialpadButton = settings_show_dialpad_button.isChecked + baseConfig.showDialpadButton = settings_show_dialpad_button.isChecked } } private fun setupShowPrivateContacts() { - settings_show_private_contacts.isChecked = this.baseConfig.showPrivateContacts + settings_show_private_contacts.isChecked = baseConfig.showPrivateContacts settings_show_private_contacts_holder.setOnClickListener { settings_show_private_contacts.toggle() - this.baseConfig.showPrivateContacts = settings_show_private_contacts.isChecked + baseConfig.showPrivateContacts = settings_show_private_contacts.isChecked } } @@ -185,15 +185,15 @@ class SettingsActivity : SimpleActivity() { RadioItem(ON_CLICK_EDIT_CONTACT, getString(R.string.edit_contact)) ) - RadioGroupDialog(this@SettingsActivity, items, this.baseConfig.onContactClick) { - this.baseConfig.onContactClick = it as Int + RadioGroupDialog(this@SettingsActivity, items, baseConfig.onContactClick) { + baseConfig.onContactClick = it as Int settings_on_contact_click.text = getOnContactClickText() } } } private fun getOnContactClickText() = getString( - when (this.baseConfig.onContactClick) { + when (baseConfig.onContactClick) { ON_CLICK_CALL_CONTACT -> R.string.call_contact ON_CLICK_VIEW_CONTACT -> R.string.view_contact else -> R.string.edit_contact @@ -201,18 +201,18 @@ class SettingsActivity : SimpleActivity() { ) private fun setupShowCallConfirmation() { - settings_show_call_confirmation.isChecked = this.baseConfig.showCallConfirmation + settings_show_call_confirmation.isChecked = baseConfig.showCallConfirmation settings_show_call_confirmation_holder.setOnClickListener { settings_show_call_confirmation.toggle() - this.baseConfig.showCallConfirmation = settings_show_call_confirmation.isChecked + baseConfig.showCallConfirmation = settings_show_call_confirmation.isChecked } } private fun setupMergeDuplicateContacts() { - settings_merge_duplicate_contacts.isChecked = this.baseConfig.mergeDuplicateContacts + settings_merge_duplicate_contacts.isChecked = baseConfig.mergeDuplicateContacts settings_merge_duplicate_contacts_holder.setOnClickListener { settings_merge_duplicate_contacts.toggle() - this.baseConfig.mergeDuplicateContacts = settings_merge_duplicate_contacts.isChecked + baseConfig.mergeDuplicateContacts = settings_merge_duplicate_contacts.isChecked } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index d9b9df5c..4f414eba 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -46,7 +46,7 @@ class ViewContactActivity : ContactActivity() { private var showFields = 0 private var fullContact: Contact? = null // contact with all fields filled from duplicates private var duplicateInitialized = false - private val mergeDuplicate: Boolean get() = this.baseConfig.mergeDuplicateContacts + private val mergeDuplicate: Boolean get() = baseConfig.mergeDuplicateContacts private val COMPARABLE_PHONE_NUMBER_LENGTH = 9 @@ -59,7 +59,7 @@ class ViewContactActivity : ContactActivity() { return } - showFields = this.baseConfig.showContactFields + showFields = baseConfig.showContactFields contact_wrapper.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN setupMenu() } @@ -122,7 +122,7 @@ class ViewContactActivity : ContactActivity() { findItem(R.id.manage_visible_fields).setOnMenuItemClickListener { ManageVisibleFieldsDialog(this@ViewContactActivity) { - showFields = this@ViewContactActivity.baseConfig.showContactFields + showFields = baseConfig.showContactFields ensureBackgroundThread { initContact() } @@ -388,7 +388,7 @@ class ViewContactActivity : ContactActivity() { copyOnLongClick(phoneNumber.value) setOnClickListener { - if (this@ViewContactActivity.baseConfig.showCallConfirmation) { + if (baseConfig.showCallConfirmation) { CallConfirmationDialog(this@ViewContactActivity, phoneNumber.value) { startCallIntent(phoneNumber.value) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt index db7eac9b..e6b19c09 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt @@ -30,7 +30,7 @@ fun SimpleActivity.startCallIntent(recipient: String) { } fun SimpleActivity.tryStartCall(contact: Contact) { - if (this.baseConfig.showCallConfirmation) { + if (baseConfig.showCallConfirmation) { CallConfirmationDialog(this, contact.getNameToDisplay()) { startCall(contact) } @@ -107,7 +107,7 @@ fun BaseSimpleActivity.shareContacts(contacts: ArrayList) { } fun SimpleActivity.handleGenericContactClick(contact: Contact) { - when (this.baseConfig.onContactClick) { + when (baseConfig.onContactClick) { ON_CLICK_CALL_CONTACT -> callContact(contact) ON_CLICK_VIEW_CONTACT -> viewContact(contact) ON_CLICK_EDIT_CONTACT -> editContact(contact) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt index 2faa833c..f3f2d6f7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt @@ -280,7 +280,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) activity?.apply { val orderIds = items.map { it.id } val orderGsonString = Gson().toJson(orderIds) - this.baseConfig.favoritesContactsOrder = orderGsonString + baseConfig.favoritesContactsOrder = orderGsonString } }