organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android][ios] Added utm_content 'more' for more item in gallery

Browse source 
[android] Fixed starting bookmark catalog activity by cta pressing in single item sightseen ui
This commit is contained in:
Александр Зацепин 2019-09-18 19:02:34 +03:00 • committed by Aleksandr Zatsepin
parent 300300682d
commit 37505c16f5
5 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java
View file

@ -6,8 +6,10 @@ import android.text.TextUtils;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.gallery.ItemSelectedListener;
import com.mapswithme.maps.promo.PromoEntity;
import com.mapswithme.util.UTM;
import com.mapswithme.util.statistics.Destination;
import com.mapswithme.util.statistics.GalleryPlacement;
import com.mapswithme.util.statistics.GalleryType;
@ -32,8 +34,10 @@ public class RegularCatalogPromoListener implements ItemSelectedListener<PromoEn
if (TextUtils.isEmpty(item.getUrl()))
return;
String utmContentUrl = BookmarkManager.INSTANCE.injectCatalogUTMContent(item.getUrl(),
UTM.UTM_CONTENT_DETAILS);
BookmarksCatalogActivity.startForResult(mActivity, BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
item.getUrl());
utmContentUrl);
Statistics.INSTANCE.trackGalleryProductItemSelected(GalleryType.PROMO, mPlacement, position,
Destination.CATALOGUE);
}
@ -45,8 +49,11 @@ public class RegularCatalogPromoListener implements ItemSelectedListener<PromoEn
if (TextUtils.isEmpty(item.getUrl()))
return;
BookmarksCatalogActivity.startForResult(mActivity, BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
item.getUrl());
String utmContentUrl = BookmarkManager.INSTANCE.injectCatalogUTMContent(item.getUrl(),
UTM.UTM_CONTENT_MORE);
BookmarksCatalogActivity.startForResult(mActivity,
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
utmContentUrl);
Statistics.INSTANCE.trackGalleryEvent(Statistics.EventName.PP_SPONSOR_MORE_SELECTED,
GalleryType.PROMO,
mPlacement);
@ -55,9 +62,6 @@ public class RegularCatalogPromoListener implements ItemSelectedListener<PromoEn
@Override
public void onActionButtonSelected(@NonNull PromoEntity item, int position)
{
if (TextUtils.isEmpty(item.getUrl()))
return;
BookmarksCatalogActivity.start(mActivity, item.getUrl());
// Method not called.
}
}

11
android/src/com/mapswithme/maps/promo/CatalogPromoController.java
View file

@ -18,6 +18,7 @@ import com.mapswithme.maps.R;
import com.mapswithme.maps.base.Detachable;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.gallery.GalleryAdapter;
import com.mapswithme.maps.gallery.impl.Factory;
@ -264,16 +265,22 @@ public class CatalogPromoController implements Promo.Listener, Detachable<Activi
private void onCtaClicked(@NonNull GalleryPlacement placement, @NonNull String url)
{
BookmarksCatalogActivity.start(mPlacePageView.getContext(), url);
String utmContentUrl = BookmarkManager.INSTANCE.injectCatalogUTMContent(url,
UTM.UTM_CONTENT_VIEW);
BookmarksCatalogActivity.startForResult(requireActivity(),
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
utmContentUrl);
Statistics.INSTANCE.trackGalleryProductItemSelected(GalleryType.PROMO, placement, 0,
Destination.CATALOGUE);
}
private void onMoreDescriptionClicked(@NonNull String url)
{
String utmContentUrl = BookmarkManager.INSTANCE.injectCatalogUTMContent(url,
UTM.UTM_CONTENT_DESCRIPTION);
BookmarksCatalogActivity.startForResult(requireActivity(),
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
url);
utmContentUrl);
}
}

3
android/src/com/mapswithme/util/UTM.java
View file

@ -26,11 +26,12 @@ public class UTM
public static final int UTM_CROWN_BUTTON = 9;
@Retention(RetentionPolicy.SOURCE)
@IntDef({ UTM_CONTENT_DESCRIPTION, UTM_CONTENT_VIEW, UTM_CONTENT_DETAILS })
@IntDef({ UTM_CONTENT_DESCRIPTION, UTM_CONTENT_VIEW, UTM_CONTENT_DETAILS, UTM_CONTENT_MORE })
public @interface UTMContentType {}
// The order of these constants must correspond to C++ enumeration in partners_api/utm.hpp.
public static final int UTM_CONTENT_DESCRIPTION = 0;
public static final int UTM_CONTENT_VIEW = 1;
public static final int UTM_CONTENT_DETAILS = 2;
public static final int UTM_CONTENT_MORE = 3;
}

1
iphone/Maps/Bookmarks/Catalog/MWMUTM.h
View file

@ -16,4 +16,5 @@ typedef NS_ENUM(NSInteger, MWMUTMContent) {
MWMUTMContentDescription = 0,
MWMUTMContentView,
MWMUTMContentDetails,
MWMUTMContentMore,
};

4
partners_api/utm.hpp
View file

@ -24,6 +24,7 @@ enum class UTMContent : uint8_t
Description = 0,
View,
Details,
More,
};
inline std::string InjectUTM(std::string const & url, UTM utm)
@ -88,6 +89,9 @@ inline std::string InjectUTMContent(std::string const & url, UTMContent content)
case UTMContent::Details:
params.emplace_back("utm_content", "details");
break;
case UTMContent::More:
params.emplace_back("utm_content", "more");
break;
}
return base::url::Make(url, params);
}