Handle displaying back navigation icon

Author: hichamboushaba

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/details/webview/ProductDetailWebViewFragment.kt

@@ -1,6 +1,5 @@
 package com.woocommerce.android.ui.products.details.webview
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -27,7 +26,10 @@ class ProductDetailWebViewFragment : BaseFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return composeView {
-            ProductDetailWebViewScreen(viewModel)
+            ProductDetailWebViewScreen(
+                viewModel = viewModel,
+                showNavigationIcon = shouldShowNavigationIcon()
+            )
         }
     }
 
@@ -44,7 +46,6 @@ class ProductDetailWebViewFragment : BaseFragment() {
         }
     }
 
-    @SuppressLint("RestrictedApi")
     private fun navigateBack() {
         if (isInDetailPane) {
             // If we are in the detail pane of a two-pane layout, we need to handle the back navigation
@@ -54,4 +55,6 @@ class ProductDetailWebViewFragment : BaseFragment() {
             findNavController().popBackStack(R.id.productDetailFragment, true)
         }
     }
+
+    private fun shouldShowNavigationIcon(): Boolean = !isInDetailPane
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/details/webview/ProductDetailWebViewScreen.kt

@@ -3,6 +3,8 @@ package com.woocommerce.android.ui.products.details.webview
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.livedata.observeAsState
@@ -13,19 +15,24 @@ import com.woocommerce.android.ui.compose.component.web.WCWebView
 import org.wordpress.android.fluxc.network.UserAgent
 
 @Composable
-fun ProductDetailWebViewScreen(viewModel: ProductDetailWebViewViewModel) {
+fun ProductDetailWebViewScreen(
+    viewModel: ProductDetailWebViewViewModel,
+    showNavigationIcon: Boolean
+) {
     viewModel.viewState.observeAsState().value?.let {
         ProductDetailWebViewScreen(
             viewState = it,
+            showNavigationIcon = showNavigationIcon,
             webViewAuthenticator = viewModel.webViewAuthenticator,
-            userAgent = viewModel.userAgent
+            userAgent = viewModel.userAgent,
         )
     }
 }
 
 @Composable
 private fun ProductDetailWebViewScreen(
     viewState: ProductDetailWebViewViewModel.ViewState,
+    showNavigationIcon: Boolean,
     webViewAuthenticator: WebViewAuthenticator,
     userAgent: UserAgent
 ) {
@@ -35,7 +42,8 @@ private fun ProductDetailWebViewScreen(
         topBar = {
             Toolbar(
                 title = viewState.title,
-                navigationIcon = null
+                navigationIcon = if (showNavigationIcon) Icons.AutoMirrored.Default.ArrowBack else null,
+                onNavigationButtonClick = viewState.onBackClick
             )
         }
     ) {