From 2b1d71658a1db46b813ae64f543bcec8e0fbe28b Mon Sep 17 00:00:00 2001
From: James Greenhill <jams@uber.com>
Date: Thu, 25 Jun 2020 15:52:21 -0700
Subject: [PATCH] further cleanups with capture method

---
 .../posthog_flutter/PosthogFlutterPlugin.java | 14 +++++------
 example/lib/main.dart                         |  8 +++----
 example/web/index.html                        |  2 +-
 ios/Classes/PosthogFlutterPlugin.m            |  6 ++---
 lib/src/posthog.dart                          | 20 ++++------------
 lib/src/posthog_method_channel.dart           | 24 ++++---------------
 lib/src/posthog_platform_interface.dart       | 14 +++--------
 lib/src/posthog_web.dart                      |  2 +-
 8 files changed, 27 insertions(+), 63 deletions(-)

diff --git a/android/src/main/java/com/posthog/posthog_flutter/PosthogFlutterPlugin.java b/android/src/main/java/com/posthog/posthog_flutter/PosthogFlutterPlugin.java
index cc6938d..90ba5ff 100644
--- a/android/src/main/java/com/posthog/posthog_flutter/PosthogFlutterPlugin.java
+++ b/android/src/main/java/com/posthog/posthog_flutter/PosthogFlutterPlugin.java
@@ -59,11 +59,11 @@ private void setupChannels(Context applicationContext, BinaryMessenger messenger
 
       String writeKey = bundle.getString("com.posthog.posthog.API_KEY");
       String posthogHost = bundle.getString("com.posthog.posthog.POSTHOG_HOST");
-      Boolean trackApplicationLifecycleEvents = bundle.getBoolean("com.posthog.posthog.TRACK_APPLICATION_LIFECYCLE_EVENTS");
+      Boolean captureApplicationLifecycleEvents = bundle.getBoolean("com.posthog.posthog.TRACK_APPLICATION_LIFECYCLE_EVENTS");
       Boolean debug = bundle.getBoolean("com.posthog.posthog.DEBUG", false);
 
       PostHog.Builder analyticsBuilder = new PostHog.Builder(applicationContext, writeKey, posthogHost);
-      if (trackApplicationLifecycleEvents) {
+      if (captureApplicationLifecycleEvents) {
         // Enable this to record certain application events automatically
         analyticsBuilder.captureApplicationLifecycleEvents();
       }
@@ -121,8 +121,8 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) { }
   public void onMethodCall(MethodCall call, Result result) {
     if(call.method.equals("identify")) {
       this.identify(call, result);
-    } else if (call.method.equals("track")) {
-      this.track(call, result);
+    } else if (call.method.equals("capture")) {
+      this.capture(call, result);
     } else if (call.method.equals("screen")) {
       this.screen(call, result);
     } else if (call.method.equals("alias")) {
@@ -171,19 +171,19 @@ private void callIdentify(
     PostHog.with(this.applicationContext).identify(userId, properties, options);
   }
 
-  private void track(MethodCall call, Result result) {
+  private void capture(MethodCall call, Result result) {
     try {
       String eventName = call.argument("eventName");
       HashMap<String, Object> propertiesData = call.argument("properties");
       HashMap<String, Object> options = call.argument("options");
-      this.callTrack(eventName, propertiesData, options);
+      this.callCapture(eventName, propertiesData, options);
       result.success(true);
     } catch (Exception e) {
       result.error("PosthogFlutterException", e.getLocalizedMessage(), null);
     }
   }
 
-  private void callTrack(
+  private void callCapture(
     String eventName,
     HashMap<String, Object> propertiesData,
     HashMap<String, Object> optionsData
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 1792567..d48b20b 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -46,9 +46,9 @@ class MyApp extends StatelessWidget {
             Spacer(),
             Center(
               child: FlatButton(
-                child: Text('TRACK ACTION WITH POSTHOG'),
+                child: Text('CAPTURE ACTION WITH POSTHOG'),
                 onPressed: () {
-                  Posthog.track(
+                  Posthog.capture(
                     eventName: 'ButtonClicked',
                     properties: {
                       'foo': 'bar',
@@ -83,7 +83,7 @@ class MyApp extends StatelessWidget {
                 child: Text('Disable'),
                 onPressed: () async {
                   await Posthog.disable();
-                  Posthog.track(eventName: 'This event will not be logged');
+                  Posthog.capture(eventName: 'This event will not be logged');
                 },
               ),
             ),
@@ -93,7 +93,7 @@ class MyApp extends StatelessWidget {
                 child: Text('Enable'),
                 onPressed: () async {
                   await Posthog.enable();
-                  Posthog.track(eventName: 'Enabled tracking events!');
+                  Posthog.capture(eventName: 'Enabled capturing events!');
                 },
               ),
             ),
diff --git a/example/web/index.html b/example/web/index.html
index 983fddb..dc6c217 100644
--- a/example/web/index.html
+++ b/example/web/index.html
@@ -10,7 +10,7 @@
   <script>
     !function () {
       var analytics = window.analytics = window.analytics || []; if (!analytics.initialize) if (analytics.invoked) window.console && console.error && console.error("Posthog snippet included twice."); else {
-        analytics.invoked = !0; analytics.methods = ["trackSubmit", "trackClick", "trackLink", "trackForm", "pageview", "identify", "reset", "group", "track", "ready", "alias", "debug", "page", "once", "off", "on"]; analytics.factory = function (t) { return function () { var e = Array.prototype.slice.call(arguments); e.unshift(t); analytics.push(e); return analytics } }; for (var t = 0; t < analytics.methods.length; t++) { var e = analytics.methods[t]; analytics[e] = analytics.factory(e) } analytics.load = function (t, e) { var n = document.createElement("script"); n.type = "text/javascript"; n.async = !0; n.src = "https://cdn.posthog.com/analytics.js/v1/" + t + "/analytics.min.js"; var a = document.getElementsByTagName("script")[0]; a.parentNode.insertBefore(n, a); analytics._loadOptions = e }; analytics.SNIPPET_VERSION = "4.1.0";
+        analytics.invoked = !0; analytics.methods = ["captureSubmit", "captureClick", "captureLink", "captureForm", "pageview", "identify", "reset", "group", "capture", "ready", "alias", "debug", "page", "once", "off", "on"]; analytics.factory = function (t) { return function () { var e = Array.prototype.slice.call(arguments); e.unshift(t); analytics.push(e); return analytics } }; for (var t = 0; t < analytics.methods.length; t++) { var e = analytics.methods[t]; analytics[e] = analytics.factory(e) } analytics.load = function (t, e) { var n = document.createElement("script"); n.type = "text/javascript"; n.async = !0; n.src = "https://cdn.posthog.com/analytics.js/v1/" + t + "/analytics.min.js"; var a = document.getElementsByTagName("script")[0]; a.parentNode.insertBefore(n, a); analytics._loadOptions = e }; analytics.SNIPPET_VERSION = "4.1.0";
         analytics.load("YOUR_API_KEY_GOES_HERE");
         analytics.page();
       }
diff --git a/ios/Classes/PosthogFlutterPlugin.m b/ios/Classes/PosthogFlutterPlugin.m
index 422b740..6e6458f 100644
--- a/ios/Classes/PosthogFlutterPlugin.m
+++ b/ios/Classes/PosthogFlutterPlugin.m
@@ -96,8 +96,8 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([@"identify" isEqualToString:call.method]) {
     [self identify:call result:result];
-  } else if ([@"track" isEqualToString:call.method]) {
-    [self track:call result:result];
+  } else if ([@"capture" isEqualToString:call.method]) {
+    [self capture:call result:result];
   } else if ([@"screen" isEqualToString:call.method]) {
     [self screen:call result:result];
   } else if ([@"alias" isEqualToString:call.method]) {
@@ -152,7 +152,7 @@ - (void)identify:(FlutterMethodCall*)call result:(FlutterResult)result {
   }
 }
 
-- (void)track:(FlutterMethodCall*)call result:(FlutterResult)result {
+- (void)capture:(FlutterMethodCall*)call result:(FlutterResult)result {
   @try {
     NSString *eventName = call.arguments[@"eventName"];
     NSDictionary *properties = call.arguments[@"properties"];
diff --git a/lib/src/posthog.dart b/lib/src/posthog.dart
index 23710d6..1db5a54 100644
--- a/lib/src/posthog.dart
+++ b/lib/src/posthog.dart
@@ -11,22 +11,22 @@ class Posthog {
 
   static Future<void> identify({
     @required userId,
-    Map<String, dynamic> traits,
+    Map<String, dynamic> properties,
     Map<String, dynamic> options,
   }) {
     return _posthog.identify(
       userId: userId,
-      traits: traits,
+      properties: properties,
       options: options,
     );
   }
 
-  static Future<void> track({
+  static Future<void> capture({
     @required String eventName,
     Map<String, dynamic> properties,
     Map<String, dynamic> options,
   }) {
-    return _posthog.track(
+    return _posthog.capture(
       eventName: eventName,
       properties: properties,
       options: options,
@@ -45,18 +45,6 @@ class Posthog {
     );
   }
 
-  static Future<void> group({
-    @required String groupId,
-    Map<String, dynamic> traits,
-    Map<String, dynamic> options,
-  }) {
-    return _posthog.group(
-      groupId: groupId,
-      traits: traits,
-      options: options,
-    );
-  }
-
   static Future<void> alias({
     @required String alias,
     Map<String, dynamic> options,
diff --git a/lib/src/posthog_method_channel.dart b/lib/src/posthog_method_channel.dart
index 2ed42e0..327c5f4 100644
--- a/lib/src/posthog_method_channel.dart
+++ b/lib/src/posthog_method_channel.dart
@@ -8,13 +8,13 @@ const MethodChannel _channel = MethodChannel('posthog_flutter');
 class PosthogMethodChannel extends PosthogPlatform {
   Future<void> identify({
     @required userId,
-    Map<String, dynamic> traits,
+    Map<String, dynamic> properties,
     Map<String, dynamic> options,
   }) async {
     try {
       await _channel.invokeMethod('identify', {
         'userId': userId,
-        'traits': traits ?? {},
+        'properties': properties ?? {},
         'options': options ?? PosthogDefaultOptions.instance.options ?? {},
       });
     } on PlatformException catch (exception) {
@@ -22,13 +22,13 @@ class PosthogMethodChannel extends PosthogPlatform {
     }
   }
 
-  Future<void> track({
+  Future<void> capture({
     @required String eventName,
     Map<String, dynamic> properties,
     Map<String, dynamic> options,
   }) async {
     try {
-      await _channel.invokeMethod('track', {
+      await _channel.invokeMethod('capture', {
         'eventName': eventName,
         'properties': properties ?? {},
         'options': options ?? PosthogDefaultOptions.instance.options ?? {},
@@ -54,22 +54,6 @@ class PosthogMethodChannel extends PosthogPlatform {
     }
   }
 
-  Future<void> group({
-    @required String groupId,
-    Map<String, dynamic> traits,
-    Map<String, dynamic> options,
-  }) async {
-    try {
-      await _channel.invokeMethod('group', {
-        'groupId': groupId,
-        'traits': traits ?? {},
-        'options': options ?? PosthogDefaultOptions.instance.options ?? {},
-      });
-    } on PlatformException catch (exception) {
-      print(exception);
-    }
-  }
-
   Future<void> alias({
     @required String alias,
     Map<String, dynamic> options,
diff --git a/lib/src/posthog_platform_interface.dart b/lib/src/posthog_platform_interface.dart
index af059b8..d1fdd40 100644
--- a/lib/src/posthog_platform_interface.dart
+++ b/lib/src/posthog_platform_interface.dart
@@ -13,18 +13,18 @@ abstract class PosthogPlatform {
 
   Future<void> identify({
     @required userId,
-    Map<String, dynamic> traits,
+    Map<String, dynamic> properties,
     Map<String, dynamic> options,
   }) {
     throw UnimplementedError('identify() has not been implemented.');
   }
 
-  Future<void> track({
+  Future<void> capture({
     @required String eventName,
     Map<String, dynamic> properties,
     Map<String, dynamic> options,
   }) {
-    throw UnimplementedError('track() has not been implemented.');
+    throw UnimplementedError('capture() has not been implemented.');
   }
 
   Future<void> screen({
@@ -35,14 +35,6 @@ abstract class PosthogPlatform {
     throw UnimplementedError('screen() has not been implemented.');
   }
 
-  Future<void> group({
-    @required String groupId,
-    Map<String, dynamic> traits,
-    Map<String, dynamic> options,
-  }) {
-    throw UnimplementedError('group() has not been implemented.');
-  }
-
   Future<void> alias({
     @required String alias,
     Map<String, dynamic> options,
diff --git a/lib/src/posthog_web.dart b/lib/src/posthog_web.dart
index 56d366b..5dd25c3 100644
--- a/lib/src/posthog_web.dart
+++ b/lib/src/posthog_web.dart
@@ -24,7 +24,7 @@ class PosthogWeb {
         ]);
         break;
       case 'capture':
-        analytics.callMethod('track', [
+        analytics.callMethod('capture', [
           call.arguments['eventName'],
           JsObject.jsify(call.arguments['properties']),
         ]);