Merge pull request #888 from wordpress-mobile/remove-analytics-dependency

koke · web-flow · commit 5f3dea4207ff · 2017-06-29T11:15:09.000+02:00
Remove analytics
diff --git a/Classes/WPEditorStat.h b/Classes/WPEditorStat.h
@@ -0,0 +1,15 @@
+typedef NS_ENUM(NSUInteger, WPEditorStat)
+{
+    WPEditorStatTappedBlockquote,
+    WPEditorStatTappedBold,
+    WPEditorStatTappedHTML,
+    WPEditorStatTappedImage,
+    WPEditorStatTappedItalic,
+    WPEditorStatTappedLink,
+    WPEditorStatTappedMore,
+    WPEditorStatTappedOrderedList,
+    WPEditorStatTappedStrikethrough,
+    WPEditorStatTappedUnderline,
+    WPEditorStatTappedUnlink,
+    WPEditorStatTappedUnorderedList
+};
diff --git a/Classes/WPEditorViewController.h b/Classes/WPEditorViewController.h
@@ -1,6 +1,8 @@
 #import <UIKit/UIKit.h>
 #import "HRColorPickerViewController.h"
 #import "WPEditorFormatbarView.h"
+#import "WPEditorStat.h"
+
 @class WPEditorField;
 @class WPEditorView;
 @class WPEditorViewController;
@@ -23,6 +25,7 @@ WPEditorViewControllerMode;
 - (void)editorTitleDidChange:(WPEditorViewController *)editorController;
 - (void)editorTextDidChange:(WPEditorViewController *)editorController;
 - (void)editorDidPressMedia:(WPEditorViewController *)editorController;
+- (void)editorTrackStat:(WPEditorStat)stat;
 
 
 /**
diff --git a/Classes/WPEditorViewController.m b/Classes/WPEditorViewController.m
@@ -1,7 +1,6 @@
 #import "WPEditorViewController.h"
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIKit.h>
-#import <WordPressComAnalytics/WPAnalytics.h>
 
 #import "WPEditorField.h"
 #import "WPEditorToolbarButton.h"
@@ -355,7 +354,7 @@ - (void)didTouchMediaOptions
                            animated:YES
                          completion:nil];
     }
-    [WPAnalytics track:WPAnalyticsStatEditorTappedImage];
+    [self.delegate editorTrackStat:WPEditorStatTappedImage];
 }
 
 #pragma mark - Editor and Misc Methods
@@ -518,8 +517,8 @@ - (void)showHTMLSource:(UIBarButtonItem *)barButtonItem
         [self.toolbarView toolBarItemWithTag:kWPEditorViewControllerElementShowSourceBarButton
                                  setSelected:NO];
     }
-    
-    [WPAnalytics track:WPAnalyticsStatEditorTappedHTML];
+
+    [self.delegate editorTrackStat:WPEditorStatTappedHTML];
 }
 
 - (void)removeFormat
@@ -551,21 +550,21 @@ - (void)setBold
 {
     [self.editorView setBold];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedBold];
+    [self.delegate editorTrackStat:WPEditorStatTappedBold];
 }
 
 - (void)setBlockQuote
 {
     [self.editorView setBlockQuote];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedBlockquote];
+    [self.delegate editorTrackStat:WPEditorStatTappedBlockquote];
 }
 
 - (void)setItalic
 {
     [self.editorView setItalic];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedItalic];
+    [self.delegate editorTrackStat:WPEditorStatTappedItalic];
 }
 
 - (void)setSubscript
@@ -577,7 +576,7 @@ - (void)setUnderline
 {
 	[self.editorView setUnderline];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedUnderline];
+    [self.delegate editorTrackStat:WPEditorStatTappedUnderline];
 }
 
 - (void)setSuperscript
@@ -589,21 +588,21 @@ - (void)setStrikethrough
 {
     [self.editorView setStrikethrough];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedStrikethrough];
+    [self.delegate editorTrackStat:WPEditorStatTappedStrikethrough];
 }
 
 - (void)setUnorderedList
 {
     [self.editorView setUnorderedList];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedUnorderedList];
+    [self.delegate editorTrackStat:WPEditorStatTappedUnorderedList];
 }
 
 - (void)setOrderedList
 {
     [self.editorView setOrderedList];
     [self clearToolbar];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedOrderedList];
+    [self.delegate editorTrackStat:WPEditorStatTappedOrderedList];
 }
 
 - (void)setHR
@@ -699,7 +698,7 @@ - (void)linkBarButtonTapped
 	} else {
 		[self showInsertLinkDialogWithLink:self.editorView.selectedLinkURL
 									 title:[self.editorView selectedText]];
-		[WPAnalytics track:WPAnalyticsStatEditorTappedLink];
+        [self.delegate editorTrackStat:WPEditorStatTappedLink];
 	}
 }
 
@@ -823,7 +822,7 @@ - (void)updateLink:(NSString *)url
 - (void)removeLink
 {
     [self.editorView removeLink];
-    [WPAnalytics track:WPAnalyticsStatEditorTappedUnlink];
+    [self.delegate editorTrackStat:WPEditorStatTappedUnlink];
 }
 
 - (void)quickLink
diff --git a/Classes/WPLegacyEditorViewController.h b/Classes/WPLegacyEditorViewController.h
@@ -1,4 +1,5 @@
 #import <UIKit/UIKit.h>
+#import "WPEditorStat.h"
 
 @class WPLegacyEditorViewController;
 
@@ -13,6 +14,7 @@
 - (void)editorDidPressSettings:(WPLegacyEditorViewController *)editorController;
 - (void)editorDidPressMedia:(WPLegacyEditorViewController *)editorController;
 - (void)editorDidPressPreview:(WPLegacyEditorViewController *)editorController;
+- (void)editorTrackStat:(WPEditorStat)stat;
 @end
 
 @interface WPLegacyEditorViewController : UIViewController
diff --git a/Classes/WPLegacyEditorViewController.m b/Classes/WPLegacyEditorViewController.m
@@ -1,7 +1,6 @@
 #import "WPLegacyEditorViewController.h"
 #import "WPLegacyEditorFormatToolbar.h"
 #import "WPLegacyEditorFormatAction.h"
-#import <WordPressComAnalytics/WPAnalytics.h>
 
 CGFloat const WPLegacyEPVCStandardOffset = 15.0;
 CGFloat const WPLegacyEPVCTextViewOffset = 10.0;
@@ -444,28 +443,28 @@ - (void)formatToolbar:(WPLegacyEditorFormatToolbar *)formatToolbar actionPressed
 {
     switch (formatAction) {
         case WPLegacyEditorFormatActionBold:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedBold];
+            [self.delegate editorTrackStat:WPEditorStatTappedBold];
             break;
         case WPLegacyEditorFormatActionItalic:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedItalic];
+            [self.delegate editorTrackStat:WPEditorStatTappedItalic];
             break;
         case WPLegacyEditorFormatActionUnderline:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedUnderline];
+            [self.delegate editorTrackStat:WPEditorStatTappedUnderline];
             break;
         case WPLegacyEditorFormatActionDelete:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedStrikethrough];
+            [self.delegate editorTrackStat:WPEditorStatTappedStrikethrough];
             break;
         case WPLegacyEditorFormatActionLink:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedLink];
+            [self.delegate editorTrackStat:WPEditorStatTappedLink];
             break;
         case WPLegacyEditorFormatActionQuote:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedBlockquote];
+            [self.delegate editorTrackStat:WPEditorStatTappedBlockquote];
             break;
         case WPLegacyEditorFormatActionMore:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedMore];
+            [self.delegate editorTrackStat:WPEditorStatTappedMore];
             break;
         case WPLegacyEditorFormatActionMedia:
-            [WPAnalytics track:WPAnalyticsStatEditorTappedImage];
+            [self.delegate editorTrackStat:WPEditorStatTappedImage];
             break;
 
     }
diff --git a/Example/Podfile b/Example/Podfile
@@ -6,7 +6,6 @@ use_frameworks!
 target 'EditorDemo' do
   pod 'WordPress-iOS-Editor', :path => '../'
   pod 'CocoaLumberjack', '~> 3.2.0', :inhibit_warnings => true
-  pod 'WordPressCom-Analytics-iOS', '~>0.1.0', :inhibit_warnings => true
 end
 
 target 'EditorDemoTests' do
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -9,13 +9,10 @@ PODS:
   - WordPress-iOS-Editor (1.9.2):
     - CocoaLumberjack (~> 3.2.0)
     - NSObject-SafeExpectations (~> 0.0.2)
-    - WordPressCom-Analytics-iOS (~> 0.1.0)
-  - WordPressCom-Analytics-iOS (0.1.25)
 
 DEPENDENCIES:
   - CocoaLumberjack (~> 3.2.0)
   - WordPress-iOS-Editor (from `../`)
-  - WordPressCom-Analytics-iOS (~> 0.1.0)
 
 EXTERNAL SOURCES:
   WordPress-iOS-Editor:
@@ -24,9 +21,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CocoaLumberjack: 9b4aed7073d242f29cc2f62068d995faf67f703a
   NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
-  WordPress-iOS-Editor: e71fa013ac3bf8f448d0ee43421beed3f56500f0
-  WordPressCom-Analytics-iOS: ec36976259d733430ba0fc2f8a51765947d2c7ba
+  WordPress-iOS-Editor: 0965aff97450d0569e15e5bf0b5332b028198257
 
-PODFILE CHECKSUM: 9d7155cbcbabb6020cd8a669ba72e4ae0a4b1e20
+PODFILE CHECKSUM: cb6a541ba5f4aad4728b3cc32bb1c0621d6f7bfa
 
 COCOAPODS: 1.2.1
diff --git a/WordPress-iOS-Editor.podspec b/WordPress-iOS-Editor.podspec
@@ -19,7 +19,6 @@ Pod::Spec.new do |s|
   s.exclude_files = 'Classes/exclude'
   s.requires_arc = true
   s.dependency 'CocoaLumberjack', '~> 3.2.0'
-  s.dependency 'WordPressCom-Analytics-iOS', '~>0.1.0'
   s.dependency 'NSObject-SafeExpectations', '~>0.0.2'
   s.header_dir = 'WordPressEditor'
 end

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#import "WPEditorViewController.h"`
`2`	`2`	`#import <MobileCoreServices/MobileCoreServices.h>`
`3`	`3`	`#import <UIKit/UIKit.h>`
`4`		`-#import <WordPressComAnalytics/WPAnalytics.h>`
`5`	`4`
`6`	`5`	`#import "WPEditorField.h"`
`7`	`6`	`#import "WPEditorToolbarButton.h"`
`@@ -355,7 +354,7 @@ - (void)didTouchMediaOptions`
`355`	`354`	`animated:YES`
`356`	`355`	`completion:nil];`
`357`	`356`	`}`
`358`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedImage];`
	`357`	`+ [self.delegate editorTrackStat:WPEditorStatTappedImage];`
`359`	`358`	`}`
`360`	`359`
`361`	`360`	`#pragma mark - Editor and Misc Methods`
`@@ -518,8 +517,8 @@ - (void)showHTMLSource:(UIBarButtonItem *)barButtonItem`
`518`	`517`	`[self.toolbarView toolBarItemWithTag:kWPEditorViewControllerElementShowSourceBarButton`
`519`	`518`	`setSelected:NO];`
`520`	`519`	`}`
`521`		`-`
`522`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedHTML];`
	`520`	`+`
	`521`	`+ [self.delegate editorTrackStat:WPEditorStatTappedHTML];`
`523`	`522`	`}`
`524`	`523`
`525`	`524`	`- (void)removeFormat`
`@@ -551,21 +550,21 @@ - (void)setBold`
`551`	`550`	`{`
`552`	`551`	`[self.editorView setBold];`
`553`	`552`	`[self clearToolbar];`
`554`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedBold];`
	`553`	`+ [self.delegate editorTrackStat:WPEditorStatTappedBold];`
`555`	`554`	`}`
`556`	`555`
`557`	`556`	`- (void)setBlockQuote`
`558`	`557`	`{`
`559`	`558`	`[self.editorView setBlockQuote];`
`560`	`559`	`[self clearToolbar];`
`561`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedBlockquote];`
	`560`	`+ [self.delegate editorTrackStat:WPEditorStatTappedBlockquote];`
`562`	`561`	`}`
`563`	`562`
`564`	`563`	`- (void)setItalic`
`565`	`564`	`{`
`566`	`565`	`[self.editorView setItalic];`
`567`	`566`	`[self clearToolbar];`
`568`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedItalic];`
	`567`	`+ [self.delegate editorTrackStat:WPEditorStatTappedItalic];`
`569`	`568`	`}`
`570`	`569`
`571`	`570`	`- (void)setSubscript`
`@@ -577,7 +576,7 @@ - (void)setUnderline`
`577`	`576`	`{`
`578`	`577`	`[self.editorView setUnderline];`
`579`	`578`	`[self clearToolbar];`
`580`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedUnderline];`
	`579`	`+ [self.delegate editorTrackStat:WPEditorStatTappedUnderline];`
`581`	`580`	`}`
`582`	`581`
`583`	`582`	`- (void)setSuperscript`
`@@ -589,21 +588,21 @@ - (void)setStrikethrough`
`589`	`588`	`{`
`590`	`589`	`[self.editorView setStrikethrough];`
`591`	`590`	`[self clearToolbar];`
`592`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedStrikethrough];`
	`591`	`+ [self.delegate editorTrackStat:WPEditorStatTappedStrikethrough];`
`593`	`592`	`}`
`594`	`593`
`595`	`594`	`- (void)setUnorderedList`
`596`	`595`	`{`
`597`	`596`	`[self.editorView setUnorderedList];`
`598`	`597`	`[self clearToolbar];`
`599`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedUnorderedList];`
	`598`	`+ [self.delegate editorTrackStat:WPEditorStatTappedUnorderedList];`
`600`	`599`	`}`
`601`	`600`
`602`	`601`	`- (void)setOrderedList`
`603`	`602`	`{`
`604`	`603`	`[self.editorView setOrderedList];`
`605`	`604`	`[self clearToolbar];`
`606`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedOrderedList];`
	`605`	`+ [self.delegate editorTrackStat:WPEditorStatTappedOrderedList];`
`607`	`606`	`}`
`608`	`607`
`609`	`608`	`- (void)setHR`
`@@ -699,7 +698,7 @@ - (void)linkBarButtonTapped`
`699`	`698`	`} else {`
`700`	`699`	`[self showInsertLinkDialogWithLink:self.editorView.selectedLinkURL`
`701`	`700`	`title:[self.editorView selectedText]];`
`702`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedLink];`
	`701`	`+ [self.delegate editorTrackStat:WPEditorStatTappedLink];`
`703`	`702`	`}`
`704`	`703`	`}`
`705`	`704`
`@@ -823,7 +822,7 @@ - (void)updateLink:(NSString *)url`
`823`	`822`	`- (void)removeLink`
`824`	`823`	`{`
`825`	`824`	`[self.editorView removeLink];`
`826`		`- [WPAnalytics track:WPAnalyticsStatEditorTappedUnlink];`
	`825`	`+ [self.delegate editorTrackStat:WPEditorStatTappedUnlink];`
`827`	`826`	`}`
`828`	`827`
`829`	`828`	`- (void)quickLink`