From 08c9981e5f8efc140b95a3498eea9906f6d38ade Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Fri, 31 Mar 2017 15:48:15 +0300 Subject: [PATCH 1/3] Make my site header tappable to view site --- .../java/org/wordpress/android/ui/main/MySiteFragment.java | 7 +++++++ WordPress/src/main/res/layout/my_site_fragment.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java index 9b19cab87f3e..2254c81f2407 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java @@ -153,6 +153,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, mFabView.setVisibility(View.INVISIBLE); } + rootView.findViewById(R.id.card_view).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite()); + } + }); + mFabView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index bcce2ae114a8..2fdf98e4bba0 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -17,6 +17,7 @@ android:orientation="vertical"> Date: Fri, 31 Mar 2017 15:51:16 +0300 Subject: [PATCH 2/3] Adds OPENED_VIEW_SITE_FROM_HEADER analytics event --- .../org/wordpress/android/analytics/AnalyticsTracker.java | 1 + .../android/analytics/AnalyticsTrackerMixpanel.java | 4 ++++ .../wordpress/android/analytics/AnalyticsTrackerNosara.java | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index ebe824a178a2..51a6abc6d754 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -142,6 +142,7 @@ public enum Stat { OPENED_PAGES, OPENED_COMMENTS, OPENED_VIEW_SITE, + OPENED_VIEW_SITE_FROM_HEADER, OPENED_VIEW_ADMIN, OPENED_MEDIA_LIBRARY, OPENED_BLOG_SETTINGS, diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java index da2bdd382a5a..53e0099e2e04 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java @@ -789,6 +789,10 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat( instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Site Menu - Opened View Site"); break; + case OPENED_VIEW_SITE_FROM_HEADER: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("Site Menu - Opened View Site From Header"); + break; case OPENED_VIEW_ADMIN: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Site Menu - Opened View Admin"); diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index 6017bf594804..c6aa6bd0526b 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -109,6 +109,9 @@ public void track(AnalyticsTracker.Stat stat, Map properties) { case OPENED_VIEW_SITE: predefinedEventProperties.put("menu_item", "view_site"); break; + case OPENED_VIEW_SITE_FROM_HEADER: + predefinedEventProperties.put("menu_item", "view_site_from_header"); + break; case OPENED_VIEW_ADMIN: predefinedEventProperties.put("menu_item", "view_admin"); break; @@ -434,6 +437,8 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) { return "site_menu_opened"; case OPENED_VIEW_SITE: return "site_menu_opened"; + case OPENED_VIEW_SITE_FROM_HEADER: + return "site_menu_opened"; case OPENED_VIEW_ADMIN: return "site_menu_opened"; case OPENED_MEDIA_LIBRARY: From dc89783db3f5f901ba4f0f822bc59a407a1c1ac6 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Fri, 31 Mar 2017 15:55:17 +0300 Subject: [PATCH 3/3] Track viewed sites evens separately for header --- .../java/org/wordpress/android/ui/ActivityLauncher.java | 6 ++++-- .../java/org/wordpress/android/ui/main/MySiteFragment.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java index d5d5707c788b..7b7012e7f8ad 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java @@ -133,13 +133,15 @@ public static void viewBlogSettingsForResult(Activity activity, SiteModel site) AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_BLOG_SETTINGS, site); } - public static void viewCurrentSite(Context context, SiteModel site) { + public static void viewCurrentSite(Context context, SiteModel site, boolean openFromHeader) { if (site == null) { Toast.makeText(context, context.getText(R.string.blog_not_found), Toast.LENGTH_SHORT).show(); return; } - AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_VIEW_SITE, site); + AnalyticsTracker.Stat stat = openFromHeader ? AnalyticsTracker.Stat.OPENED_VIEW_SITE_FROM_HEADER + : AnalyticsTracker.Stat.OPENED_VIEW_SITE; + AnalyticsUtils.trackWithSiteDetails(stat, site); openUrlExternal(context, site.getUrl()); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java index 2254c81f2407..da877cb7e4c2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java @@ -156,7 +156,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, rootView.findViewById(R.id.card_view).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite()); + ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite(), true); } }); @@ -177,7 +177,7 @@ public void onClick(View v) { rootView.findViewById(R.id.row_view_site).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite()); + ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite(), false); } });