From 1f8073cbbf55adb22a9e9d8e47f22cb39d51c016 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 6 Dec 2021 22:15:34 +0100 Subject: [PATCH] clicks() already has debouncing with conflate(), so throttleFirst is not necessary --- .../main/java/im/vector/app/core/platform/VectorBaseActivity.kt | 2 -- .../app/core/platform/VectorBaseBottomSheetDialogFragment.kt | 2 -- .../main/java/im/vector/app/core/platform/VectorBaseFragment.kt | 2 -- .../vector/app/features/settings/VectorSettingsBaseFragment.kt | 2 -- 4 files changed, 8 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index 66c5a53cc2..181bd8c6be 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -62,7 +62,6 @@ import im.vector.app.core.extensions.restart import im.vector.app.core.extensions.setTextOrHide import im.vector.app.core.extensions.singletonEntryPoint import im.vector.app.core.extensions.toMvRxBundle -import im.vector.app.core.flow.throttleFirst import im.vector.app.core.utils.toast import im.vector.app.features.MainActivity import im.vector.app.features.MainActivityArgs @@ -121,7 +120,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver protected fun View.debouncedClicks(onClicked: () -> Unit) { clicks() - .throttleFirst(300) .onEach { onClicked() } .launchIn(lifecycleScope) } diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt index 95feb45ad6..e441efe684 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt @@ -35,7 +35,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment import dagger.hilt.android.EntryPointAccessors import im.vector.app.core.di.ActivityEntryPoint import im.vector.app.core.extensions.toMvRxBundle -import im.vector.app.core.flow.throttleFirst import im.vector.app.core.utils.DimensionConverter import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -168,7 +167,6 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomShe protected fun View.debouncedClicks(onClicked: () -> Unit) { clicks() - .throttleFirst(300) .onEach { onClicked() } .launchIn(viewLifecycleOwner.lifecycleScope) } diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt index f4e1fe84e1..9f156f937c 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt @@ -42,7 +42,6 @@ import im.vector.app.core.dialogs.UnrecognizedCertificateDialog import im.vector.app.core.error.ErrorFormatter import im.vector.app.core.extensions.singletonEntryPoint import im.vector.app.core.extensions.toMvRxBundle -import im.vector.app.core.flow.throttleFirst import im.vector.app.features.navigation.Navigator import im.vector.lib.ui.styles.dialogs.MaterialProgressDialog import kotlinx.coroutines.flow.launchIn @@ -239,7 +238,6 @@ abstract class VectorBaseFragment : Fragment(), MavericksView protected fun View.debouncedClicks(onClicked: () -> Unit) { clicks() - .throttleFirst(300) .onEach { onClicked() } .launchIn(viewLifecycleOwner.lifecycleScope) } diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt index 0e1614326c..cca4b72818 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt @@ -26,7 +26,6 @@ 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 @@ -53,7 +52,6 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat() { protected fun View.debouncedClicks(onClicked: () -> Unit) { clicks() - .throttleFirst(300) .onEach { onClicked() } .launchIn(viewLifecycleOwner.lifecycleScope) }