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 @@ -159,5 +159,18 @@ object AnalyticsConstants {
const val FILTER_ATM_APPLY_ACTION = "explore_filter_atm_apply_action"
const val FILTER_ATM_CANCEL_ACTION = "explore_filter_atm_cancel_action"
const val FILTER_ATM_SWIPE_ACTION = "explore_filter_atm_swipe_action"

const val MERCHANT_DETAILS_SHOW_ALL_LOCATIONS = "explore_merchant_details_go_to_all"
const val MERCHANT_DETAILS_NAVIGATION = "explore_merchant_details_navigation"
const val MERCHANT_DETAILS_DIAL_PHONE_CALL = "explore_merchant_details_dial_phone"
const val MERCHANT_DETAILS_OPEN_WEBSITE = "explore_merchant_details_open_website"
const val MERCHANT_DETAILS_BUY_GIFT_CARD = "explore_merchant_details_buy_gift_card"
const val MERCHANT_DETAILS_BACK_FROM_ALL_LOCATIONS = "explore_merchant_details_back_from_all"
const val MERCHANT_DETAILS_BACK_TOP = "explore_merchant_details_back_top"
const val MERCHANT_DETAILS_BACK_BOTTOM = "explore_merchant_details_back_bottom"
const val MERCHANT_DETAILS_PAY_WITH_DASH = "explore_merchant_details_pay_with_dash"
const val MERCHANT_DETAILS_SCROLL_UP = "explore_merchant_details_scroll_up"


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import com.google.maps.android.collections.MarkerManager
import com.google.maps.android.ktx.awaitMap
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.*
import org.dash.wallet.common.services.analytics.AnalyticsConstants
import org.dash.wallet.features.exploredash.R
import org.dash.wallet.features.exploredash.data.model.MerchantType
import org.dash.wallet.features.exploredash.data.model.SearchResult
Expand Down Expand Up @@ -227,7 +228,11 @@ class ExploreMapFragment : SupportMapFragment() {
if (isGooglePlayServicesAvailable()) {
markerCollection = MarkerManager(googleMap).newCollection()
markerCollection?.setOnMarkerClickListener { marker ->
viewModel.triggerMarkerClickEvent()
if (viewModel.exploreTopic == ExploreTopic.Merchants){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.SELECT_MERCHANT_MARKER)
} else {
viewModel.trackEvent(AnalyticsConstants.ExploreDash.SELECT_ATM_MARKER)
}
viewModel.onMapMarkerSelected(marker.tag as Int)
true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -712,16 +712,16 @@ class ExploreViewModel @Inject constructor(
when {
hasZoomLevelChanged(currentZoomLevel) -> {
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.ZOOM_MERCHANT_MAP, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.ZOOM_MERCHANT_MAP)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.ZOOM_ATM_MAP, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.ZOOM_ATM_MAP)
}
}
hasCameraCenterChanged(currentGeoBounds) -> {
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.PAN_MERCHANT_MAP, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.PAN_MERCHANT_MAP)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.PAN_ATM_MAP, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.PAN_ATM_MAP)
}
}
}
Expand All @@ -732,62 +732,54 @@ class ExploreViewModel @Inject constructor(
private fun hasCameraCenterChanged(currentCenterPosition: GeoBounds): Boolean =
locationProvider.distanceBetweenCenters(previousCameraGeoBounds, currentCenterPosition) != 0.0

fun triggerMarkerClickEvent(){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.SELECT_MERCHANT_MARKER, bundleOf())
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.SELECT_ATM_MARKER, bundleOf())
}
}

fun trackFilterEvents(
dashPaymentOn: Boolean,
giftCardPaymentOn: Boolean) {
if (dashPaymentOn){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SELECT_DASH, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SELECT_DASH)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SELECT_DASH, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SELECT_DASH)
}
}

if (giftCardPaymentOn){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SELECT_GIFT_CARD, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SELECT_GIFT_CARD)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SELECT_GIFT_CARD, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SELECT_GIFT_CARD)
}
}

if (sortByDistance == ExploreViewModel.DEFAULT_SORT_BY_DISTANCE){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SORT_BY_DISTANCE, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SORT_BY_DISTANCE)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SORT_BY_DISTANCE, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SORT_BY_DISTANCE)
}
} else {
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SORT_BY_NAME, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SORT_BY_NAME)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SORT_BY_NAME, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SORT_BY_NAME)
}
}

if ( _selectedTerritory.value.isEmpty()){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_CURRENT_LOCATION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_CURRENT_LOCATION)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_CURRENT_LOCATION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_CURRENT_LOCATION)
}
} else {
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SELECTED_LOCATION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SELECTED_LOCATION)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SELECTED_LOCATION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SELECTED_LOCATION)
}
}

analyticsService.logEvent(
trackEvent(
when(_selectedRadiusOption.value){
1 -> {
if (exploreTopic == ExploreTopic.Merchants) AnalyticsConstants.ExploreDash.FILTER_MERCHANT_ONE_MILE
Expand All @@ -805,43 +797,47 @@ class ExploreViewModel @Inject constructor(
if (exploreTopic == ExploreTopic.Merchants) AnalyticsConstants.ExploreDash.FILTER_MERCHANT_TWENTY_MILE
else AnalyticsConstants.ExploreDash.FILTER_ATM_TWENTY_MILE
}
}, bundleOf()
}
)

if (_isLocationEnabled.value == true){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_LOCATION_ALLOWED, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_LOCATION_ALLOWED)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_LOCATION_ALLOWED, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_LOCATION_ALLOWED)
}
} else {
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_LOCATION_DENIED, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_LOCATION_DENIED)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_LOCATION_DENIED, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_LOCATION_DENIED)
}
}

if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_APPLY_ACTION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_APPLY_ACTION)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_APPLY_ACTION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_APPLY_ACTION)
}
}

fun trackDismissEvent() {
if (isDialogDismissedOnCancel){
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_CANCEL_ACTION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_CANCEL_ACTION)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_CANCEL_ACTION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_CANCEL_ACTION)
}
} else {
if (exploreTopic == ExploreTopic.Merchants){
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SWIPE_ACTION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_MERCHANT_SWIPE_ACTION)
} else {
analyticsService.logEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SWIPE_ACTION, bundleOf())
trackEvent(AnalyticsConstants.ExploreDash.FILTER_ATM_SWIPE_ACTION)
}
}
}

fun trackEvent(event: String){
analyticsService.logEvent(event, bundleOf())
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it need to be a separate method for each event? Perhaps a trackEvent(name: String) method is sufficient, with the caller deciding which event name constant to provide.

Otherwise, half of the viewModel will consist of these methods.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Syn-McJ I set up a function to handle tracking in vm
please check it out !

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ClaudeHangui looks great!

}
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,14 @@ import java.util.*
class ItemDetails(context: Context, attrs: AttributeSet): LinearLayout(context, attrs) {
private val binding = ItemDetailsViewBinding.inflate(LayoutInflater.from(context), this)

private var onSendDashClicked: (() -> Unit)? = null
private var onSendDashClicked: ((isPayingWithDash: Boolean) -> Unit)? = null

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are required to track only when the Pay with Dash button is clicked

private var onReceiveDashClicked: (() -> Unit)? = null
private var onShowAllLocationsClicked: (() -> Unit)? = null
private var onBackButtonClicked: (() -> Unit)? = null
private var onNavigationButtonClicked: (() -> Unit)? = null
private var onDialPhoneButtonClicked: (() -> Unit)? = null
private var onOpenWebsiteButtonClicked: (() -> Unit)? = null
private var onBuyGiftCardButtonClicked: (() -> Unit)? = null

init {
orientation = VERTICAL
Expand All @@ -60,7 +64,7 @@ class ItemDetails(context: Context, attrs: AttributeSet): LinearLayout(context,
}
}

fun setOnSendDashClicked(listener: () -> Unit) {
fun setOnSendDashClicked(listener: (Boolean) -> Unit) {
onSendDashClicked = listener
}

Expand All @@ -76,6 +80,22 @@ class ItemDetails(context: Context, attrs: AttributeSet): LinearLayout(context,
onBackButtonClicked = listener
}

fun setOnNavigationButtonClicked(listener: () -> Unit) {
onNavigationButtonClicked = listener
}

fun setOnDialPhoneButtonClicked(listener: () -> Unit) {
onDialPhoneButtonClicked = listener
}

fun setOnOpenWebsiteButtonClicked(listener: () -> Unit) {
onOpenWebsiteButtonClicked = listener
}

fun setOnBuyGiftCardButtonClicked(listener: () -> Unit) {
onBuyGiftCardButtonClicked = listener
}

fun getMerchantType(type: String?): String {
return when (cleanMerchantTypeValue(type)) {
MerchantType.ONLINE -> resources.getString(R.string.explore_online_merchant)
Expand All @@ -102,18 +122,21 @@ class ItemDetails(context: Context, attrs: AttributeSet): LinearLayout(context,
linkBtn.isVisible = !item.website.isNullOrEmpty()
linkBtn.setOnClickListener {
openWebsite(item.website!!)
onOpenWebsiteButtonClicked?.invoke()
}

directionBtn.isVisible = !isOnline &&
((item.latitude != null && item.longitude != null) ||
!item.googleMaps.isNullOrBlank())
directionBtn.setOnClickListener {
openMaps(item)
onNavigationButtonClicked?.invoke()
}

callBtn.isVisible = !isOnline && !item.phone.isNullOrEmpty()
callBtn.setOnClickListener {
dialPhone(item.phone!!)
onDialPhoneButtonClicked?.invoke()
}
}
}
Expand Down Expand Up @@ -142,11 +165,14 @@ class ItemDetails(context: Context, attrs: AttributeSet): LinearLayout(context,
if (isDash) {
payBtn.isVisible = true
payBtn.text = context.getText(R.string.explore_pay_with_dash)
payBtn.setOnClickListener { onSendDashClicked?.invoke() }
payBtn.setOnClickListener { onSendDashClicked?.invoke(true) }
} else {
payBtn.isVisible = !merchant.deeplink.isNullOrBlank()
payBtn.text = context.getText(R.string.explore_buy_gift_card)
payBtn.setOnClickListener { openDeeplink(merchant.deeplink!!) }
payBtn.setOnClickListener {
openDeeplink(merchant.deeplink!!)
onBuyGiftCardButtonClicked?.invoke()
}
}

showAllBtn.setOnClickListener { onShowAllLocationsClicked?.invoke() }
Expand Down Expand Up @@ -177,7 +203,7 @@ class ItemDetails(context: Context, attrs: AttributeSet): LinearLayout(context,
showAllBtn.isVisible = false
backButton.isVisible = false

sellBtn.setOnClickListener { onSendDashClicked?.invoke() }
sellBtn.setOnClickListener { onSendDashClicked?.invoke(false) }
buyBtn.setOnClickListener { onReceiveDashClicked?.invoke() }

buyBtn.isVisible = atm.type != AtmType.SELL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,9 @@ class SearchFragment : Fragment(R.layout.fragment_search) {

binding.upButton.setOnClickListener {
binding.searchResults.scrollToPosition(0)
if (isMerchant()){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_SCROLL_UP)
}
}

binding.resetFiltersBtn.setOnClickListener {
Expand Down Expand Up @@ -453,13 +456,22 @@ class SearchFragment : Fragment(R.layout.fragment_search) {
}

private fun setupItemDetails() {
binding.itemDetails.setOnSendDashClicked { viewModel.sendDash() }
binding.itemDetails.setOnSendDashClicked { isPayingWithDash ->
if (isPayingWithDash){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_PAY_WITH_DASH)
}
viewModel.sendDash()
}
binding.itemDetails.setOnReceiveDashClicked { viewModel.receiveDash() }
binding.itemDetails.setOnBackButtonClicked { viewModel.backFromMerchantLocation() }
binding.itemDetails.setOnBackButtonClicked {
viewModel.backFromMerchantLocation()
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_BACK_FROM_ALL_LOCATIONS)
}
binding.itemDetails.setOnShowAllLocationsClicked {
viewModel.selectedItem.value?.let { merchant ->
if (merchant is Merchant && merchant.merchantId != null && !merchant.source.isNullOrEmpty()) {
viewModel.openAllMerchantLocations(merchant.merchantId!!, merchant.source!!)
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_SHOW_ALL_LOCATIONS)
}
}
}
Expand All @@ -472,6 +484,22 @@ class SearchFragment : Fragment(R.layout.fragment_search) {
binding.toolbarTitle.text = getToolbarTitle()
}
}
binding.itemDetails.setOnNavigationButtonClicked {
if (isMerchant()){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_NAVIGATION)
}
}
binding.itemDetails.setOnDialPhoneButtonClicked {
if (isMerchant()){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_DIAL_PHONE_CALL)
}
}
binding.itemDetails.setOnOpenWebsiteButtonClicked {
if (isMerchant()){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_OPEN_WEBSITE)
}
}
binding.itemDetails.setOnBuyGiftCardButtonClicked { viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_BUY_GIFT_CARD) }
}

private fun setupScreenTransitions() {
Expand Down Expand Up @@ -537,13 +565,19 @@ class SearchFragment : Fragment(R.layout.fragment_search) {

binding.toolbar.setNavigationOnClickListener {
hardBackAction.invoke()
if (isMerchant()){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_BACK_TOP)
}
}

requireActivity().onBackPressedDispatcher.addCallback(
viewLifecycleOwner,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
hardBackAction.invoke()
if (isMerchant()){
viewModel.trackEvent(AnalyticsConstants.ExploreDash.MERCHANT_DETAILS_BACK_BOTTOM)
}
}
})
}
Expand Down Expand Up @@ -810,4 +844,6 @@ class SearchFragment : Fragment(R.layout.fragment_search) {
else -> BottomSheetBehavior.STATE_EXPANDED
}
}

private fun isMerchant(): Boolean = args.type == ExploreTopic.Merchants
}