Merge pull request #10659 from woocommerce/revert_unintentional_commits

Revert commits pushed to trunk
woocommerce · Feb 1, 2024 · 526fabc · 526fabc
2 parents e7e651c + 6bdba76
commit 526fabc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 146 deletions.
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dialog/DialogParams.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dialog/DialogParams.kt
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dialog/WooDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dialog/WooDialogFragment.kt
diff --git a/...src/main/kotlin/com/woocommerce/android/ui/products/variations/VariationDetailFragment.kt b/...src/main/kotlin/com/woocommerce/android/ui/products/variations/VariationDetailFragment.kt
@@ -31,8 +31,6 @@ import com.woocommerce.android.model.VariantOption
 import com.woocommerce.android.ui.aztec.AztecEditorFragment
 import com.woocommerce.android.ui.base.BaseFragment
 import com.woocommerce.android.ui.base.UIMessageResolver
-import com.woocommerce.android.ui.dialog.WooDialogFragment
-import com.woocommerce.android.ui.dialog.WooDialogFragment.DialogInteractionListener
 import com.woocommerce.android.ui.main.MainActivity.Companion.BackPressListener
 import com.woocommerce.android.ui.products.BaseProductEditorFragment
 import com.woocommerce.android.ui.products.ProductInventoryViewModel.InventoryData
@@ -50,7 +48,6 @@ import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ExitWithResult
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowActionSnackbar
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowDialog
-import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowDialogFragment
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar
 import com.woocommerce.android.widgets.CustomProgressDialog
 import com.woocommerce.android.widgets.SkeletonView
@@ -64,8 +61,7 @@ class VariationDetailFragment :
     BaseFragment(R.layout.fragment_variation_detail),
     BackPressListener,
     OnGalleryImageInteractionListener,
-    MenuProvider,
-    DialogInteractionListener {
+    MenuProvider {
     companion object {
         private const val LIST_STATE_KEY = "list_state"
         const val KEY_VARIATION_DETAILS_RESULT = "key_variation_details_result"
@@ -99,18 +95,11 @@ class VariationDetailFragment :
 
         _binding = FragmentVariationDetailBinding.bind(view)
 
-        reattachDialogInteractionListener()
-
         requireActivity().addMenuProvider(this, viewLifecycleOwner)
         initializeViews(savedInstanceState)
         initializeViewModel()
     }
 
-    private fun reattachDialogInteractionListener() {
-        val dialogFragment = parentFragmentManager.findFragmentByTag(WooDialogFragment.TAG) as? WooDialogFragment
-        dialogFragment?.setDialogInteractionListener(this)
-    }
-
     override fun onDestroyView() {
         skeletonView.hide()
         imageUploadErrorsSnackbar?.dismiss()
@@ -287,25 +276,12 @@ class VariationDetailFragment :
 
                 is ExitWithResult<*> -> navigateBackWithResult(KEY_VARIATION_DETAILS_RESULT, event.data)
                 is ShowDialog -> event.showDialog()
-                is ShowDialogFragment -> event.showIn(parentFragmentManager, this)
                 is Exit -> requireActivity().onBackPressedDispatcher.onBackPressed()
                 else -> event.isHandled = false
             }
         }
     }
 
-    override fun onPositiveButtonClicked() {
-        viewModel.onDeleteVariationConfirmed()
-    }
-
-    override fun onNegativeButtonClicked() {
-        viewModel.onDeleteVariationCancelled()
-    }
-
-    override fun onNeutralButtonClicked() {
-        // no-op
-    }
-
     private fun showVariationDetails(variation: ProductVariation) {
         if (variation.image == null && !viewModel.isUploadingImages()) {
             binding.imageGallery.hide()

diff --git a/...rc/main/kotlin/com/woocommerce/android/ui/products/variations/VariationDetailViewModel.kt b/...rc/main/kotlin/com/woocommerce/android/ui/products/variations/VariationDetailViewModel.kt
@@ -131,27 +131,25 @@ class VariationDetailViewModel @Inject constructor(
 
     fun onDeleteVariationClicked() {
         triggerEvent(
-            Event.ShowDialogFragment(
+            Event.ShowDialog(
+                positiveBtnAction = { _, _ ->
+                    AnalyticsTracker.track(
+                        AnalyticsEvent.PRODUCT_VARIATION_REMOVE_BUTTON_TAPPED,
+                        mapOf(KEY_PRODUCT_ID to viewState.parentProduct?.remoteId)
+                    )
+                    viewState = viewState.copy(isConfirmingDeletion = false)
+                    deleteVariation()
+                },
+                negativeBtnAction = { _, _ ->
+                    viewState = viewState.copy(isConfirmingDeletion = false)
+                },
                 messageId = string.variation_confirm_delete,
                 positiveButtonId = string.delete,
                 negativeButtonId = string.cancel
             )
         )
     }
 
-    fun onDeleteVariationConfirmed() {
-        AnalyticsTracker.track(
-            AnalyticsEvent.PRODUCT_VARIATION_REMOVE_BUTTON_TAPPED,
-            mapOf(KEY_PRODUCT_ID to viewState.parentProduct?.remoteId)
-        )
-        viewState = viewState.copy(isConfirmingDeletion = false)
-        deleteVariation()
-    }
-
-    fun onDeleteVariationCancelled() {
-        viewState = viewState.copy(isConfirmingDeletion = false)
-    }
-
     fun onExit() {
         when {
             isUploadingImages() -> {

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/viewmodel/MultiLiveEvent.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/viewmodel/MultiLiveEvent.kt
@@ -12,9 +12,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.woocommerce.android.R.string
 import com.woocommerce.android.model.UiString
 import com.woocommerce.android.support.help.HelpOrigin
-import com.woocommerce.android.ui.dialog.DialogParams
 import com.woocommerce.android.ui.dialog.WooDialog
-import com.woocommerce.android.ui.dialog.WooDialogFragment
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -131,36 +129,6 @@ open class MultiLiveEvent<T : Event> : MutableLiveData<T>() {
 
         data class LaunchUrlInChromeTab(val url: String) : Event()
 
-        data class ShowDialogFragment(
-            @StringRes val titleId: Int? = null,
-            @StringRes val messageId: Int? = null,
-            @StringRes val positiveButtonId: Int? = null,
-            @StringRes val negativeButtonId: Int? = null,
-            @StringRes val neutralButtonId: Int? = null,
-            val positiveActionName: String? = null,
-            val negativeActionName: String? = null,
-            val neutralActionName: String? = null,
-            val cancelable: Boolean = true
-        ) : Event() {
-            fun showIn(
-                fragmentManager: androidx.fragment.app.FragmentManager,
-                listener: WooDialogFragment.DialogInteractionListener
-            ) {
-                val dialogParams = DialogParams(
-                    titleId = titleId,
-                    messageId = messageId,
-                    positiveButtonId = positiveButtonId,
-                    negativeButtonId = negativeButtonId,
-                    neutralButtonId = neutralButtonId,
-                    cancelable = cancelable
-                )
-                val dialogFragment = WooDialogFragment.newInstance(dialogParams).apply {
-                    setDialogInteractionListener(listener)
-                }
-                dialogFragment.show(fragmentManager, WooDialogFragment.TAG)
-            }
-        }
-
         data class ShowDialog(
             @StringRes val titleId: Int? = null,
             @StringRes val messageId: Int? = null,