Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,10 @@ class AnalyticsTracker private constructor(private val context: Context) {

private const val PREFKEY_SEND_USAGE_STATS = "wc_pref_send_usage_stats"

// -- Product details
const val VALUE_SHARE_BUTTON_SOURCE_PRODUCT_FORM = "product_form"
const val VALUE_SHARE_BUTTON_SOURCE_MORE_MENU = "more_menu"

// -- Product Variations
const val KEY_VARIATIONS_COUNT = "variations_count"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,17 @@ class ProductDetailFragment :
setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
}
}
findItem(R.id.menu_share)?.isVisible = state.shareOption
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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onCompletion
Expand Down Expand Up @@ -255,12 +254,20 @@ class ProductDetailViewModel @Inject constructor(
val showSaveOptionAsActionWithText = hasChanges && (isNotPublishedUnderCreation || !isProductUnderCreation)
val isProductPublished = productDraft.status == ProductStatus.PUBLISH
val isProductPublishedOrPrivate = isProductPublished || productDraft.status == ProductStatus.PRIVATE
val showPublishOption = !isProductPublishedOrPrivate || isProductUnderCreation
val showShareOption = !isProductUnderCreation

// Show as action with text if "Save" or "Publish" is not currently shown as action with text.
val showShareOptionAsActionWithText =
showShareOption && !showSaveOptionAsActionWithText && !showPublishOption

MenuButtonsState(
saveOption = showSaveOptionAsActionWithText,
saveAsDraftOption = canBeSavedAsDraft,
publishOption = !isProductPublishedOrPrivate || isProductUnderCreation,
publishOption = showPublishOption,
viewProductOption = isProductPublished && !isProductUnderCreation,
shareOption = !isProductUnderCreation,
shareOption = showShareOption,
showShareOptionAsActionWithText = showShareOptionAsActionWithText,
trashOption = !isProductUnderCreation && navArgs.isTrashEnabled
)
}.asLiveData()
Expand Down Expand Up @@ -362,9 +369,23 @@ class ProductDetailViewModel @Inject constructor(
* Called when the Share menu button is clicked in Product detail screen
*/
fun onShareButtonClicked() {
tracker.track(AnalyticsEvent.PRODUCT_DETAIL_SHARE_BUTTON_TAPPED)
viewState.productDraft?.let {
triggerEvent(ProductNavigationTarget.ShareProduct(it.permalink, it.name))
menuButtonsState.value?.showShareOptionAsActionWithText?.let { isShownAsActionWithText ->
val source = if (isShownAsActionWithText) {
AnalyticsTracker.VALUE_SHARE_BUTTON_SOURCE_PRODUCT_FORM
} else {
AnalyticsTracker.VALUE_SHARE_BUTTON_SOURCE_MORE_MENU
}

tracker.track(
AnalyticsEvent.PRODUCT_DETAIL_SHARE_BUTTON_TAPPED,
mapOf(
AnalyticsTracker.KEY_SOURCE to source
)
)

viewState.productDraft?.let {
triggerEvent(ProductNavigationTarget.ShareProduct(it.permalink, it.name))
}
}
}

Expand Down Expand Up @@ -2339,6 +2360,7 @@ class ProductDetailViewModel @Inject constructor(
val publishOption: Boolean,
val viewProductOption: Boolean,
val shareOption: Boolean,
val showShareOptionAsActionWithText: Boolean,
val trashOption: Boolean
)
}