v1.15.0

Author: SwiftyAlex

android/build.gradle

@@ -123,5 +123,5 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "androidx.appcompat:appcompat:1.3.1"
-  implementation "com.unflow:unflow-ui:1.14.2"
+  implementation "com.unflow:unflow-ui:1.15.0"
 }

android/src/main/java/com/unflow/reactnative/UnflowModule.kt

@@ -121,6 +121,13 @@ class UnflowModule(
       UnflowSdk.client().deregisterPushToken()
     }
 
+    @ReactMethod
+    fun clearUserSession() {
+      scope.launch {
+        UnflowSdk.client().clearUserSession()
+      }
+    }
+
     @ReactMethod
     @Suppress("UNUSED_PARAMETER")
     fun addListener(eventName: String) {}
@@ -227,6 +234,24 @@ private class UnflowAnalyticsListener(
     emitEvent(event)
   }
 
+  override fun onAttributesUpdate(attributes: Map<String, Any?>) {
+    val attributesMap = WritableNativeMap()
+    attributes.forEach {
+      when(it.value) {
+        is Long -> {  attributesMap.putDouble(it.key, ((it.value as? Long) ?: 0).toDouble())  }
+        is Int -> {  attributesMap.putInt(it.key, ((it.value as? Int) ?: 0)) }
+        is String -> {  attributesMap.putString(it.key, (it.value as? String))  }
+        is Boolean -> {  attributesMap.putBoolean(it.key, (it.value as? Boolean) ?: false)  }
+        null -> {  attributesMap.putNull(it.key) }
+        is List<*> -> {  attributesMap.putArray(it.key, makeNativeArray(it.value)) }
+      }
+    }
+
+    reactContext
+      .getJSModule(RCTDeviceEventEmitter::class.java)
+      .emit("AttributesUpdated", attributesMap)
+  }
+
   @ReactMethod
   fun emitEvent(event: UnflowEvent) {
     val eventMap = WritableNativeMap()

example/ios/Podfile.lock

@@ -352,10 +352,10 @@ PODS:
     - React-RCTImage
   - RNSVG (12.3.0):
     - React-Core
-  - Unflow (1.14.2-swift-5.6)
-  - unflow-react-native (1.14.2):
+  - Unflow (1.15.0-swift-5.6)
+  - unflow-react-native (1.15.0):
     - React-Core
-    - Unflow (= 1.14.2-swift-5.6)
+    - Unflow (= 1.15.0-swift-5.6)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -562,8 +562,8 @@ SPEC CHECKSUMS:
   RNGestureHandler: 6e757e487a4834e7280e98e9bac66d2d9c575e9c
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
   RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8
-  Unflow: a1eaec5ac335b44863694ded2a708e951b611f00
-  unflow-react-native: c8d67fa5edf936489063f5f16000876b91efcba1
+  Unflow: cfb8a107a7df1b24ad26a87d84361322388037fb
+  unflow-react-native: 679d2ec0f8a1bf65db8d62f428fd53a20c4d4b06
   Yoga: 5cbf25add73edb290e1067017690f7ebf56c5468
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

example/src/App.js

@@ -29,9 +29,21 @@ export default function App() {
     console.log(event);
   };
 
+  const unflowAttributesListener = (attributes) => {
+    console.log(attributes);
+  };
+
   useEffect(() => {
-    let subscription = Unflow.addAnalyticsListener(unflowAnalyticsListener);
-    return () => Unflow.removeAnalyticsListener(subscription);
+    let analyticsSubscription = Unflow.addAnalyticsListener(
+      unflowAnalyticsListener
+    );
+    let attributesSubscription = Unflow.addAttributesListener(
+      unflowAttributesListener
+    );
+    return () => {
+      Unflow.removeAnalyticsListener(analyticsSubscription);
+      Unflow.removeAttributesListener(attributesSubscription);
+    };
   }, []);
 
   return (

example/src/DetailsScreen.js

@@ -20,6 +20,7 @@ import {
   UnflowMark,
 } from './icons';
 import Section from './Section';
+import Unflow from 'unflow-react-native';
 
 const LINKS_DATA = [
   {
@@ -77,7 +78,9 @@ export default function SettingsScreen() {
   let clearStorage = async () => {
     await storeData({ screens: [], events: [] });
   };
-
+  let resetSession = () => {
+    Unflow.clearUserSession();
+  };
   return (
     <View style={styles.container}>
       <Section title="Useful links">
@@ -98,6 +101,9 @@ export default function SettingsScreen() {
           />
         </View>
       </Section>
+      <TouchableOpacity style={styles.destructiveButton} onPress={resetSession}>
+        <Text style={styles.destructiveButtonText}>Reset User Session</Text>
+      </TouchableOpacity>
       <TouchableOpacity style={styles.destructiveButton} onPress={clearStorage}>
         <Text style={styles.destructiveButtonText}>Clear Cache</Text>
       </TouchableOpacity>
@@ -145,6 +151,7 @@ const styles = StyleSheet.create({
     backgroundColor: '#FACDCD',
     marginHorizontal: 16,
     paddingVertical: 12,
+    marginBottom: 12,
     borderRadius: 32,
     alignItems: 'center',
   },

ios/Unflow.swift

@@ -21,6 +21,19 @@ class UnflowAnalyticsListener: UnflowUI.AnalyticsListener {
             }
         }
     }
+
+    func onAttributesUpdate(attributes: [String: UnflowUI.UnflowAnalyticsValue]) {
+        if #available(iOS 13, *) {
+            Task {
+                await MainActor.run(body: {
+                    EventEmitter.sharedInstance.dispatch(
+                        name: EventName.attributesUpdated.key, 
+                        body: attributes
+                    )
+                })
+            }
+        }
+    }
 }
 
 
@@ -197,6 +210,17 @@ class Unflow: NSObject {
         }
     }
 
+    @objc(clearUserSession)
+    func clearUserSession() -> Void {
+        if #available(iOS 13.0, *) {
+            Task {
+                await MainActor.run(body: {
+                    UnflowSDK.client.clearUserSession()
+                })
+            }
+        }
+    }
+
     @objc(openers:)
     func openers(spaceKey: String) -> Void {
         if #available(iOS 13.0, *) {

ios/UnflowBridge.m

@@ -12,6 +12,7 @@ @interface RCT_EXTERN_MODULE(Unflow, NSObject)
 RCT_EXTERN_METHOD(openScreen:(double *)screenId)
 RCT_EXTERN_METHOD(trackEvent:(NSString *)eventName withMetadata:(NSDictionary *)metadata)
 RCT_EXTERN_METHOD(deregisterToken)
+RCT_EXTERN_METHOD(clearUserSession)
 RCT_EXTERN_METHOD(openers:(NSString *)spaceKey)
 RCT_EXTERN_METHOD(spaces)
 RCT_EXTERN_METHOD(addListener:(NSString *)eventName)

ios/UnflowEventEmitter.swift

@@ -34,7 +34,7 @@ class UnflowEventEmitter: RCTEventEmitter {
 }
 
 @objc enum EventName: Int, CaseIterable {
-    case openersChanged, spacesChanged, eventReceived
+    case openersChanged, spacesChanged, eventReceived, attributesUpdated
 
     var key: String {
         switch self {
@@ -44,6 +44,8 @@ class UnflowEventEmitter: RCTEventEmitter {
             return "SpacesChanged"
         case .eventReceived:
             return "EventReceived"
+        case .attributesUpdated:
+            return "AttributesUpdated"
         }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unflow-react-native",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "description": "Tired of building the same simple screens over and over again? Empower your product team to create and ship content using the Unflow mobile SDK.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/attributes-listener.tsx

@@ -0,0 +1,19 @@
+import type { EmitterSubscription } from 'react-native';
+import { EventEmitter } from './native-emitter';
+import type { Metadata } from './types';
+
+export function addAttributesListener(
+  callback: (attributes: Metadata) => void
+): EmitterSubscription | undefined {
+  let subscription: EmitterSubscription | undefined;
+  if (EventEmitter) {
+    subscription = EventEmitter.addListener('AttributesUpdated', callback);
+  }
+  return subscription;
+}
+
+export function removeAttributesListener(
+  subscription: EmitterSubscription
+): void {
+  if (subscription) subscription.remove();
+}

src/index.tsx

@@ -3,6 +3,10 @@ import {
   addAnalyticsListener,
   removeAnalyticsListener,
 } from './analytics-listener';
+import {
+  addAttributesListener,
+  removeAttributesListener,
+} from './attributes-listener';
 import OpenerView, { useSpace } from './opener-view';
 import SpacesView, { useSpaces } from './spaces-view';
 import type { UnflowType } from './types';
@@ -59,6 +63,10 @@ function setPushToken(value: string) {
   Unflow.setUserId(value);
 }
 
+function clearUserSession() {
+  Unflow.clearUserSession();
+}
+
 export default {
   ...Unflow,
   initialize,
@@ -67,6 +75,9 @@ export default {
   trackEvent,
   openScreen,
   setPushToken,
+  clearUserSession,
   addAnalyticsListener: addAnalyticsListener,
   removeAnalyticsListener: removeAnalyticsListener,
+  addAttributesListener: addAttributesListener,
+  removeAttributesListener: removeAttributesListener,
 } as UnflowType;

src/types.tsx

@@ -109,7 +109,7 @@ type MetadataAttributeValue =
   | AttributeValue[]
   | AttributeObject[];
 
-type Metadata = {
+export type Metadata = {
   [key: string]: MetadataAttributeValue;
 };
 
@@ -143,4 +143,9 @@ export type UnflowType = {
     callback: (event: UnflowEvent) => void
   ) => EmitterSubscription;
   removeAnalyticsListener: (subscription: EmitterSubscription) => void;
+  addAttributesListener: (
+    callback: (attributes: Metadata) => void
+  ) => EmitterSubscription;
+  removeAttributesListener: (subscription: EmitterSubscription) => void;
+  clearUserSession(): null;
 };

unflow-react-native.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "Unflow", "1.14.2-swift-5.6"
+  s.dependency "Unflow", "1.15.0-swift-5.6"
 end