Prepublish cleanup

Author: robertherber

example/App.tsx

@@ -106,7 +106,7 @@ export default function App() {
 
         <Button title="Get events" onPress={refreshEvents} />
 
-        <ReactNativeDeviceActivity.ReactNativeDeviceActivityView
+        <ReactNativeDeviceActivity.DeviceActivitySelectionView
           style={{
             width: 200,
             height: 200,
@@ -135,7 +135,7 @@ export default function App() {
             style={{ backgroundColor: "green", height: 100 }}
             pointerEvents="none"
           />
-        </ReactNativeDeviceActivity.ReactNativeDeviceActivityView>
+        </ReactNativeDeviceActivity.DeviceActivitySelectionView>
         <Text>{JSON.stringify(largestEvent, null, 2)}</Text>
       </View>
     ),

expo-module.config.json

@@ -2,8 +2,5 @@
   "platforms": ["ios"],
   "ios": {
     "modules": ["ReactNativeDeviceActivityModule"]
-  },
-  "android": {
-    "modules": ["expo.modules.deviceactivity.ReactNativeDeviceActivityModule"]
   }
 }

ios/ReactNativeDeviceActivityModule.swift

@@ -147,10 +147,7 @@ class Hello {
     registerListener(name: "eventDidReachThreshold")
     registerListener(name: "intervalWillStartWarning")
     registerListener(name: "intervalWillEndWarning")
-    registerListener(name: "eventWillReachThresholdWarning")
-    
-    
-    
+    registerListener(name: "eventWillReachThresholdWarning") 
   }
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-device-activity",
-  "version": "0.1.0",
-  "description": "Provide access to Apples DeviceActivity API",
+  "version": "0.0.1",
+  "description": "Provides access to Apples DeviceActivity API",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
@@ -12,9 +12,13 @@
     "prepare": "expo-module prepare",
     "prepublishOnly": "expo-module prepublishOnly",
     "expo-module": "expo-module",
-    "open:ios": "open -a \"Xcode\" example/ios",
-    "open:android": "open -a \"Android Studio\" example/android"
+    "open:ios": "open -a \"Xcode\" example/ios"
   },
+  "files": [
+    "build",
+    "ios",
+    "app.plugin.js"
+  ],
   "keywords": [
     "react-native",
     "expo",

src/DeviceActivitySelectionView.ios.tsx

@@ -0,0 +1,13 @@
+import { requireNativeViewManager } from "expo-modules-core";
+import * as React from "react";
+
+import { DeviceActivitySelectionViewProps } from "./ReactNativeDeviceActivity.types";
+
+const NativeView: React.ComponentType<DeviceActivitySelectionViewProps> =
+  requireNativeViewManager("ReactNativeDeviceActivity");
+
+export default function DeviceActivitySelectionView(
+  props: DeviceActivitySelectionViewProps
+) {
+  return <NativeView {...props} />;
+}

src/DeviceActivitySelectionView.tsx

@@ -0,0 +1,12 @@
+import * as React from "react";
+import { View } from "react-native";
+
+import { DeviceActivitySelectionViewProps } from "./ReactNativeDeviceActivity.types";
+
+export default function DeviceActivitySelectionView({
+  style,
+  children,
+  ...props
+}: DeviceActivitySelectionViewProps) {
+  return <View style={style}>{children}</View>;
+}

src/ReactNativeDeviceActivity.types.ts

@@ -1,40 +1,75 @@
 import { PropsWithChildren } from "react";
 import { NativeSyntheticEvent, StyleProp, ViewStyle } from "react-native";
 
-export type ChangeEventPayload = {
-  selection: Selection;
-};
-
 export type DeviceActivityMonitorEventPayload = {
-  eventName: string;
+  eventName:
+    | "intervalDidStart"
+    | "intervalDidEnd"
+    | "eventDidReachThreshold"
+    | "intervalWillStartWarning"
+    | "intervalWillEndWarning"
+    | "eventWillReachThresholdWarning";
 };
 
-type ActivityCategory = {
-  localizedDisplayName?: string;
-  token?: string;
+export type EventsLookup = Record<string, number>;
+
+export type DeviceActivitySelectionViewProps = PropsWithChildren<{
+  style: StyleProp<ViewStyle>;
+  onSelectionChange?: (
+    selection: NativeSyntheticEvent<{ familyActivitySelection: string }>
+  ) => void;
+  familyActivitySelection?: string | null;
+}>;
+
+export type DateComponents = {
+  // calendar: Calendar?;
+  // timeZone: TimeZone?;
+  era?: number;
+  year?: number;
+  month?: number;
+  day?: number;
+  hour?: number;
+  minute?: number;
+  second?: number;
+  nanosecond?: number;
+  weekday?: number;
+  weekdayOrdinal?: number;
+  quarter?: number;
+  weekOfMonth?: number;
+  weekOfYear?: number;
+  yearForWeekOfYear?: number;
 };
 
-type Application = {
-  localizedDisplayName?: string;
-  token?: string;
-  bundleIdentifier?: string;
+export type DeviceActivitySchedule = {
+  intervalStart: DateComponents;
+  intervalEnd: DateComponents;
+  repeats: boolean;
+  warningTime?: DateComponents;
 };
 
-type WebDomain = {
-  domain?: string;
-  token?: string;
+export type FamilyActivitySelection = string;
+
+export type DeviceActivityEvent = {
+  familyActivitySelection: FamilyActivitySelection;
+  threshold: DateComponents;
+  eventName: string;
 };
 
-type Selection = {
-  categories: ActivityCategory[];
-  applications: Application[];
-  webDomains: WebDomain[];
+export type DeviceActivityEventRaw = Omit<
+  DeviceActivityEvent,
+  "familyActivitySelection"
+> & {
+  familyActivitySelectionIndex: number;
 };
 
-export type ReactNativeDeviceActivityViewProps = PropsWithChildren<{
-  style: StyleProp<ViewStyle>;
-  onSelectionChange?: (
-    selection: NativeSyntheticEvent<{ familyActivitySelection: string }>
+export type ReactNativeDeviceActivityNativeModule = {
+  requestAuthorization: () => PromiseLike<void> | void;
+  getEvents: () => EventsLookup;
+  stopMonitoring: () => void;
+  startMonitoring: (
+    activityName: string,
+    deviceActivitySchedule: DeviceActivitySchedule,
+    deviceActivityEvents: DeviceActivityEventRaw[],
+    uniqueSelections: string[]
   ) => void;
-  familyActivitySelection?: string | null;
-}>;
+};

src/ReactNativeDeviceActivityModule.ios.ts

@@ -0,0 +1,5 @@
+import { requireNativeModule } from "expo-modules-core";
+
+// It loads the native module object from the JSI or falls back to
+// the bridge module (from NativeModulesProxy) if the remote debugger is on.
+export default requireNativeModule("ReactNativeDeviceActivity");

src/ReactNativeDeviceActivityModule.ts

@@ -1,5 +1,23 @@
-import { requireNativeModule } from 'expo-modules-core';
+import { ProxyNativeModule } from "expo-modules-core";
 
-// It loads the native module object from the JSI or falls back to
-// the bridge module (from NativeModulesProxy) if the remote debugger is on.
-export default requireNativeModule('ReactNativeDeviceActivity');
+import type { ReactNativeDeviceActivityNativeModule } from "./ReactNativeDeviceActivity.types";
+
+const warnText = "[react-native-device-activity] Only available on iOS";
+
+const warnFn = () => {
+  console.warn(warnText);
+};
+
+const mockModule: ReactNativeDeviceActivityNativeModule & ProxyNativeModule = {
+  requestAuthorization: warnFn,
+  getEvents: () => {
+    console.warn(warnText);
+    return {};
+  },
+  startMonitoring: warnFn,
+  stopMonitoring: warnFn,
+  addListener: warnFn,
+  removeListeners: warnFn,
+};
+
+export default mockModule;

src/ReactNativeDeviceActivityModule.web.ts

@@ -6,44 +6,17 @@ import {
 
 // Import the native module. On web, it will be resolved to ReactNativeDeviceActivity.web.ts
 // and on native platforms to ReactNativeDeviceActivity.ts
+import DeviceActivitySelectionView from "./DeviceActivitySelectionView";
 import {
-  ChangeEventPayload,
-  ReactNativeDeviceActivityViewProps,
+  DeviceActivityEvent,
+  DeviceActivityEventRaw,
+  DeviceActivityMonitorEventPayload,
+  DeviceActivitySchedule,
+  DeviceActivitySelectionViewProps,
+  EventsLookup,
+  FamilyActivitySelection,
 } from "./ReactNativeDeviceActivity.types";
 import ReactNativeDeviceActivityModule from "./ReactNativeDeviceActivityModule";
-import ReactNativeDeviceActivityView from "./ReactNativeDeviceActivityView";
-
-type EventsLookup = Record<string, number>;
-
-type DateComponents = {
-  // calendar: Calendar?;
-  // timeZone: TimeZone?;
-  era?: number;
-  year?: number;
-  month?: number;
-  day?: number;
-  hour?: number;
-  minute?: number;
-  second?: number;
-  nanosecond?: number;
-  weekday?: number;
-  weekdayOrdinal?: number;
-  quarter?: number;
-  weekOfMonth?: number;
-  weekOfYear?: number;
-  yearForWeekOfYear?: number;
-};
-
-// Get the native constant value.
-export const PI = ReactNativeDeviceActivityModule.PI;
-
-export function hello(): string {
-  return ReactNativeDeviceActivityModule.hello();
-}
-
-export async function setValueAsync(value: string) {
-  return await ReactNativeDeviceActivityModule.setValueAsync(value);
-}
 
 export async function requestAuthorization(): Promise<void> {
   return await ReactNativeDeviceActivityModule.requestAuthorization();
@@ -53,28 +26,6 @@ export function getEvents(): EventsLookup {
   return ReactNativeDeviceActivityModule.getEvents();
 }
 
-type DeviceActivitySchedule = {
-  intervalStart: DateComponents;
-  intervalEnd: DateComponents;
-  repeats: boolean;
-  warningTime?: DateComponents;
-};
-
-type FamilyActivitySelection = string;
-
-export type DeviceActivityEvent = {
-  familyActivitySelection: FamilyActivitySelection;
-  threshold: DateComponents;
-  eventName: string;
-};
-
-export type DeviceActivityEventRaw = Omit<
-  DeviceActivityEvent,
-  "familyActivitySelection"
-> & {
-  familyActivitySelectionIndex: number;
-};
-
 function convertDeviceActivityEvents(
   events: DeviceActivityEvent[]
 ): [DeviceActivityEventRaw[], FamilyActivitySelection[]] {
@@ -131,23 +82,16 @@ const emitter = new EventEmitter(
     NativeModulesProxy.ReactNativeDeviceActivity
 );
 
-export function addSelectionChangeListener(
-  listener: (event: ChangeEventPayload) => void
-): Subscription {
-  return emitter.addListener<ChangeEventPayload>("onSelectionChange", listener);
-}
-
 export function addEventReceivedListener(
-  listener: (event: ChangeEventPayload) => void
+  listener: (event: DeviceActivityMonitorEventPayload) => void
 ): Subscription {
-  return emitter.addListener<ChangeEventPayload>(
+  return emitter.addListener<DeviceActivityMonitorEventPayload>(
     "onDeviceActivityMonitorEvent",
     listener
   );
 }
 
 export {
-  ReactNativeDeviceActivityView,
-  ReactNativeDeviceActivityViewProps,
-  ChangeEventPayload,
+  DeviceActivitySelectionView,
+  DeviceActivitySelectionViewProps as ReactNativeDeviceActivityViewProps,
 };

src/ReactNativeDeviceActivityView.tsx

@@ -11,3 +11,4 @@
 	</dict>
 </dict>
 </plist>
+