expo-live-activity 0.2.1-alpha1 → 0.3.0-alpha1

package/ios/ExpoLiveActivityModule.swift

@@ -2,9 +2,10 @@ import ActivityKit
 import ExpoModulesCore
 
 enum LiveActivityErrors: Error {
-    case unsupportedOS
-    case liveActivitiesNotEnabled
-    case unexpetedError(Error)
+  case unsupportedOS
+  case notFound
+  case liveActivitiesNotEnabled
+  case unexpectedError(Error)
 }
 
 public class ExpoLiveActivityModule: Module {
@@ -40,7 +41,7 @@ public class ExpoLiveActivityModule: Module {
 
     @Field
     var progressViewLabelColor: String?
-    
+
     @Field
     var deepLinkUrl: String?
 
@@ -53,136 +54,198 @@ public class ExpoLiveActivityModule: Module {
     case digital
   }
 
-  func sendPushToken(activityID: String, activityPushToken: String) {
+  @available(iOS 16.1, *)
+  private func sendPushToken(activity: Activity<LiveActivityAttributes>, activityPushToken: String) {
     sendEvent(
       "onTokenReceived",
       [
-        "activityID": activityID,
+        "activityID": activity.id,
+        "activityName": activity.attributes.name,
         "activityPushToken": activityPushToken,
       ]
     )
   }
 
-  func updateImages(state: LiveActivityState, newState: inout LiveActivityAttributes.ContentState) async throws {
+  private func sendPushToStartToken(activityPushToStartToken: String) {
+    sendEvent(
+      "onPushToStartTokenReceived",
+      [
+        "activityPushToStartToken": activityPushToStartToken
+      ]
+    )
+  }
+
+  @available(iOS 16.1, *)
+  private func sendStateChange(activity: Activity<LiveActivityAttributes>, activityState: ActivityState) {
+    sendEvent(
+      "onStateChange",
+      [
+        "activityID": activity.id,
+        "activityName": activity.attributes.name,
+        "activityState": String(describing: activityState),
+      ]
+    )
+  }
+
+  private func updateImages(state: LiveActivityState, newState: inout LiveActivityAttributes.ContentState) async throws
+  {
     if let name = state.imageName {
-      print("imageName: \(name)")
       newState.imageName = try await resolveImage(from: name)
     }
 
     if let name = state.dynamicIslandImageName {
-      print("dynamicIslandImageName: \(name)")
       newState.dynamicIslandImageName = try await resolveImage(from: name)
     }
   }
 
-  public func definition() -> ModuleDefinition {
-    Name("ExpoLiveActivity")
+  private func observePushToStartToken() {
+    guard #available(iOS 17.2, *), ActivityAuthorizationInfo().areActivitiesEnabled else { return }
 
-    Events("onTokenReceived")
+    print("Observing push to start token updates...")
+    Task {
+      for await data in Activity<LiveActivityAttributes>.pushToStartTokenUpdates {
+        let token = data.reduce("") { $0 + String(format: "%02x", $1) }
+        sendPushToStartToken(activityPushToStartToken: token)
+      }
+    }
+  }
 
-    Function("startActivity") { (state: LiveActivityState, maybeConfig: LiveActivityConfig?) -> String in
-      print("Starting activity")
-      if #available(iOS 16.2, *) {
-        if ActivityAuthorizationInfo().areActivitiesEnabled {
-          do {
-            let config = maybeConfig ?? LiveActivityConfig()
-            let attributes = LiveActivityAttributes(
-              name: "ExpoLiveActivity",
-              backgroundColor: config.backgroundColor,
-              titleColor: config.titleColor,
-              subtitleColor: config.subtitleColor,
-              progressViewTint: config.progressViewTint,
-              progressViewLabelColor: config.progressViewLabelColor,
-              deepLinkUrl: config.deepLinkUrl,
-              timerType: config.timerType == .digital ? .digital : .circular
-            )
-            let initialState = LiveActivityAttributes.ContentState(
-              title: state.title,
-              subtitle: state.subtitle,
-              timerEndDateInMilliseconds: state.date,
-            )
-            let pushNotificationsEnabled =
-              Bundle.main.object(forInfoDictionaryKey: "ExpoLiveActivity_EnablePushNotifications") as? Bool
-            let activity = try Activity.request(
-              attributes: attributes,
-              content: .init(state: initialState, staleDate: nil),
-              pushType: pushNotificationsEnabled == true ? .token : nil
-            )
+  private func observeLiveActivityUpdates() {
+    guard #available(iOS 16.2, *) else { return }
+
+    Task {
+      for await activityUpdate in Activity<LiveActivityAttributes>.activityUpdates {
+        let activityId = activityUpdate.id
+        let activityState = activityUpdate.activityState
+
+        print("Received activity update: \(activityId), \(activityState)")
+
+        guard
+          let activity = Activity<LiveActivityAttributes>.activities.first(where: {
+            $0.id == activityId
+          })
+        else { return print("Didn't find activity with ID \(activityId)") }
+
+        if case .active = activityState {
+          Task {
+            for await state in activity.activityStateUpdates {
+              sendStateChange(activity: activity, activityState: state)
+            }
+          }
 
+          if pushNotificationsEnabled {
+            print("Adding push token observer for activity \(activity.id)")
             Task {
               for await pushToken in activity.pushTokenUpdates {
                 let pushTokenString = pushToken.reduce("") { $0 + String(format: "%02x", $1) }
 
-                sendPushToken(activityID: activity.id, activityPushToken: pushTokenString)
+                sendPushToken(activity: activity, activityPushToken: pushTokenString)
               }
             }
-
-            Task {
-              var newState = activity.content.state
-              try await updateImages(state: state, newState: &newState)
-              await activity.update(ActivityContent(state: newState, staleDate: nil))
-            }
-
-            return activity.id
-          } catch (let error) {
-            print("Error with live activity: \(error)")
-            throw LiveActivityErrors.unexpetedError(error)
           }
         }
-        throw LiveActivityErrors.liveActivitiesNotEnabled
-      } else {
-        throw LiveActivityErrors.unsupportedOS
       }
     }
+  }
 
-    Function("stopActivity") { (activityId: String, state: LiveActivityState) -> Void in
-      if #available(iOS 16.2, *) {
-        print("Attempting to stop")
-        var newState = LiveActivityAttributes.ContentState(
+  private var pushNotificationsEnabled: Bool {
+    Bundle.main.object(forInfoDictionaryKey: "ExpoLiveActivity_EnablePushNotifications") as? Bool ?? false
+  }
+
+  public func definition() -> ModuleDefinition {
+    Name("ExpoLiveActivity")
+
+    OnCreate {
+      if pushNotificationsEnabled {
+        observePushToStartToken()
+      }
+      observeLiveActivityUpdates()
+    }
+
+    Events("onTokenReceived", "onPushToStartTokenReceived", "onStateChange")
+
+    Function("startActivity") { (state: LiveActivityState, maybeConfig: LiveActivityConfig?) -> String in
+      guard #available(iOS 16.2, *) else { throw LiveActivityErrors.unsupportedOS }
+      guard ActivityAuthorizationInfo().areActivitiesEnabled else { throw LiveActivityErrors.liveActivitiesNotEnabled }
+
+      do {
+        let config = maybeConfig ?? LiveActivityConfig()
+        let attributes = LiveActivityAttributes(
+          name: "ExpoLiveActivity",
+          backgroundColor: config.backgroundColor,
+          titleColor: config.titleColor,
+          subtitleColor: config.subtitleColor,
+          progressViewTint: config.progressViewTint,
+          progressViewLabelColor: config.progressViewLabelColor,
+          deepLinkUrl: config.deepLinkUrl,
+          timerType: config.timerType == .digital ? .digital : .circular
+        )
+        let initialState = LiveActivityAttributes.ContentState(
           title: state.title,
           subtitle: state.subtitle,
-          timerEndDateInMilliseconds: state.date,
+          timerEndDateInMilliseconds: state.date
         )
-        if let activity = Activity<LiveActivityAttributes>.activities.first(where: {
-          $0.id == activityId
-        }) {
-          Task {
-            print("Stopping activity with id: \(activityId)")
-            try await updateImages(state: state, newState: &newState)
-            await activity.end(
-              ActivityContent(state: newState, staleDate: nil),
-              dismissalPolicy: .immediate
-            )
-          }
-        } else {
-          print("Didn't find activity with ID \(activityId)")
+
+        let activity = try Activity.request(
+          attributes: attributes,
+          content: .init(state: initialState, staleDate: nil),
+          pushType: pushNotificationsEnabled ? .token : nil
+        )
+
+        Task {
+          var newState = activity.content.state
+          try await updateImages(state: state, newState: &newState)
+          await activity.update(ActivityContent(state: newState, staleDate: nil))
         }
-      } else {
-        throw LiveActivityErrors.unsupportedOS
+
+        return activity.id
+      } catch let error {
+        print("Error with live activity: \(error)")
+        throw LiveActivityErrors.unexpectedError(error)
+
       }
     }
 
-    Function("updateActivity") { (activityId: String, state: LiveActivityState) -> Void in
-      if #available(iOS 16.2, *) {
-        print("Attempting to update")
+    Function("stopActivity") { (activityId: String, state: LiveActivityState) in
+      guard #available(iOS 16.2, *) else { throw LiveActivityErrors.unsupportedOS }
+      guard
+        let activity = Activity<LiveActivityAttributes>.activities.first(where: {
+          $0.id == activityId
+        })
+      else { throw LiveActivityErrors.notFound }
+
+      Task {
+        print("Stopping activity with id: \(activityId)")
         var newState = LiveActivityAttributes.ContentState(
           title: state.title,
           subtitle: state.subtitle,
-          timerEndDateInMilliseconds: state.date,
+          timerEndDateInMilliseconds: state.date
         )
-        if let activity = Activity<LiveActivityAttributes>.activities.first(where: {
+        try await updateImages(state: state, newState: &newState)
+        await activity.end(
+          ActivityContent(state: newState, staleDate: nil),
+          dismissalPolicy: .immediate
+        )
+      }
+    }
+
+    Function("updateActivity") { (activityId: String, state: LiveActivityState) in
+      guard #available(iOS 16.2, *) else { throw LiveActivityErrors.unsupportedOS }
+      guard
+        let activity = Activity<LiveActivityAttributes>.activities.first(where: {
           $0.id == activityId
-        }) {
-          Task {
-            print("Updating activity with id: \(activityId)")
-            try await updateImages(state: state, newState: &newState)
-            await activity.update(ActivityContent(state: newState, staleDate: nil))
-          }
-        } else {
-          print("Didn't find activity with ID \(activityId)")
-        }
-      } else {
-        throw LiveActivityErrors.unsupportedOS
+        })
+      else { throw LiveActivityErrors.notFound }
+
+      Task {
+        print("Updating activity with id: \(activityId)")
+        var newState = LiveActivityAttributes.ContentState(
+          title: state.title,
+          subtitle: state.subtitle,
+          timerEndDateInMilliseconds: state.date
+        )
+        try await updateImages(state: state, newState: &newState)
+        await activity.update(ActivityContent(state: newState, staleDate: nil))
       }
     }
   }

package/ios/Helpers.swift

@@ -9,8 +9,7 @@ func resolveImage(from string: String) async throws -> String {
   if let url = URL(string: string), url.scheme?.hasPrefix("http") == true,
     let container = FileManager.default.containerURL(
       forSecurityApplicationGroupIdentifier: "group.expoLiveActivity.sharedData"
-    )
-  {
+    ) {
     let data = try await Data.download(from: url)
     let filename = UUID().uuidString + ".png"
     let fileURL = container.appendingPathComponent(filename)

package/ios-files/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,11 +1,11 @@
 {
-  "colors" : [
+  "colors": [
     {
-      "idiom" : "universal"
+      "idiom": "universal"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }

package/ios-files/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,35 +1,35 @@
 {
-  "images" : [
+  "images": [
     {
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
     },
     {
-      "appearances" : [
+      "appearances": [
         {
-          "appearance" : "luminosity",
-          "value" : "dark"
+          "appearance": "luminosity",
+          "value": "dark"
         }
       ],
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
     },
     {
-      "appearances" : [
+      "appearances": [
         {
-          "appearance" : "luminosity",
-          "value" : "tinted"
+          "appearance": "luminosity",
+          "value": "tinted"
         }
       ],
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }

package/ios-files/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }

package/ios-files/Assets.xcassets/WidgetBackground.colorset/Contents.json

@@ -1,11 +1,11 @@
 {
-  "colors" : [
+  "colors": [
     {
-      "idiom" : "universal"
+      "idiom": "universal"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }

package/ios-files/View+applyWidgetURL.swift

@@ -7,9 +7,23 @@
 
 import SwiftUI
 
+private let cachedScheme: String? = {
+  guard
+    let urlTypes = Bundle.main.infoDictionary?["CFBundleURLTypes"] as? [[String: Any]],
+    let schemes = urlTypes.first?["CFBundleURLSchemes"] as? [String],
+    let firstScheme = schemes.first
+  else {
+    return nil
+  }
+
+  return firstScheme
+}()
+
 extension View {
   @ViewBuilder
   func applyWidgetURL(from urlString: String?) -> some View {
-    applyIfPresent(urlString) { view, string in view.widgetURL(URL(string: string))}
+    applyIfPresent(urlString) { view, string in
+      applyIfPresent(cachedScheme) { view, scheme in view.widgetURL(URL(string: scheme + "://" + string)) }
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-live-activity",
-  "version": "0.2.1-alpha1",
+  "version": "0.3.0-alpha1",
   "description": "A module for adding Live Activity to a React Native app for iOS.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -8,9 +8,12 @@
     "build": "expo-module build",
     "clean": "expo-module clean",
     "clean:plugin": "rm -rf plugin/build plugin/tsconfig.tsbuildinfo",
-    "lint": "expo-module lint",
+    "format:check": "prettier --check .",
+    "lint": "expo-module eslint",
+    "lint:libOnly": "expo-module eslint --ignore-pattern 'example/*'",
     "test": "expo-module test",
-    "prepare": "expo-module prepare",
+    "postinstall": "cd example && npm install",
+    "prepare": "expo-module prepare && rm .eslintrc.js",
     "prepublishOnly": "expo-module prepublishOnly",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios"
@@ -27,17 +30,26 @@
     "Anna Olak <anna.olak@swmansion.com> (https://github.com/anna1901)",
     "Artur Bilski <artur.bilski@swmansion.com> (https://github.com/arthwood)"
   ],
-  "repository": "https://github.com/software-mansion-labs/expo-live-activity.git",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/software-mansion-labs/expo-live-activity.git"
+  },
   "bugs": {
     "url": "https://github.com/software-mansion-labs/expo-live-activity/issues"
   },
   "license": "MIT",
   "homepage": "https://github.com/software-mansion-labs/expo-live-activity#readme",
-  "dependencies": {},
   "devDependencies": {
     "@types/react": "~19.0.0",
-    "expo-module-scripts": "^4.1.6",
+    "eslint": "^9.33.0",
+    "eslint-config-expo": "^9.2.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "expo": "~53.0.0",
+    "expo-module-scripts": "^4.1.6",
+    "prettier": "^3.6.2",
     "react-native": "0.79.1"
   },
   "peerDependencies": {

package/plugin/build/index.d.ts

@@ -1,3 +1,3 @@
-import type { LiveActivityConfigPlugin } from "./types";
+import type { LiveActivityConfigPlugin } from './types';
 declare const withWidgetsAndLiveActivities: LiveActivityConfigPlugin;
 export default withWidgetsAndLiveActivities;

package/plugin/build/index.js

@@ -1,13 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("expo/config-plugins");
 const withConfig_1 = require("./withConfig");
+const withPlist_1 = __importDefault(require("./withPlist"));
 const withPodfile_1 = require("./withPodfile");
-const withXcode_1 = require("./withXcode");
-const withWidgetExtensionEntitlements_1 = require("./withWidgetExtensionEntitlements");
 const withPushNotifications_1 = require("./withPushNotifications");
+const withWidgetExtensionEntitlements_1 = require("./withWidgetExtensionEntitlements");
+const withXcode_1 = require("./withXcode");
 const withWidgetsAndLiveActivities = (config, props) => {
-    const deploymentTarget = "16.2";
+    const deploymentTarget = '16.2';
     const targetName = `${config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(config.name)}LiveActivity`;
     const bundleIdentifier = `${config.ios?.bundleIdentifier}.${targetName}`;
     config.ios = {
@@ -19,6 +23,7 @@ const withWidgetsAndLiveActivities = (config, props) => {
         },
     };
     config = (0, config_plugins_1.withPlugins)(config, [
+        [withPlist_1.default, { targetName }],
         [
             withXcode_1.withXcode,
             {

package/plugin/build/lib/getWidgetExtensionEntitlements.d.ts

@@ -1,3 +1,7 @@
-import { ExportedConfig, InfoPlist } from "@expo/config-plugins";
-export declare function getWidgetExtensionEntitlements(iosConfig: ExportedConfig["ios"], {}: {}): InfoPlist;
+import { ExportedConfig, InfoPlist } from '@expo/config-plugins';
+interface Options {
+    groupIdentifier?: string;
+}
+export declare function getWidgetExtensionEntitlements(_iosConfig: ExportedConfig['ios'], _options?: Options | undefined): InfoPlist;
 export declare function addApplicationGroupsEntitlement(entitlements: InfoPlist, groupIdentifier?: string): InfoPlist;
+export {};

package/plugin/build/lib/getWidgetExtensionEntitlements.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWidgetExtensionEntitlements = getWidgetExtensionEntitlements;
 exports.addApplicationGroupsEntitlement = addApplicationGroupsEntitlement;
-function getWidgetExtensionEntitlements(iosConfig, {}) {
+function getWidgetExtensionEntitlements(_iosConfig, _options = {}) {
     const entitlements = {};
     addApplicationGroupsEntitlement(entitlements);
     return entitlements;

package/plugin/build/lib/getWidgetFiles.js

@@ -40,13 +40,13 @@ const path = __importStar(require("path"));
 function getWidgetFiles(targetPath) {
     let packagePath;
     try {
-        packagePath = path.dirname(require.resolve("expo-live-activity/package.json"));
+        packagePath = path.dirname(require.resolve('expo-live-activity/package.json'));
     }
     catch {
-        console.log("Building for example app");
+        console.log('Building for example app');
     }
-    const liveActivityFilesPath = path.join(packagePath ? packagePath : "..", "/ios-files");
-    const imageAssetsPath = "./assets/liveActivity";
+    const liveActivityFilesPath = path.join(packagePath ? packagePath : '..', '/ios-files');
+    const imageAssetsPath = './assets/liveActivity';
     const widgetFiles = {
         swiftFiles: [],
         entitlementFiles: [],
@@ -61,20 +61,20 @@ function getWidgetFiles(targetPath) {
     if (fs.lstatSync(liveActivityFilesPath).isDirectory()) {
         const files = fs.readdirSync(liveActivityFilesPath);
         files.forEach((file) => {
-            const fileExtension = file.split(".").pop();
-            if (fileExtension === "swift") {
+            const fileExtension = file.split('.').pop();
+            if (fileExtension === 'swift') {
                 widgetFiles.swiftFiles.push(file);
             }
-            else if (fileExtension === "entitlements") {
+            else if (fileExtension === 'entitlements') {
                 widgetFiles.entitlementFiles.push(file);
             }
-            else if (fileExtension === "plist") {
+            else if (fileExtension === 'plist') {
                 widgetFiles.plistFiles.push(file);
             }
-            else if (fileExtension === "xcassets") {
+            else if (fileExtension === 'xcassets') {
                 widgetFiles.assetDirectories.push(file);
             }
-            else if (fileExtension === "intentdefinition") {
+            else if (fileExtension === 'intentdefinition') {
                 widgetFiles.intentFiles.push(file);
             }
             else {
@@ -83,6 +83,7 @@ function getWidgetFiles(targetPath) {
         });
     }
     // Copy files
+    ;
     [
         ...widgetFiles.swiftFiles,
         ...widgetFiles.entitlementFiles,
@@ -94,11 +95,11 @@ function getWidgetFiles(targetPath) {
         copyFileSync(source, targetPath);
     });
     // Copy assets directory
-    const imagesXcassetsSource = path.join(liveActivityFilesPath, "Assets.xcassets");
+    const imagesXcassetsSource = path.join(liveActivityFilesPath, 'Assets.xcassets');
     copyFolderRecursiveSync(imagesXcassetsSource, targetPath);
     // Move images to assets directory
     if (fs.existsSync(imageAssetsPath) && fs.lstatSync(imageAssetsPath).isDirectory()) {
-        const imagesXcassetsTarget = path.join(targetPath, "Assets.xcassets");
+        const imagesXcassetsTarget = path.join(targetPath, 'Assets.xcassets');
         const files = fs.readdirSync(imageAssetsPath);
         files.forEach((file) => {
             if (path.extname(file).match(/\.(png|jpg|jpeg)$/)) {
@@ -116,13 +117,13 @@ function getWidgetFiles(targetPath) {
                     images: [
                         {
                             filename: file,
-                            idiom: "universal"
-                        }
+                            idiom: 'universal',
+                        },
                     ],
                     info: {
-                        author: "xcode",
-                        version: 1
-                    }
+                        author: 'xcode',
+                        version: 1,
+                    },
                 };
                 fs.writeFileSync(path.join(imageSetDir, 'Contents.json'), JSON.stringify(contentsJson, null, 2));
             }

package/plugin/build/types.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from "@expo/config-plugins";
+import { ConfigPlugin } from '@expo/config-plugins';
 interface ConfigPluginProps {
     enablePushNotifications?: boolean;
 }

package/plugin/build/withConfig.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from "@expo/config-plugins";
+import { ConfigPlugin } from '@expo/config-plugins';
 export declare const withConfig: ConfigPlugin<{
     bundleIdentifier: string;
     targetName: string;