From 3b40b8b599933068e779bb968388e4e03323a208 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 4 Dec 2015 16:25:10 +0100 Subject: [PATCH 1/3] Updated analytics dependency to 0.1.2 --- Podfile | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile b/Podfile index 2bf11449c403..189819b5874c 100644 --- a/Podfile +++ b/Podfile @@ -35,7 +35,7 @@ target 'WordPress', :exclusive => true do pod 'WordPress-iOS-Shared', '0.5.1' pod 'WordPress-iOS-Editor', '1.1.1' pod 'WordPressCom-Stats-iOS', '0.5.1' - pod 'WordPressCom-Analytics-iOS', '0.1.0' + pod 'WordPressCom-Analytics-iOS', '0.1.2' pod 'WordPress-AppbotX', :git => 'https://github.com/wordpress-mobile/appbotx.git', :commit => '87bae8c770cfc4e053119f2d00f76b2f653b26ce' pod 'WPMediaPicker', '~> 0.7.0' pod 'ReactiveCocoa', '~> 2.4.7' diff --git a/Podfile.lock b/Podfile.lock index ab99c8634547..a3da7af0a66f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -162,7 +162,7 @@ PODS: - WordPressApi (0.3.6): - AFNetworking (~> 2.6.0) - wpxmlrpc (~> 0.7) - - WordPressCom-Analytics-iOS (0.1.0) + - WordPressCom-Analytics-iOS (0.1.2) - WordPressCom-Stats-iOS (0.5.1): - AFNetworking (~> 2.6.0) - CocoaLumberjack (~> 2.2.0) @@ -224,7 +224,7 @@ DEPENDENCIES: - WordPress-iOS-Editor (= 1.1.1) - WordPress-iOS-Shared (= 0.5.1) - WordPressApi (from `https://github.com/wordpress-mobile/WordPress-API-iOS.git`) - - WordPressCom-Analytics-iOS (= 0.1.0) + - WordPressCom-Analytics-iOS (= 0.1.2) - WordPressCom-Stats-iOS (= 0.5.1) - WordPressCom-Stats-iOS/Services (= 0.5.1) - WPMediaPicker (~> 0.7.0) @@ -294,7 +294,7 @@ SPEC CHECKSUMS: WordPress-iOS-Editor: 563239f9f42f80a3ca20e61f1d5aeed58698c846 WordPress-iOS-Shared: ced218039d88c91572f3205882832f7a05c61f97 WordPressApi: 39ca2b950a95fd0bf7ae5c86c92a272fb350187b - WordPressCom-Analytics-iOS: 355b8c6cf1d50d64ca7667e6f9e94c989e466775 + WordPressCom-Analytics-iOS: 2ac1c37608733eb959a24b8993678289b8329b89 WordPressCom-Stats-iOS: 9346d0e9441113eca614a6a9a333216571e4adc8 WPMediaPicker: 6bbce465f5a5c071267ae28bdf31d0fd6e109721 wpxmlrpc: bd391dab54e9bdceb5d1de23d161ecf1ba80f0e0 From d45aeb21917fdcc1fcbd9decea2862dcd656dbd9 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 4 Dec 2015 16:25:32 +0100 Subject: [PATCH 2/3] Fixed analytics settings references --- .../Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m | 2 +- .../Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m | 2 +- .../Classes/ViewRelated/Blog/BlogDetailsViewController.m | 4 ++-- WordPress/Classes/ViewRelated/Me/MeViewController.m | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m index 6d6f5f089a6b..6b36add1ed3e 100644 --- a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m +++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m @@ -389,7 +389,7 @@ - (TracksEventPair *)eventPairForStat:(WPAnalyticsStat)stat eventName = @"site_menu_opened"; eventProperties = @{ TracksEventPropertyMenuItemKey : @"posts" }; break; - case WPAnalyticsStatOpenedSettings: + case WPAnalyticsStatOpenedSiteSettings: eventName = @"site_menu_opened"; eventProperties = @{ TracksEventPropertyMenuItemKey : @"settings" }; break; diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m index f7a04355f823..635a4ee19519 100644 --- a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m +++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m @@ -623,7 +623,7 @@ - (WPAnalyticsTrackerMixpanelInstructionsForStat *)instructionsForStat:(WPAnalyt case WPAnalyticsStatOpenedNotificationSettingDetails: instructions = [WPAnalyticsTrackerMixpanelInstructionsForStat mixpanelInstructionsForEventName:@"Notification Settings - Accessed Details"]; break; - case WPAnalyticsStatOpenedSettings: + case WPAnalyticsStatOpenedSiteSettings: instructions = [WPAnalyticsTrackerMixpanelInstructionsForStat mixpanelInstructionsForEventName:@"Site Menu - Opened Settings"]; break; case WPAnalyticsStatOpenedSupport: diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m index f7c425b4b38d..08895383b007 100644 --- a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m @@ -491,9 +491,9 @@ - (void)showSettingsForBlog:(Blog *)blog { NSNumber *dotComID = blog.dotComID; if(dotComID) { - [WPAnalytics track:WPAnalyticsStatOpenedSettings withProperties:@{WPAppAnalyticsKeyBlogID:dotComID}]; + [WPAnalytics track:WPAnalyticsStatOpenedSiteSettings withProperties:@{WPAppAnalyticsKeyBlogID:dotComID}]; }else { - [WPAnalytics track:WPAnalyticsStatOpenedSettings]; + [WPAnalytics track:WPAnalyticsStatOpenedSiteSettings]; } SiteSettingsViewController *controller = [[SiteSettingsViewController alloc] initWithBlog:blog]; diff --git a/WordPress/Classes/ViewRelated/Me/MeViewController.m b/WordPress/Classes/ViewRelated/Me/MeViewController.m index a30fff14ab4b..c0d8361a5157 100644 --- a/WordPress/Classes/ViewRelated/Me/MeViewController.m +++ b/WordPress/Classes/ViewRelated/Me/MeViewController.m @@ -402,7 +402,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath - (void)navigateToAccountSettings { - [WPAnalytics track:WPAnalyticsStatOpenedSettings]; + [WPAnalytics track:WPAnalyticsStatOpenedAccountSettings]; SettingsViewController *settingsViewController = [[SettingsViewController alloc] init]; [self.navigationController pushViewController:settingsViewController animated:YES]; From df1705e38cf7622eb00614d9f72bebf6e8a8145e Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 4 Dec 2015 17:01:12 +0100 Subject: [PATCH 3/3] Added event handlers for Tracks/Mixpanel --- .../Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m | 6 ++++++ .../Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m index ac4cba6dec34..a810783a4b93 100644 --- a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m +++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m @@ -660,6 +660,12 @@ - (TracksEventPair *)eventPairForStat:(WPAnalyticsStat)stat case WPAnalyticsStatTwoFactorSentSMS: eventName = @"two_factor_sent_sms"; break; + case WPAnalyticsStatOpenedAccountSettings: + eventName = @"account_settings_opened"; + break; + case WPAnalyticsStatOpenedMyProfile: + eventName = @"my_profile_opened"; + break; case WPAnalyticsStatDefaultAccountChanged: case WPAnalyticsStatNoStat: case WPAnalyticsStatPerformedCoreDataMigrationFixFor45: diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m index c28ce3e67edf..a6abbcae3105 100644 --- a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m +++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerMixpanel.m @@ -841,6 +841,12 @@ - (WPAnalyticsTrackerMixpanelInstructionsForStat *)instructionsForStat:(WPAnalyt case WPAnalyticsStatShortcutNotifications: instructions = [WPAnalyticsTrackerMixpanelInstructionsForStat mixpanelInstructionsForEventName:@"3D Touch Shortcut - Notifications"]; break; + case WPAnalyticsStatOpenedAccountSettings: + instructions = [WPAnalyticsTrackerMixpanelInstructionsForStat mixpanelInstructionsForEventName:@"Me - Opened Account Settings"]; + break; + case WPAnalyticsStatOpenedMyProfile: + instructions = [WPAnalyticsTrackerMixpanelInstructionsForStat mixpanelInstructionsForEventName:@"Me - Opened My Profile"]; + break; case WPAnalyticsStatAppUpgraded: case WPAnalyticsStatDefaultAccountChanged: case WPAnalyticsStatLogSpecialCondition: