Skip to content

Commit

Permalink
Merge pull request woocommerce#10866 from woocommerce/10843-better-ta…
Browse files Browse the repository at this point in the history 
…blet-products-adapt-toolbar-for-the-2-pane-layout-on-the-details-part

[Better Tablet Products] Adapt toolbar for the 2 pane layout on the details part
  • Loading branch information
@samiuelson
samiuelson authored Feb 26, 2024
2 parents 9522db3 + f79a07b commit 26d3ff6
Show file tree
Hide file tree
Showing 7 changed files with 239 additions and 162 deletions.
15 changes: 12 additions & 3 deletions ...rc/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/SingleProductScreen.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.woocommerce.android.e2e.screens.products

import android.content.res.Configuration
import androidx.test.espresso.Espresso
import androidx.test.espresso.assertion.ViewAssertions
import androidx.test.espresso.matcher.ViewMatchers
Expand All @@ -14,16 +15,24 @@ class SingleProductScreen : Screen {
constructor() : super(R.id.productDetail_root)

fun goBackToProductsScreen(): ProductListScreen {
pressBack()
waitForElementToBeDisplayed(R.id.productsRecycler)
// pressBack() only needed if device is not a tablet,
// on a tablet, products list and product information are on the same screen
val isTablet = InstrumentationRegistry.getInstrumentation().targetContext
.resources
.configuration
.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK >= Configuration.SCREENLAYOUT_SIZE_LARGE
if (!isTablet) {
pressBack()
waitForElementToBeDisplayed(R.id.productsRecycler)
}
return ProductListScreen()
}

fun assertSingleProductScreen(product: ProductData): SingleProductScreen {
// Navigation bar:
Espresso.onView(
Matchers.allOf(
ViewMatchers.withId(R.id.toolbar),
ViewMatchers.withId(R.id.productDetailToolbar),
ViewMatchers.withChild(ViewMatchers.withText(product.name))
)
)
Expand Down
151 changes: 10 additions & 141 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductDetailFragment.kt
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
package com.woocommerce.android.ui.products

import android.annotation.SuppressLint
import android.graphics.Color
import android.os.Bundle
import android.os.Parcelable
import android.text.SpannableString
import android.text.style.ForegroundColorSpan
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import androidx.annotation.IdRes
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import androidx.core.view.MenuProvider
import androidx.core.view.ViewCompat
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
Expand Down Expand Up @@ -54,7 +45,6 @@ import com.woocommerce.android.ui.main.AppBarStatus
import com.woocommerce.android.ui.main.MainNavigationRouter
import com.woocommerce.android.ui.products.AIProductDescriptionBottomSheetFragment.Companion.KEY_AI_GENERATED_DESCRIPTION_RESULT
import com.woocommerce.android.ui.products.ProductDetailViewModel.HideImageUploadErrorSnackbar
import com.woocommerce.android.ui.products.ProductDetailViewModel.MenuButtonsState
import com.woocommerce.android.ui.products.ProductDetailViewModel.NavigateToBlazeWebView
import com.woocommerce.android.ui.products.ProductDetailViewModel.OpenProductDetails
import com.woocommerce.android.ui.products.ProductDetailViewModel.RefreshMenu
Expand Down Expand Up @@ -90,14 +80,12 @@ import com.woocommerce.android.widgets.WCProductImageGalleryView.OnGalleryImageI
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import kotlinx.parcelize.Parcelize
import org.wordpress.android.util.ActivityUtils
import javax.inject.Inject

@AndroidEntryPoint
class ProductDetailFragment :
BaseProductFragment(R.layout.fragment_product_detail),
OnGalleryImageInteractionListener,
MenuProvider {
OnGalleryImageInteractionListener {
companion object {
private const val LIST_STATE_KEY = "list_state"

Expand All @@ -109,39 +97,28 @@ class ProductDetailFragment :
private var productName = ""
set(value) {
field = value
updateActivityTitle()
toolbarHelper.updateTitle(value)
}

private var productId: Long = ProductDetailViewModel.DEFAULT_ADD_NEW_PRODUCT_ID

@Inject
lateinit var blazeCampaignCreationDispatcher: BlazeCampaignCreationDispatcher

@Inject
lateinit var toolbarHelper: ProductDetailsToolbarHelper

private val skeletonView = SkeletonView()

private var progressDialog: CustomProgressDialog? = null
private var layoutManager: LayoutManager? = null
private var menu: Menu? = null
private var imageUploadErrorsSnackbar: Snackbar? = null

private var _binding: FragmentProductDetailBinding? = null
private val binding get() = _binding!!

override val activityAppBarStatus: AppBarStatus
get() {
val navigationIcon = if (findNavController().hasBackStackEntry(R.id.products)) {
R.drawable.ic_back_24dp
} else {
R.drawable.ic_gridicons_cross_24dp
}
return AppBarStatus.Visible(
navigationIcon = navigationIcon
)
}

private fun NavController.hasBackStackEntry(@IdRes destinationId: Int) = runCatching {
getBackStackEntry(destinationId)
}.isSuccess
get() = AppBarStatus.Hidden

@Inject lateinit var crashLogging: CrashLogging

Expand All @@ -164,7 +141,8 @@ class ProductDetailFragment :
blazeCampaignCreationDispatcher.attachFragment(this, BlazeFlowSource.PRODUCT_DETAIL_PROMOTE_BUTTON)

_binding = FragmentProductDetailBinding.bind(view)
requireActivity().addMenuProvider(this, viewLifecycleOwner)

toolbarHelper.onViewCreated(this, viewModel, binding)

ViewCompat.setTransitionName(
binding.root,
Expand Down Expand Up @@ -342,18 +320,14 @@ class ProductDetailFragment :
}

observeEvents(viewModel)

viewModel.menuButtonsState.observe(viewLifecycleOwner) {
menu?.updateOptions(it)
}
}

@Suppress("ComplexMethod")
private fun observeEvents(viewModel: ProductDetailViewModel) {
viewModel.event.observe(viewLifecycleOwner) { event ->
when (event) {
is LaunchUrlInChromeTab -> ChromeCustomTabUtils.launchUrl(requireContext(), event.url)
is RefreshMenu -> activity?.invalidateOptionsMenu()
is RefreshMenu -> toolbarHelper.setupToolbar()
is ExitWithResult<*> -> {
navigateBackWithResult(
KEY_PRODUCT_DETAIL_RESULT,
Expand Down Expand Up @@ -462,7 +436,7 @@ class ProductDetailFragment :
)
}

requireActivity().invalidateOptionsMenu()
toolbarHelper.setupToolbar()
}

private fun updateProductNameFromDetails(product: Product): String {
Expand Down Expand Up @@ -496,85 +470,6 @@ class ProductDetailFragment :
}
}

override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
menu.clear()
inflater.inflate(R.menu.menu_product_detail_fragment, menu)
}

@SuppressLint("ResourceAsColor")
override fun onPrepareMenu(menu: Menu) {
// change the font color of the trash menu item to red, and only show it if it should be enabled
with(menu.findItem(R.id.menu_trash_product)) {
if (this == null) return@with
val title = SpannableString(this.title)
title.setSpan(
ForegroundColorSpan(
ContextCompat.getColor(
requireContext(),
R.color.woo_red_30
)
),
0,
title.length,
0
)
this.title = title
}

this.menu = menu
viewModel.menuButtonsState.value?.let {
menu.updateOptions(it)
}
}

override fun onMenuItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.menu_publish -> {
ActivityUtils.hideKeyboard(activity)
viewModel.onPublishButtonClicked()
true
}

R.id.menu_save_as_draft -> {
viewModel.onSaveAsDraftButtonClicked()
true
}

R.id.menu_share -> {
viewModel.onShareButtonClicked()
true
}

R.id.menu_save -> {
ActivityUtils.hideKeyboard(activity)
viewModel.onSaveButtonClicked()
true
}

R.id.menu_view_product -> {
viewModel.onViewProductOnStoreLinkClicked()
true
}

R.id.menu_product_settings -> {
viewModel.onSettingsButtonClicked()
true
}

R.id.menu_duplicate -> {
viewModel.onDuplicateProduct()
true
}

R.id.menu_trash_product -> {
viewModel.onTrashButtonClicked()
true
}

else -> false
}
}

private fun showSkeleton(show: Boolean) {
if (show) {
skeletonView.show(binding.appBarLayout, R.layout.skeleton_product_detail, delayed = true)
Expand Down Expand Up @@ -654,32 +549,6 @@ class ProductDetailFragment :
viewModel.onAddImageButtonClicked()
}

private fun Menu.updateOptions(state: MenuButtonsState) {
findItem(R.id.menu_save)?.isVisible = state.saveOption
findItem(R.id.menu_save_as_draft)?.isVisible = state.saveAsDraftOption
findItem(R.id.menu_view_product)?.isVisible = state.viewProductOption
findItem(R.id.menu_publish)?.apply {
isVisible = state.publishOption
if (state.saveOption) {
setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER)
} else {
setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
}
}
findItem(R.id.menu_share)?.apply {
isVisible = state.shareOption

setShowAsActionFlags(
if (state.showShareOptionAsActionWithText) {
MenuItem.SHOW_AS_ACTION_IF_ROOM
} else {
MenuItem.SHOW_AS_ACTION_NEVER
}
)
}
findItem(R.id.menu_trash_product)?.isVisible = state.trashOption
}

override fun getFragmentTitle(): String = productName

@Parcelize
Expand Down
Loading

0 comments on commit 26d3ff6

Please sign in to comment.