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
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1'
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'
Expand Down
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PODS:
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- AMPopTip (0.10.0)
- AMPopTip (0.10.1)
- Automattic-Tracks-iOS (0.0.13):
- CocoaLumberjack (~> 2.2.0)
- Reachability (~> 3.1)
Expand Down Expand Up @@ -162,7 +162,7 @@ PODS:
- WordPressApi (0.3.6):
- AFNetworking (~> 2.6.0)
- wpxmlrpc (~> 0.7)
- WordPressCom-Analytics-iOS (0.1.1)
- WordPressCom-Analytics-iOS (0.1.2)
- WordPressCom-Stats-iOS (0.5.1):
- AFNetworking (~> 2.6.0)
- CocoaLumberjack (~> 2.2.0)
Expand Down Expand Up @@ -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.1)
- WordPressCom-Analytics-iOS (= 0.1.2)
- WordPressCom-Stats-iOS (= 0.5.1)
- WordPressCom-Stats-iOS/Services (= 0.5.1)
- WPMediaPicker (~> 0.7.0)
Expand Down Expand Up @@ -262,7 +262,7 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
1PasswordExtension: 9f471645d378283cb88c6d4bf502e4381a42c0ad
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
AMPopTip: 248dc337bdd4cde13878b1ac8101ff016a901792
AMPopTip: b0b5d009f3ed47b10f118438a18e0ab5cd03c40d
Automattic-Tracks-iOS: ba47c35576a07376facc7a91740fb78867831e1c
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
DTCoreText: 934a16fe9ffdd169c96261721b39dc312b75713d
Expand Down Expand Up @@ -294,7 +294,7 @@ SPEC CHECKSUMS:
WordPress-iOS-Editor: 563239f9f42f80a3ca20e61f1d5aeed58698c846
WordPress-iOS-Shared: ced218039d88c91572f3205882832f7a05c61f97
WordPressApi: 39ca2b950a95fd0bf7ae5c86c92a272fb350187b
WordPressCom-Analytics-iOS: c5fce07d0bc0e17ca5fad3b7131f63fe6b48bf86
WordPressCom-Analytics-iOS: 2ac1c37608733eb959a24b8993678289b8329b89
WordPressCom-Stats-iOS: 9346d0e9441113eca614a6a9a333216571e4adc8
WPMediaPicker: 6bbce465f5a5c071267ae28bdf31d0fd6e109721
wpxmlrpc: bd391dab54e9bdceb5d1de23d161ecf1ba80f0e0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Me/MeViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down