bug fixes, cleanup

Author: ubbop42

android/src/main/kotlin/com/homexlabs/optimizely_dart/OptimizelyPlugin.kt

@@ -89,12 +89,12 @@ class OptimizelyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
         val variation = activateGetVariation(featureKey!!)
         result.success(variation)
       }
-      "getvariation" -> {
+      "getVariation"-> {
         val featureKey = call.argument<String>("feature_key")
         val userId = call.argument<String>("user_id")
         val attributes = call.argument<MutableMap<String, Any>>("attributes")
         val variation = getVariation(featureKey!!, userId!!, attributes!!)
-        result.success(variation)
+        result.success(variation?.key)
       }
       "trackEvent" -> {
         val featureKey = call.argument<String>("feature_key")

example/lib/main.dart

@@ -50,8 +50,6 @@ class _MyAppState extends State<MyApp> {
     try {
       bool? featureEnabled = await optimizelyPlugin.isFeatureEnabled(
         'price_filter',
-        'user@example.org',
-        {'platform': platform},
       );
       priceFilterFlag = 'price_filter feature is $featureEnabled.';
     } on PlatformException catch (e) {
@@ -76,8 +74,6 @@ class _MyAppState extends State<MyApp> {
     try {
       variables = await optimizelyPlugin.getAllFeatureVariables(
         'price_filter',
-        'user@example.org',
-        {'platform': platform},
       );
       int? minPrice = variables['min_price'];
       minPriceVariable = "min_price variable is: ${minPrice.toString()}.";

ios/Classes/OptimizelyPlugin.m

@@ -5,11 +5,11 @@
 // Support project import fallback if the generated compatibility header
 // is not copied when this plugin is created as a library.
 // https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816
-#import "optimizely_plugin-Swift.h"
+#import "OptimizelyPlugin.h"
 #endif
 
 @implementation OptimizelyPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-  [SwiftOptimizelyPlugin registerWithRegistrar:registrar];
+  [OptimizelyPlugin registerWithRegistrar:registrar];
 }
 @end

ios/Classes/SwiftOptimizelyPlugin.swift

@@ -6,7 +6,7 @@ enum InitResult {
   case failure(Error)
 }
 
-public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
+public class OptimizelyPlugin: NSObject, FlutterPlugin {
 
     typealias GetFeatureItems = (featureKey: String, userId: String, attributes: OptimizelyAttributes?, eventTags: OptimizelyEventTags?)
     var client: OptimizelyClient?
@@ -17,7 +17,7 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
             name: "optimizely_plugin",
             binaryMessenger: registrar.messenger()
         )
-        let instance = SwiftOptimizelyPlugin()
+        let instance = OptimizelyPlugin()
         registrar.addMethodCallDelegate(instance, channel: channel)
     }
 

lib/optimizely_dart.dart

@@ -79,7 +79,7 @@ class OptimizelyPlugin {
     String experimentKey,
   ) async {
     final variation =
-        await _channel.invokeMethod('getAllFeatureVariables', <String, dynamic>{
+        await _channel.invokeMethod('activateGetVariation', <String, dynamic>{
       'feature_key': experimentKey,
     });
     return variation;