Merge pull request #8 from vickiwong85/package-upgrades

upgrade packages and remove ios/android builds

.gitignore

@@ -14,68 +14,50 @@ npm-debug.*
 web-build/
 .vscode
 coverage
+ios/
+android/
 
 # macOS
 .DS_Store
 
 
-# @generated expo-cli sync-e7dcf75f4e856f7b6f3239b3f3a7dd614ee755a8
+# @generated expo-cli sync-b5df6a44d8735348b729920a7406b633cfb74d4c
 # The following patterns were generated by expo-cli
 
-# OSX
-#
-.DS_Store
+# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
 
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-project.xcworkspace
+# dependencies
+node_modules/
 
-# Android/IntelliJ
-#
-build/
-.idea
-.gradle
-local.properties
-*.iml
-*.hprof
+# Expo
+.expo/
+dist/
+web-build/
 
-# node.js
-#
-node_modules/
-npm-debug.log
-yarn-error.log
+# Native
+*.orig.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
+# Metro
+.metro-health-check*
 
-# Bundle artifacts
-*.jsbundle
+# debug
+npm-debug.*
+yarn-debug.*
+yarn-error.*
 
-# CocoaPods
-/ios/Pods/
+# macOS
+.DS_Store
+*.pem
 
-# Expo
-.expo/
-web-build/
-dist/
+# local env files
+.env*.local
+
+# typescript
+*.tsbuildinfo
 
 # @end expo-cli

README.md

@@ -7,6 +7,18 @@ A React Native app demonstrating HEMS API interactions.
 yarn
 ```
 
+#### Build App Locally
+Android:
+```
+yarn run android
+eas build --platform android --local
+```
+iOS:
+```
+yarn run ios
+eas build --platform ios --local
+```
+
 #### Run App Locally
 ```
 yarn start
@@ -16,4 +28,4 @@ yarn start
 You'll need to be authenticated with eas - see the [eas build documentation](https://docs.expo.dev/build/introduction/) for more detail
 ```
 eas build --platform all --profile acceptance --non-interactive
-```
+```

app.json

@@ -1,40 +1,46 @@
-{
-  "expo": {
-    "name": "Connecting MHA",
-    "slug": "connecting-mha-app",
-    "version": "0.0.7",
-    "orientation": "portrait",
-    "owner": "ace-iot",
-    "icon": "./assets/icon.png",
-    "privacy": "public",
-    "splash": {
-      "image": "./assets/splash.png",
-      "resizeMode": "cover",
-      "backgroundColor": "#170B47"
-    },
-    "updates": {
-      "fallbackToCacheTimeout": 0
-    },
-    "assetBundlePatterns": ["**/*"],
-    "ios": {
-      "supportsTablet": true,
-      "bundleIdentifier": "com.aceiotsolutions.connecting-mha-app"
-    },
-    "android": {
-      "adaptiveIcon": {
-        "foregroundImage": "./assets/icon.adaptive.foreground.png",
-        "backgroundImage": "./assets/icon.adaptive.background.png"
-      },
-      "versionCode": 7,
-      "package": "com.aceiotsolutions.connecting_mha_app"
-    },
-    "web": {
-      "favicon": "./assets/favicon.png"
-    },
-    "extra": {
-      "eas": {
-        "projectId": "b4debb26-532a-47f3-8a70-aaac03231111"
-      }
-    }
-  }
-}
+{
+  "expo": {
+    "name": "Connecting MHA",
+    "slug": "connecting-mha-app",
+    "version": "0.0.7",
+    "orientation": "portrait",
+    "owner": "ace-iot",
+    "icon": "./assets/icon.png",
+    "privacy": "public",
+    "splash": {
+      "image": "./assets/splash.png",
+      "resizeMode": "cover",
+      "backgroundColor": "#170B47"
+    },
+    "updates": {
+      "fallbackToCacheTimeout": 0
+    },
+    "assetBundlePatterns": [
+      "**/*"
+    ],
+    "ios": {
+      "supportsTablet": true,
+      "bundleIdentifier": "com.aceiotsolutions.connecting-mha-app"
+    },
+    "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/icon.adaptive.foreground.png",
+        "backgroundImage": "./assets/icon.adaptive.background.png"
+      },
+      "versionCode": 7,
+      "package": "com.aceiotsolutions.connecting_mha_app"
+    },
+    "web": {
+      "favicon": "./assets/favicon.png"
+    },
+    "extra": {
+      "eas": {
+        "projectId": "b4debb26-532a-47f3-8a70-aaac03231111"
+      }
+    },
+    "plugins": [
+      "expo-font",
+      "expo-localization"
+    ]
+  }
+}

components/DismissableSwipeResponder.tsx

@@ -8,6 +8,7 @@ import {
   PanGestureHandlerStateChangeEvent,
   PanGestureHandlerEventPayload,
   GestureEvent,
+  GestureHandlerRootView,
 } from "react-native-gesture-handler";
 import Animated, { withTiming, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { MainNavigationProps } from "../types";
@@ -48,10 +49,12 @@ export function DismissableSwipeResponder({ children }: { children: React.ReactN
   };
 
   return (
-    <PanGestureHandler onGestureEvent={onGesture} onHandlerStateChange={onGestureStateChange}>
-      <View style={{ flex: 1, backgroundColor: theme.background }}>
-        <Animated.View style={[{ flex: 1 }, animatedStyle]}>{children}</Animated.View>
-      </View>
-    </PanGestureHandler>
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <PanGestureHandler onGestureEvent={onGesture} onHandlerStateChange={onGestureStateChange}>
+        <View style={{ flex: 1, backgroundColor: theme.background }}>
+          <Animated.View style={[{ flex: 1 }, animatedStyle]}>{children}</Animated.View>
+        </View>
+      </PanGestureHandler>
+    </GestureHandlerRootView>
   );
 }

components/NavigationSwipeResponder.tsx

@@ -7,6 +7,7 @@ import {
   PanGestureHandlerStateChangeEvent,
   PanGestureHandlerEventPayload,
   GestureEvent,
+  GestureHandlerRootView,
 } from "react-native-gesture-handler";
 import Animated, { withTiming, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { DeviceNavigationProps, DeviceScreenRouteProps } from "../types";
@@ -78,10 +79,12 @@ export function NavigationSwipeResponder({ children }: { children: React.ReactNo
   }
 
   return (
-    <PanGestureHandler onGestureEvent={onGesture} onHandlerStateChange={onGestureStateChange}>
-      <View style={{ flex: 1, backgroundColor: theme.background }}>
-        <Animated.View style={[{ flex: 1 }, animatedStyle]}>{children}</Animated.View>
-      </View>
-    </PanGestureHandler>
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <PanGestureHandler onGestureEvent={onGesture} onHandlerStateChange={onGestureStateChange}>
+        <View style={{ flex: 1, backgroundColor: theme.background }}>
+          <Animated.View style={[{ flex: 1 }, animatedStyle]}>{children}</Animated.View>
+        </View>
+      </PanGestureHandler>
+    </GestureHandlerRootView>
   );
 }

ios.bak/.xcode.env.local

@@ -0,0 +1 @@
+export NODE_BINARY="/opt/homebrew/Cellar/node/21.6.1/bin/node"