[firebase_analytics] Wire the platform interface. (firebase#2572)

* Make firebase_analytics use the platform interface.
adityadroid · Jun 8, 2020 · 5e380cf · 5e380cf
1 parent c1767fe
commit 5e380cf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/packages/firebase_analytics/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.15
+
+* Use the platform interface.
+
 ## 5.0.14
 
 * Update lower bound of dart dependency to 2.0.0.

diff --git a/packages/firebase_analytics/firebase_analytics/lib/firebase_analytics.dart b/packages/firebase_analytics/firebase_analytics/lib/firebase_analytics.dart
@@ -3,17 +3,13 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
-
-const MethodChannel firebaseChannel =
-    MethodChannel('plugins.flutter.io/firebase_analytics');
+import 'package:firebase_analytics_platform_interface/firebase_analytics_platform_interface.dart';
 
 /// Firebase Analytics API.
 class FirebaseAnalytics {
-  final MethodChannel _channel = firebaseChannel;
+  final _platformInstance = FirebaseAnalyticsPlatform.instance;
 
   /// Namespace for analytics API available on Android only.
   ///
@@ -26,7 +22,7 @@ class FirebaseAnalytics {
   ///     FirebaseAnalytics analytics = FirebaseAnalytics();
   ///     analytics.android?.setSessionTimeoutDuration(true);
   final FirebaseAnalyticsAndroid android =
-      defaultTargetPlatform == TargetPlatform.android
+      defaultTargetPlatform == TargetPlatform.android && !kIsWeb
           ? FirebaseAnalyticsAndroid()
           : null;
 
@@ -45,10 +41,7 @@ class FirebaseAnalytics {
           'Prefix "$kReservedPrefix" is reserved and cannot be used.');
     }
 
-    await _channel.invokeMethod<void>('logEvent', <String, dynamic>{
-      'name': name,
-      'parameters': parameters,
-    });
+    await _platformInstance.logEvent(name: name, parameters: parameters);
   }
 
   /// Sets whether analytics collection is enabled for this app on this device.
@@ -58,8 +51,7 @@ class FirebaseAnalytics {
     if (enabled == null) {
       throw ArgumentError.notNull('enabled');
     }
-
-    await _channel.invokeMethod<void>('setAnalyticsCollectionEnabled', enabled);
+    await _platformInstance.setAnalyticsCollectionEnabled(enabled);
   }
 
   /// Sets the user ID property.
@@ -68,7 +60,7 @@ class FirebaseAnalytics {
   ///
   /// [1]: https://www.google.com/policies/privacy/
   Future<void> setUserId(String id) async {
-    await _channel.invokeMethod<void>('setUserId', id);
+    await _platformInstance.setUserId(id);
   }
 
   /// Sets the current [screenName], which specifies the current visual context
@@ -95,10 +87,10 @@ class FirebaseAnalytics {
       throw ArgumentError.notNull('screenName');
     }
 
-    await _channel.invokeMethod<void>('setCurrentScreen', <String, String>{
-      'screenName': screenName,
-      'screenClassOverride': screenClassOverride,
-    });
+    await _platformInstance.setCurrentScreen(
+      screenName: screenName,
+      screenClassOverride: screenClassOverride,
+    );
   }
 
   static final RegExp _nonAlphaNumeric = RegExp(r'[^a-zA-Z0-9_]');
@@ -129,15 +121,12 @@ class FirebaseAnalytics {
     if (name.startsWith('firebase_'))
       throw ArgumentError.value(name, 'name', '"firebase_" prefix is reserved');
 
-    await _channel.invokeMethod<void>('setUserProperty', <String, String>{
-      'name': name,
-      'value': value,
-    });
+    await _platformInstance.setUserProperty(name: name, value: value);
   }
 
   /// Clears all analytics data for this app from the device and resets the app instance id.
   Future<void> resetAnalyticsData() async {
-    await _channel.invokeMethod<void>('resetAnalyticsData');
+    await _platformInstance.resetAnalyticsData();
   }
 
   /// Logs the standard `add_payment_info` event.
@@ -869,7 +858,7 @@ class FirebaseAnalytics {
 
 /// Android-specific analytics API.
 class FirebaseAnalyticsAndroid {
-  final MethodChannel _channel = firebaseChannel;
+  final _platformInstance = FirebaseAnalyticsPlatform.instance;
 
   /// Sets the duration of inactivity that terminates the current session.
   ///
@@ -878,8 +867,7 @@ class FirebaseAnalyticsAndroid {
     if (milliseconds == null) {
       throw ArgumentError.notNull('milliseconds');
     }
-    await _channel.invokeMethod<void>(
-        'setSessionTimeoutDuration', milliseconds);
+    await _platformInstance.setSessionTimeoutDuration(milliseconds);
   }
 }
 

diff --git a/packages/firebase_analytics/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/pubspec.yaml
@@ -1,8 +1,9 @@
 name: firebase_analytics
-description: Flutter plugin for Google Analytics for Firebase, an app measurement
+description:
+  Flutter plugin for Google Analytics for Firebase, an app measurement
   solution that provides insight on app usage and user engagement on Android and iOS.
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_analytics/firebase_analytics
-version: 5.0.14
+version: 5.0.15
 
 flutter:
   plugin:
@@ -17,6 +18,7 @@ dependencies:
   meta: ^1.0.4
   flutter:
     sdk: flutter
+  firebase_analytics_platform_interface: ^1.0.1
 
 dev_dependencies:
   pedantic: ^1.8.0