Use debouncedClicks where applicable

2025-02-09 08:38:43 +01:00 · 2021-12-06 22:10:57 +01:00 · 2021-12-06 22:10:57 +01:00 · d13c252658
commit d13c252658
parent 8421d46cd7
26 changed files with 66 additions and 50 deletions
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@ -79,7 +79,7 @@ class AttachmentsPreviewFragment @Inject constructor(
        applyInsets()
        setupRecyclerViews()
        setupToolbar(views.attachmentPreviewerToolbar)
-        views.attachmentPreviewerSendButton.setOnClickListener {
+        views.attachmentPreviewerSendButton.debouncedClicks {
            setResultAndFinish()
        }
    }
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
@ -77,7 +77,7 @@ class ContactsBookFragment @Inject constructor(
    }

    private fun setupConsentView() {
-        views.phoneBookSearchForMatrixContacts.setOnClickListener {
+        views.phoneBookSearchForMatrixContacts.debouncedClicks {
            contactsBookViewModel.handle(ContactsBookAction.UserConsentRequest)
        }
    }
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@ -58,8 +58,8 @@ class KeysBackupRestoreFromKeyFragment @Inject constructor() :
            views.keyInputLayout.error = newValue
        }

-        views.keysRestoreButton.setOnClickListener { onRestoreFromKey() }
-        views.keysBackupImport.setOnClickListener { onImport() }
+        views.keysRestoreButton.debouncedClicks { onRestoreFromKey() }
+        views.keysBackupImport.debouncedClicks { onImport() }
        views.keyTextEdit.doOnTextChanged { text, _, _, _ -> onRestoreKeyTextEditChange(text) }
    }

--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
@ -58,8 +58,8 @@ class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBase
            return@setOnEditorActionListener false
        }

-        views.helperTextWithLink.setOnClickListener { onUseRecoveryKey() }
-        views.keysBackupRestoreWithPassphraseSubmit.setOnClickListener { onRestoreBackup() }
+        views.helperTextWithLink.debouncedClicks { onUseRecoveryKey() }
+        views.keysBackupRestoreWithPassphraseSubmit.debouncedClicks { onRestoreBackup() }
        views.keysBackupPassphraseEnterEdittext.doOnTextChanged { text, _, _, _ -> onPassphraseTextEditChange(text) }
    }

--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@ -52,7 +52,7 @@ class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragmen
            views.successText.text = context?.getString(R.string.keys_backup_restore_success_title_already_up_to_date)
            views.successDetailsText.isVisible = false
        }
-        views.keysBackupSetupDoneButton.setOnClickListener { onDone() }
+        views.keysBackupSetupDoneButton.debouncedClicks { onDone() }
    }

    private fun onDone() {
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
@ -45,8 +45,8 @@ class KeysBackupSetupStep1Fragment @Inject constructor() : VectorBaseFragment<Fr
            views.keysBackupSetupStep1ManualExportButton.visibility = if (showOption) View.VISIBLE else View.GONE
        }

-        views.keysBackupSetupStep1Button.setOnClickListener { onButtonClick() }
-        views.keysBackupSetupStep1ManualExportButton.setOnClickListener { onManualExportClick() }
+        views.keysBackupSetupStep1Button.debouncedClicks { onButtonClick() }
+        views.keysBackupSetupStep1ManualExportButton.debouncedClicks { onManualExportClick() }
    }

    private fun onButtonClick() {
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
@ -128,8 +128,8 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment<Fr
    }

    private fun setupViews() {
-        views.keysBackupSetupStep2Button.setOnClickListener { doNext() }
-        views.keysBackupSetupStep2SkipButton.setOnClickListener { skipPassphrase() }
+        views.keysBackupSetupStep2Button.debouncedClicks { doNext() }
+        views.keysBackupSetupStep2SkipButton.debouncedClicks { skipPassphrase() }

        views.keysBackupSetupStep2PassphraseEnterEdittext.doOnTextChanged { _, _, _, _ -> onPassphraseChanged() }
        views.keysBackupSetupStep2PassphraseConfirmEditText.doOnTextChanged { _, _, _, _ -> onConfirmPassphraseChanged() }
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@ -85,9 +85,9 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
    }

    private fun setupViews() {
-        views.keysBackupSetupStep3FinishButton.setOnClickListener { onFinishButtonClicked() }
-        views.keysBackupSetupStep3CopyButton.setOnClickListener { onCopyButtonClicked() }
-        views.keysBackupSetupStep3RecoveryKeyText.setOnClickListener { onRecoveryKeyClicked() }
+        views.keysBackupSetupStep3FinishButton.debouncedClicks { onFinishButtonClicked() }
+        views.keysBackupSetupStep3CopyButton.debouncedClicks { onCopyButtonClicked() }
+        views.keysBackupSetupStep3RecoveryKeyText.debouncedClicks { onRecoveryKeyClicked() }
    }

    private fun onFinishButtonClicked() {
@ -127,7 +127,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
            }
        }

-        dialog.findViewById<View>(R.id.keys_backup_setup_save)?.setOnClickListener {
+        dialog.findViewById<View>(R.id.keys_backup_setup_save)?.debouncedClicks {
            val userId = viewModel.userId
            val timestamp = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
            selectTxtFileToWrite(
@ -139,7 +139,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
            dialog.dismiss()
        }

-        dialog.findViewById<View>(R.id.keys_backup_setup_share)?.setOnClickListener {
+        dialog.findViewById<View>(R.id.keys_backup_setup_share)?.debouncedClicks {
            startSharePlainTextIntent(
                    fragment = this,
                    activityResultLauncher = null,
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@ -898,7 +898,7 @@ class RoomDetailFragment @Inject constructor(
    }

    private fun setupJumpToReadMarkerView() {
-        views.jumpToReadMarkerView.setOnClickListener {
+        views.jumpToReadMarkerView.debouncedClicks {
            onJumpToReadMarkerClicked()
        }
        views.jumpToReadMarkerView.setOnCloseIconClickListener {
@ -954,7 +954,7 @@ class RoomDetailFragment @Inject constructor(
        super.onCreateOptionsMenu(menu, inflater)
        // We use a custom layout for this menu item, so we need to set a ClickListener
        menu.findItem(R.id.open_matrix_apps)?.let { menuItem ->
-            menuItem.actionView.setOnClickListener {
+            menuItem.actionView.debouncedClicks {
                onOptionsItemSelected(menuItem)
            }
        }
@ -1463,7 +1463,7 @@ class RoomDetailFragment @Inject constructor(
                callback = this@RoomDetailFragment
                isVisible = true
                render(inviter, VectorInviteView.Mode.LARGE, mainState.changeMembershipState)
-                setOnClickListener { }
+                setOnClickListener(null)
            }
            Unit
        } else if (mainState.asyncInviter.complete) {
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@ -81,7 +81,7 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
    }

    private fun setupForgottenPasswordButton() {
-        views.forgetPasswordButton.setOnClickListener { forgetPasswordClicked() }
+        views.forgetPasswordButton.debouncedClicks { forgetPasswordClicked() }
    }

    private fun setupAutoFill(state: LoginViewState) {
@ -226,7 +226,7 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
    }

    private fun setupSubmitButton() {
-        views.loginSubmit.setOnClickListener { submit() }
+        views.loginSubmit.debouncedClicks { submit() }
        combine(
                views.loginField.textChanges().map { it.trim().isNotEmpty() },
                views.passwordField.textChanges().map { it.isNotEmpty() }
--- a/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
@ -78,8 +78,8 @@ class LoginGenericTextInputFormFragment @Inject constructor() : AbstractLoginFra
    }

    private fun setupViews() {
-        views.loginGenericTextInputFormOtherButton.setOnClickListener { onOtherButtonClicked() }
-        views.loginGenericTextInputFormSubmit.setOnClickListener { submit() }
+        views.loginGenericTextInputFormOtherButton.debouncedClicks { onOtherButtonClicked() }
+        views.loginGenericTextInputFormSubmit.debouncedClicks { submit() }
    }

    private fun setupAutoFill() {
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
@ -61,7 +61,7 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment<F
    }

    private fun setupSubmitButton() {
-        views.resetPasswordSubmit.setOnClickListener { submit() }
+        views.resetPasswordSubmit.debouncedClicks { submit() }
        combine(
                views.resetPasswordEmail.textChanges().map { it.isEmail() },
                views.passwordField.textChanges().map { it.isNotEmpty() }
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
@ -40,7 +40,7 @@ class LoginResetPasswordMailConfirmationFragment @Inject constructor() : Abstrac
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)

-        views.resetPasswordMailConfirmationSubmit.setOnClickListener { submit() }
+        views.resetPasswordMailConfirmationSubmit.debouncedClicks { submit() }
    }

    private fun setupUi(state: LoginViewState) {
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
@ -35,7 +35,7 @@ class LoginResetPasswordSuccessFragment @Inject constructor() : AbstractLoginFra
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)

-        views.resetPasswordSuccessSubmit.setOnClickListener { submit() }
+        views.resetPasswordSuccessSubmit.debouncedClicks { submit() }
    }

    private fun submit() {
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
@ -43,11 +43,11 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
    }

    private fun initViews() {
-        views.loginServerChoiceEmsLearnMore.setOnClickListener { learnMore() }
-        views.loginServerChoiceMatrixOrg.setOnClickListener { selectMatrixOrg() }
-        views.loginServerChoiceEms.setOnClickListener { selectEMS() }
-        views.loginServerChoiceOther.setOnClickListener { selectOther() }
-        views.loginServerIKnowMyIdSubmit.setOnClickListener { loginWithMatrixId() }
+        views.loginServerChoiceEmsLearnMore.debouncedClicks { learnMore() }
+        views.loginServerChoiceMatrixOrg.debouncedClicks { selectMatrixOrg() }
+        views.loginServerChoiceEms.debouncedClicks { selectEMS() }
+        views.loginServerChoiceOther.debouncedClicks { selectOther() }
+        views.loginServerIKnowMyIdSubmit.debouncedClicks { loginWithMatrixId() }
    }

    private fun updateSelectedChoice(state: LoginViewState) {
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@ -57,9 +57,9 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<F
    }

    private fun setupViews() {
-        views.loginServerUrlFormLearnMore.setOnClickListener { learnMore() }
-        views.loginServerUrlFormClearHistory.setOnClickListener { clearHistory() }
-        views.loginServerUrlFormSubmit.setOnClickListener { submit() }
+        views.loginServerUrlFormLearnMore.debouncedClicks { learnMore() }
+        views.loginServerUrlFormClearHistory.debouncedClicks { clearHistory() }
+        views.loginServerUrlFormSubmit.debouncedClicks { submit() }
    }

    private fun setupHomeServerField() {
--- a/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
@ -43,8 +43,8 @@ class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOLogi
    }

    private fun setupViews() {
-        views.loginSignupSigninSubmit.setOnClickListener { submit() }
-        views.loginSignupSigninSignIn.setOnClickListener { signIn() }
+        views.loginSignupSigninSubmit.debouncedClicks { submit() }
+        views.loginSignupSigninSignIn.debouncedClicks { signIn() }
    }

    private fun setupUi(state: LoginViewState) {
--- a/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
@ -73,7 +73,7 @@ class LoginTermsFragment @Inject constructor(
    }

    private fun setupViews() {
-        views.loginTermsSubmit.setOnClickListener { submit() }
+        views.loginTermsSubmit.debouncedClicks { submit() }
    }

    override fun onDestroyView() {
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
@ -85,11 +85,11 @@ class AccountCreatedFragment @Inject constructor(
    }

    private fun setupClickListener() {
-        views.loginAccountCreatedMessage.setOnClickListener {
+        views.loginAccountCreatedMessage.debouncedClicks {
            // Update display name
            displayDialog()
        }
-        views.loginAccountCreatedAvatar.setOnClickListener {
+        views.loginAccountCreatedAvatar.debouncedClicks {
            galleryOrCameraDialogHelper.show()
        }
    }
@ -120,8 +120,8 @@ class AccountCreatedFragment @Inject constructor(
    }

    private fun setupSubmitButton() {
-        views.loginAccountCreatedLater.setOnClickListener { terminate() }
-        views.loginAccountCreatedDone.setOnClickListener { terminate() }
+        views.loginAccountCreatedLater.debouncedClicks { terminate() }
+        views.loginAccountCreatedDone.debouncedClicks { terminate() }
    }

    private fun terminate() {
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@ -232,10 +232,10 @@ class RoomMemberProfileFragment @Inject constructor(
                    headerViews.memberProfileDecorationImageView.isVisible = false
                }

-                headerViews.memberProfileAvatarView.setOnClickListener { view ->
+                headerViews.memberProfileAvatarView.debouncedClicks { view ->
                    onAvatarClicked(view, userMatrixItem)
                }
-                views.matrixProfileToolbarAvatarImageView.setOnClickListener { view ->
+                views.matrixProfileToolbarAvatarImageView.debouncedClicks { view ->
                    onAvatarClicked(view, userMatrixItem)
                }
            }
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@ -146,12 +146,12 @@ class RoomProfileFragment @Inject constructor(
                headerViews.roomProfileNameView,
                views.matrixProfileToolbarTitleView
        ).forEach {
-            it.setOnClickListener {
+            it.debouncedClicks {
                roomProfileSharedActionViewModel.post(RoomProfileSharedAction.OpenRoomSettings)
            }
        }
        // Shortcut to room alias
-        headerViews.roomProfileAliasView.setOnClickListener {
+        headerViews.roomProfileAliasView.debouncedClicks {
            roomProfileSharedActionViewModel.post(RoomProfileSharedAction.OpenRoomAliasesSettings)
        }
        // Open Avatar
@ -159,7 +159,7 @@ class RoomProfileFragment @Inject constructor(
                headerViews.roomProfileAvatarView,
                views.matrixProfileToolbarAvatarImageView
        ).forEach { view ->
-            view.setOnClickListener { onAvatarClicked(view) }
+            view.debouncedClicks { onAvatarClicked(view) }
        }
    }

--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
@ -20,14 +20,19 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.singletonEntryPoint
+import im.vector.app.core.flow.throttleFirst
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.toast
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.session.Session
+import reactivecircus.flowbinding.android.view.clicks
 import timber.log.Timber

 abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat() {
@ -42,6 +47,17 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat() {
    protected lateinit var session: Session
    protected lateinit var errorFormatter: ErrorFormatter

+    /* ==========================================================================================
+     * Views
+     * ========================================================================================== */
+
+    protected fun View.debouncedClicks(onClicked: () -> Unit) {
+        clicks()
+                .throttleFirst(300)
+                .onEach { onClicked() }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
    abstract val preferenceXmlRes: Int

    @CallSuper
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@ -418,7 +418,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
                    }
                }

-                updateButton.setOnClickListener {
+                updateButton.debouncedClicks {
                    // Hide passwords during processing
                    views.changePasswordOldPwdText.hidePassword()
                    views.changePasswordNewPwdText.hidePassword()
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@ -197,7 +197,7 @@ class VectorSettingsPreferencesFragment @Inject constructor(
                .forEachIndexed { i, v ->
                    v.isChecked = i == index

-                    v.setOnClickListener {
+                    v.debouncedClicks {
                        dialog.dismiss()
                        FontScale.updateFontScale(activity, i)
                        vectorConfiguration.applyToApplicationContext()
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@ -446,7 +446,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(

            val importDialog = builder.show()

-            views.dialogE2eKeysImportButton.setOnClickListener {
+            views.dialogE2eKeysImportButton.debouncedClicks {
                val password = views.dialogE2eKeysPassphraseEditText.text.toString()

                displayLoadingView()
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@ -118,7 +118,7 @@ class IncomingShareFragment @Inject constructor(
                return true
            }
        })
-        views.sendShareButton.setOnClickListener {
+        views.sendShareButton.debouncedClicks {
            handleSendShare()
        }
    }