Revert ProductDetailNavigation changes

This reverts commit: 73c7cea, and f4adca4, and 7ea36dd.

Author: hichamboushaba

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/stock/DashboardProductStockCard.kt

@@ -21,7 +21,6 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -33,11 +32,13 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.compose.LocalLifecycleOwner
+import com.woocommerce.android.NavGraphMainDirections
 import com.woocommerce.android.R
-import com.woocommerce.android.extensions.findActivity
+import com.woocommerce.android.extensions.navigateSafely
 import com.woocommerce.android.model.DashboardWidget
 import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.component.ProductThumbnail
+import com.woocommerce.android.ui.compose.rememberNavController
 import com.woocommerce.android.ui.dashboard.DashboardFilterableCardHeader
 import com.woocommerce.android.ui.dashboard.DashboardViewModel
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardWidgetMenu
@@ -46,8 +47,8 @@ import com.woocommerce.android.ui.dashboard.WidgetCard
 import com.woocommerce.android.ui.dashboard.WidgetError
 import com.woocommerce.android.ui.dashboard.defaultHideMenuEntry
 import com.woocommerce.android.ui.dashboard.stock.DashboardProductStockViewModel.OpenProductDetail
-import com.woocommerce.android.ui.main.MainActivity
 import com.woocommerce.android.ui.products.ProductStockStatus
+import com.woocommerce.android.ui.products.details.ProductDetailFragment.Mode.ShowProduct
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event
 
 @Composable
@@ -75,13 +76,17 @@ fun DashboardProductStockCard(
 
 @Composable
 private fun HandleEvents(event: LiveData<Event>) {
+    val navController = rememberNavController()
     val lifecycleOwner = LocalLifecycleOwner.current
-    val context = LocalContext.current
 
-    DisposableEffect(event, context, lifecycleOwner) {
+    DisposableEffect(event, navController, lifecycleOwner) {
         val observer = Observer { event: Event ->
             when (event) {
-                is OpenProductDetail -> (context.findActivity() as? MainActivity)?.showProductDetail(event.productId)
+                is OpenProductDetail -> navController.navigateSafely(
+                    NavGraphMainDirections.actionGlobalProductDetailFragment(
+                        mode = ShowProduct(event.productId),
+                    )
+                )
             }
         }
         event.observe(lifecycleOwner, observer)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/topperformers/DashboardTopPerformersWidgetCard.kt

@@ -20,7 +20,6 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
@@ -33,8 +32,8 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.compose.LocalLifecycleOwner
+import com.woocommerce.android.NavGraphMainDirections
 import com.woocommerce.android.R
-import com.woocommerce.android.extensions.findActivity
 import com.woocommerce.android.extensions.navigateSafely
 import com.woocommerce.android.model.DashboardWidget
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.SelectionType
@@ -58,7 +57,7 @@ import com.woocommerce.android.ui.dashboard.topperformers.DashboardTopPerformers
 import com.woocommerce.android.ui.dashboard.topperformers.DashboardTopPerformersViewModel.OpenTopPerformer
 import com.woocommerce.android.ui.dashboard.topperformers.DashboardTopPerformersViewModel.TopPerformersDateRange
 import com.woocommerce.android.ui.dashboard.topperformers.DashboardTopPerformersViewModel.TopPerformersState
-import com.woocommerce.android.ui.main.MainActivity
+import com.woocommerce.android.ui.products.details.ProductDetailFragment.Mode.ShowProduct
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event
 import com.woocommerce.commons.stats.StatsTimeRange
 import java.util.Calendar
@@ -159,12 +158,16 @@ private fun HandleEvents(
 ) {
     val navController = rememberNavController()
     val lifecycleOwner = LocalLifecycleOwner.current
-    val context = LocalContext.current
 
-    DisposableEffect(event, navController, lifecycleOwner, context) {
+    DisposableEffect(event, navController, lifecycleOwner) {
         val observer = Observer { event: Event ->
             when (event) {
-                is OpenTopPerformer -> (context.findActivity() as? MainActivity)?.showProductDetail(event.productId)
+                is OpenTopPerformer -> navController.navigateSafely(
+                    NavGraphMainDirections.actionGlobalProductDetailFragment(
+                        mode = ShowProduct(event.productId),
+                    )
+                )
+
                 is OpenDatePicker -> openDatePicker(event.fromDate.time, event.toDate.time)
                 is OpenAnalytics -> {
                     navController.navigateSafely(
@@ -367,7 +370,6 @@ private fun TopPerformersErrorView(
                 onContactSupportClick = onContactSupportClicked
             )
         }
-
         else -> {
             WidgetError(
                 onContactSupportClicked = onContactSupportClicked,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt

@@ -37,6 +37,7 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavOptions
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.navOptions
 import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.google.android.material.appbar.AppBarLayout
 import com.woocommerce.android.AppPrefs
@@ -103,7 +104,6 @@ import com.woocommerce.android.ui.plans.di.TrialStatusBarFormatterFactory
 import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState.TrialStatusBarState
 import com.woocommerce.android.ui.prefs.AppSettingsActivity
 import com.woocommerce.android.ui.prefs.RequestedAnalyticsValue
-import com.woocommerce.android.ui.products.ProductDetailNavigator
 import com.woocommerce.android.ui.products.details.ProductDetailFragment
 import com.woocommerce.android.ui.products.list.ProductListFragmentDirections
 import com.woocommerce.android.ui.reviews.ReviewListFragmentDirections
@@ -196,9 +196,6 @@ class MainActivity :
     @Inject
     lateinit var bookingsTabController: BookingsTabController
 
-    @Inject
-    lateinit var productDetailNavigator: ProductDetailNavigator
-
     private val viewModel: MainActivityViewModel by viewModels()
 
     private var unfilledOrderCount: Int = 0
@@ -1032,7 +1029,24 @@ class MainActivity :
     }
 
     override fun showProductDetail(remoteProductId: Long, popUpToProductList: Boolean, sharedView: View?) {
-        productDetailNavigator.showProductDetail(remoteProductId, popUpToProductList, sharedView)
+        val action = NavGraphMainDirections.actionGlobalProductDetailFragment(
+            mode = ProductDetailFragment.Mode.ShowProduct(remoteProductId),
+        )
+        val extras = if (sharedView != null) {
+            val productCardDetailTransitionName = getString(R.string.product_card_detail_transition_name)
+            FragmentNavigatorExtras(sharedView to productCardDetailTransitionName)
+        } else {
+            null
+        }
+        navController.navigateSafely(
+            directions = action,
+            extras = extras,
+            navOptions = navOptions {
+                if (popUpToProductList) {
+                    popUpTo(R.id.products)
+                }
+            }
+        )
     }
 
     override fun showProductVariationDetail(remoteProductId: Long, remoteVariationId: Long) {