From 82069f3bef8bf8bc014e56f044f25e567a3501e5 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 31 Jan 2024 18:40:12 -0700
Subject: [PATCH 1/6] Use react-native-vision-camera submodule

---
 .editorconfig              | 9 +++++++++
 .gitmodules                | 3 +++
 package.json               | 1 -
 react-native-vision-camera | 1 +
 tsconfig.json              | 8 +++++++-
 yarn.lock                  | 5 -----
 6 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .gitmodules
 create mode 160000 react-native-vision-camera

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..c4bd5fb
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*.json]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size =  2
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c48e222
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "react-native-vision-camera"]
+	path = react-native-vision-camera
+	url = ssh://gitea@dev.railbird.ai:1123/railbird/react-native-vision-camera.git
diff --git a/package.json b/package.json
index 9c75b19..833af09 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "react-native-static-safe-area-insets": "^2.2.0",
     "react-native-svg": "13.9.0",
     "react-native-svg-charts": "^5.4.0",
-    "react-native-vision-camera": "^3.8.2",
     "typescript": "^5.3.3"
   },
   "devDependencies": {
diff --git a/react-native-vision-camera b/react-native-vision-camera
new file mode 160000
index 0000000..fb42545
--- /dev/null
+++ b/react-native-vision-camera
@@ -0,0 +1 @@
+Subproject commit fb425458904eb240466768be08352973fd2f78d8
diff --git a/tsconfig.json b/tsconfig.json
index 0e6371f..d423055 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,10 @@
 {
-  "compilerOptions": {},
+  "compilerOptions": {
+    "paths": {
+      "react-native-vision-camera": [
+        "./react-native-vision-camera/package/src/index"
+      ]
+    }
+  },
   "extends": "expo/tsconfig.base"
 }
diff --git a/yarn.lock b/yarn.lock
index a31f8e8..8d54cfb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8417,11 +8417,6 @@ react-native-svg@^6.2.1:
     lodash "^4.16.6"
     pegjs "^0.10.0"
 
-react-native-vision-camera@^3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/react-native-vision-camera/-/react-native-vision-camera-3.8.2.tgz#f4f75f84c6a19e1c3474ddc0f7f785b5a526739b"
-  integrity sha512-MY39l2e3hNRPUefn2JPShOFExcw0PblbAcUGvJrIfS9pMzdIyceo0umRAx8lOGXzDUAdb+xy/tFWb8zGxKimCQ==
-
 react-native@*:
   version "0.73.2"
   resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.73.2.tgz#74ee163c8189660d41d1da6560411da7ce41a608"

From 85b1cb8759892b22d2c74c0c504e292466167fb1 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 31 Jan 2024 22:45:00 -0700
Subject: [PATCH 2/6] Close

---
 android/settings.gradle                |   5 ++
 app.json                               |   4 +-
 babel.config.js                        |  48 +++++++----
 component/video/camera.tsx             | 113 +++++++++++++++----------
 flake.nix                              | 112 ++++++++++++------------
 ios/Railbird.xcodeproj/project.pbxproj |   4 +-
 metro.config.js                        |  56 ++++++++++--
 package.json                           |   6 +-
 tsconfig.json                          |  24 +++++-
 yarn.lock                              |  55 ++++++++++++
 10 files changed, 301 insertions(+), 126 deletions(-)

diff --git a/android/settings.gradle b/android/settings.gradle
index 2998473..a002532 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,10 +1,15 @@
 rootProject.name = 'Railbird'
 
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle");
+
 useExpoModules()
 
 apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
+
 applyNativeModulesSettingsGradle(settings)
 
 include ':app'
 includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json')"].execute(null, rootDir).text.trim()).getParentFile())
+
+include ':react-native-vision-camera'
+project(':react-native-vision-camera').projectDir = new File(rootProject.projectDir, '../react-native-vision-camera/package/android')
diff --git a/app.json b/app.json
index e9a87f7..7766581 100644
--- a/app.json
+++ b/app.json
@@ -11,9 +11,7 @@
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
-    "assetBundlePatterns": [
-      "**/*"
-    ],
+    "assetBundlePatterns": ["**/*"],
     "plugins": [
       "@react-native-firebase/app",
       "@react-native-firebase/auth",
diff --git a/babel.config.js b/babel.config.js
index cf6bd4c..2f02724 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,16 +1,34 @@
-module.exports = function(api) {
-    api.cache(true);
-    return {
-        presets: ["babel-preset-expo"],
-        plugins: [
-            ["module:react-native-dotenv", {
-                "moduleName": "@env",
-                "path": ".env",
-                "safe": false,
-                "allowUndefined": true,
-                "verbose": false,
-            }],
-            'react-native-reanimated/plugin',
-        ],
-    };
+const path = require("path");
+const pak = require("./react-native-vision-camera/package/package.json");
+
+module.exports = function (api) {
+  api.cache(true);
+  return {
+    presets: ["babel-preset-expo"],
+    plugins: [
+      [
+        "module:react-native-dotenv",
+        {
+          moduleName: "@env",
+          path: ".env",
+          safe: false,
+          allowUndefined: true,
+          verbose: false,
+        },
+      ],
+      "react-native-reanimated/plugin",
+      [
+        "module-resolver",
+        {
+          alias: {
+            [pak.name]: path.join(
+              __dirname,
+              "./react-native-vision-camera/package",
+              pak.source,
+            ),
+          },
+        },
+      ],
+    ],
+  };
 };
diff --git a/component/video/camera.tsx b/component/video/camera.tsx
index ce1abf1..45f10a2 100644
--- a/component/video/camera.tsx
+++ b/component/video/camera.tsx
@@ -1,57 +1,68 @@
-import React, { useCallback, useRef, useState } from 'react'
-import { Button, StyleSheet, Text, View } from 'react-native'
-import { Camera, useCameraPermission, useCameraDevice, useCameraFormat, PhotoFile, VideoFile, CameraRuntimeError, Orientation } from 'react-native-vision-camera'
-import { RecordingButton } from './capture-button'
-import { useIsForeground } from './is-foreground'
+import React, { useCallback, useRef, useState } from "react";
+import { Button, StyleSheet, Text, View } from "react-native";
+import {
+  Camera,
+  useCameraPermission,
+  useCameraDevice,
+  useCameraFormat,
+  PhotoFile,
+  VideoFile,
+  CameraRuntimeError,
+  Orientation,
+} from "react-native-vision-camera";
+import { RecordingButton } from "./capture-button";
+import { useIsForeground } from "./is-foreground";
 
 export default function CameraScreen(): React.ReactElement {
-  const camera = useRef<Camera>(null)
-  const { hasPermission, requestPermission } = useCameraPermission()
-  const [isCameraInitialized, setIsCameraInitialized] = useState<boolean>(false)
+  const camera = useRef<Camera>(null);
+  const { hasPermission, requestPermission } = useCameraPermission();
+  const [isCameraInitialized, setIsCameraInitialized] =
+    useState<boolean>(false);
 
-  const isForeground: boolean = useIsForeground()
-  const isActive: boolean = isForeground // Should be combined with isFocused hook
+  const isForeground: boolean = useIsForeground();
+  const isActive: boolean = isForeground; // Should be combined with isFocused hook
 
   const onError = useCallback((error: CameraRuntimeError) => {
-    console.error(error)
-  }, [])
+    console.error(error);
+  }, []);
 
   const onInitialized = useCallback(() => {
-    console.log('Camera initialized!')
-    setIsCameraInitialized(true)
-  }, [])
+    console.log("Camera initialized!");
+    setIsCameraInitialized(true);
+  }, []);
 
-  const onMediaCaptured = useCallback(
-    (media: PhotoFile | VideoFile) => {
-      console.log(`Media captured! ${JSON.stringify(media)}`)
-    },
-    [],
-  )
+  const onMediaCaptured = useCallback((media: PhotoFile | VideoFile) => {
+    console.log(`Media captured! ${JSON.stringify(media)}`);
+  }, []);
 
   if (!hasPermission) {
-    requestPermission()
+    requestPermission();
     // Error handling in case they refuse to give permission
   }
 
-  const device = useCameraDevice('back')
+  const device = useCameraDevice("back");
   const format = useCameraFormat(device, [
     { videoResolution: { width: 3048, height: 2160 } },
-    { fps: 60 }
-  ]) // this sets as a target
+    { fps: 60 },
+  ]); // this sets as a target
 
   //Orientation detection
-  const [orientation, setOrientation] = useState<Orientation>('portrait');
+  const [orientation, setOrientation] = useState<Orientation>("portrait");
 
   const toggleOrientation = () => {
-    setOrientation(currentOrientation => 
-      currentOrientation === 'landscape-left' ? 'portrait' : 'landscape-left' // Can adjust this and the type to match what we want
+    setOrientation(
+      (currentOrientation) =>
+        currentOrientation === "landscape-left" ? "portrait" : "landscape-left", // Can adjust this and the type to match what we want
     );
   };
 
   if (device === null) {
-    return <Text>Camera not available. Does user have permissions:  {hasPermission}</Text>
+    return (
+      <Text>
+        Camera not available. Does user have permissions: {hasPermission}
+      </Text>
+    );
   }
-  
   return (
     hasPermission && (
       <View style={styles.container}>
@@ -67,12 +78,22 @@ export default function CameraScreen(): React.ReactElement {
           isActive={isActive}
         />
         <RecordingButton
-          style={[styles.captureButton, orientation === 'portrait' ? styles.portrait : styles.landscape ]}
+          style={[
+            styles.captureButton,
+            orientation === "portrait" ? styles.portrait : styles.landscape,
+          ]}
           camera={camera}
           onMediaCaptured={onMediaCaptured}
           enabled={isCameraInitialized}
         />
-        <View style={[styles.button, orientation === 'portrait' ? styles.togglePortrait : styles.toggleLandscape ]}>
+        <View
+          style={[
+            styles.button,
+            orientation === "portrait"
+              ? styles.togglePortrait
+              : styles.toggleLandscape,
+          ]}
+        >
           <Button
             title="Toggle Orientation"
             onPress={toggleOrientation}
@@ -82,35 +103,35 @@ export default function CameraScreen(): React.ReactElement {
         </View>
       </View>
     )
-  )
+  );
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: 'black',
+    backgroundColor: "black",
   },
   captureButton: {
-    position: 'absolute',
-    alignSelf: 'center',
+    position: "absolute",
+    alignSelf: "center",
   },
   button: {
-    position: 'absolute',
-    alignSelf: 'center',
+    position: "absolute",
+    alignSelf: "center",
   },
   togglePortrait: {
     bottom: 110, // needs refined
   },
   toggleLandscape: {
-    transform: [{ rotate: '90deg' }],
-    bottom: '43%', // Should come from SafeAreaProvider, hardcoded right now, should roughly appear above the button
-    left: 50 // needs refined
+    transform: [{ rotate: "90deg" }],
+    bottom: "43%", // Should come from SafeAreaProvider, hardcoded right now, should roughly appear above the button
+    left: 50, // needs refined
   },
   portrait: {
-    bottom: 20 // needs refined
+    bottom: 20, // needs refined
   },
   landscape: {
-    bottom: '40%', // Should come from SafeAreaProvider
-    left: 20 // needs refined
-  }
-})
\ No newline at end of file
+    bottom: "40%", // Should come from SafeAreaProvider
+    left: 20, // needs refined
+  },
+});
diff --git a/flake.nix b/flake.nix
index ccc5dc2..7c3b4c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,56 +11,64 @@
       url = "github:tadfisher/android-nixpkgs";
     };
   };
-  outputs = { self, nixpkgs, flake-utils, gitignore, android-nixpkgs, ... }:
-  flake-utils.lib.eachDefaultSystem (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-    nodejs = pkgs.nodejs-18_x;
-    # NOTE: this does not work
-    appBuild = pkgs.stdenv.mkDerivation {
-      name = "example-ts-node";
-      version = "0.1.0";
-      src = gitignore.lib.gitignoreSource ./.; # uses the gitignore in the repo to only copy files git would see
-      buildInputs = [ nodejs ];
-      # https://nixos.org/manual/nixpkgs/stable/#sec-stdenv-phases
-      buildPhase = ''
-        # each phase has pre/postHooks. When you make your own phase be sure to still call the hooks
-        runHook preBuild
-        npm ci
-        npm run build
-        runHook postBuild
-      '';
-      installPhase = ''
-        runHook preInstall
-        cp -r node_modules $out/node_modules
-        cp package.json $out/package.json
-        cp -r dist $out/dist
-        runHook postInstall
-      '';
-    };
-    android-sdk = android-nixpkgs.sdk.${system} (sdkPkgs: with sdkPkgs; [
-      cmdline-tools-latest
-      build-tools-30-0-3
-      build-tools-33-0-0
-      platform-tools
-      platforms-android-33
-      emulator
-      ndk-23-1-7779620
-      cmake-3-22-1
-      system-images-android-33-google-apis-x86-64
-      system-images-android-34-google-apis-x86-64
-    ]);
-  in with pkgs; {
-    defaultPackage = appBuild;
-    devShell = mkShell {
-      buildInputs = [ nodejs yarn watchman gradle_7 alejandra nodePackages.prettier ];
-      ANDROID_SDK_BIN = android-sdk;
-      shellHook = ''
-        export JAVA_HOME=${pkgs.jdk17.home}
-        source ${android-sdk.out}/nix-support/setup-hook
-        export PATH=${android-sdk}/bin:$PATH
-        ORG_GRADLE_PROJECT_ANDROID_HOME="$ANDROID_HOME"
-      '';
-    };
-  });
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    gitignore,
+    android-nixpkgs,
+    ...
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {inherit system;};
+      nodejs = pkgs.nodejs-18_x;
+      # NOTE: this does not work
+      appBuild = pkgs.stdenv.mkDerivation {
+        name = "example-ts-node";
+        version = "0.1.0";
+        src = gitignore.lib.gitignoreSource ./.; # uses the gitignore in the repo to only copy files git would see
+        buildInputs = [nodejs];
+        # https://nixos.org/manual/nixpkgs/stable/#sec-stdenv-phases
+        buildPhase = ''
+          # each phase has pre/postHooks. When you make your own phase be sure to still call the hooks
+          runHook preBuild
+          npm ci
+          npm run build
+          runHook postBuild
+        '';
+        installPhase = ''
+          runHook preInstall
+          cp -r node_modules $out/node_modules
+          cp package.json $out/package.json
+          cp -r dist $out/dist
+          runHook postInstall
+        '';
+      };
+      android-sdk = android-nixpkgs.sdk.${system} (sdkPkgs:
+        with sdkPkgs; [
+          cmdline-tools-latest
+          build-tools-30-0-3
+          build-tools-33-0-0
+          platform-tools
+          platforms-android-33
+          emulator
+          ndk-23-1-7779620
+          cmake-3-22-1
+          system-images-android-33-google-apis-x86-64
+          system-images-android-34-google-apis-x86-64
+        ]);
+    in
+      with pkgs; {
+        defaultPackage = appBuild;
+        devShell = mkShell {
+          buildInputs = [nodejs yarn watchman gradle_7 alejandra nodePackages.prettier];
+          ANDROID_SDK_BIN = android-sdk;
+          shellHook = ''
+            export JAVA_HOME=${pkgs.jdk17.home}
+            source ${android-sdk.out}/nix-support/setup-hook
+            export PATH=${android-sdk}/bin:${android-sdk}/share/android-sdk/build-tools/33.0.0/:$PATH
+            ORG_GRADLE_PROJECT_ANDROID_HOME="$ANDROID_HOME"
+          '';
+        };
+      });
 }
diff --git a/ios/Railbird.xcodeproj/project.pbxproj b/ios/Railbird.xcodeproj/project.pbxproj
index 48d621a..f9d2fb7 100644
--- a/ios/Railbird.xcodeproj/project.pbxproj
+++ b/ios/Railbird.xcodeproj/project.pbxproj
@@ -384,7 +384,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = ai.railbird.railbird;
-				PRODUCT_NAME = Railbird;
+				PRODUCT_NAME = "Railbird";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Railbird/Railbird-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -419,7 +419,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = ai.railbird.railbird;
-				PRODUCT_NAME = Railbird;
+				PRODUCT_NAME = "Railbird";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Railbird/Railbird-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/metro.config.js b/metro.config.js
index 07c9fce..f8df3d0 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -1,7 +1,53 @@
-// Learn more https://docs.expo.io/guides/customizing-metro
-const { getDefaultConfig } = require('expo/metro-config');
+const { getDefaultConfig } = require("expo/metro-config");
+const { mergeConfig } = require("@react-native/metro-config");
+const path = require("path");
+const escape = require("escape-string-regexp");
+const exclusionList = require("metro-config/src/defaults/exclusionList");
+const pak = require("./react-native-vision-camera/package/package.json");
 
-/** @type {import('expo/metro-config').MetroConfig} */
-const config = getDefaultConfig(__dirname);
+const root = path.resolve(__dirname, "./react-native-vision-camera/package");
+const modules = Object.keys({ ...pak.peerDependencies });
+const localPackagePath = path.resolve(
+  __dirname,
+  "./react-native-vision-camera/package/src/index",
+);
 
-module.exports = config;
+/**
+ * Metro configuration
+ * https://facebook.github.io/metro/docs/configuration
+ *
+ * @type {import('metro-config').MetroConfig}
+ */
+const config = {
+  watchFolders: [root],
+
+  // We need to make sure that only one version is loaded for peerDependencies
+  // So we block them at the root, and alias them to the versions in example's node_modules
+  resolver: {
+    blacklistRE: exclusionList(
+      modules.map(
+        (m) =>
+          new RegExp(`^${escape(path.join(root, "node_modules", m))}\\/.*$`),
+      ),
+    ),
+
+    extraNodeModules: modules.reduce(
+      (acc, name) => {
+        acc[name] = path.join(__dirname, "node_modules", name);
+        return acc;
+      },
+      { "react-native-vision-camera": localPackagePath },
+    ),
+  },
+
+  transformer: {
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: true,
+      },
+    }),
+  },
+};
+
+module.exports = mergeConfig(getDefaultConfig(__dirname), config);
diff --git a/package.json b/package.json
index 833af09..fb8372c 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "cp .env.development .env && expo start",
-    "android": "expo start --android",
-    "ios": "expo start --ios",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
     "run:android": "expo run:android",
     "run:ios": "expo run:ios",
     "web": "expo start --web",
@@ -54,8 +54,10 @@
     "@babel/core": "^7.20.0",
     "@testing-library/jest-native": "^5.4.3",
     "@testing-library/react-native": "^12.4.3",
+    "@react-native/metro-config": "^0.72.9",
     "@types/d3-path": "^3.0.2",
     "@types/jest": "^29.5.11",
+    "metro-react-native-babel-preset": "^0.77.0",
     "@types/react-native-svg-charts": "^5.0.16",
     "eslint-config-prettier": "^9.1.0"
   },
diff --git a/tsconfig.json b/tsconfig.json
index d423055..5707cd6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,32 @@
 {
   "compilerOptions": {
+    "allowJs": false,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "react-native",
+    "lib": ["esnext"],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    "noStrictGenericChecks": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noUncheckedIndexedAccess": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "esnext",
+    "outDir": "lib",
     "paths": {
       "react-native-vision-camera": [
         "./react-native-vision-camera/package/src/index"
       ]
     }
   },
-  "extends": "expo/tsconfig.base"
+  "include": ["react-native-vision-camera/package/src", "."],
+  "exclude": ["node_modules"],
+  "extends": ["expo/tsconfig.base"]
 }
diff --git a/yarn.lock b/yarn.lock
index 8d54cfb..c66d27b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2487,6 +2487,16 @@
     hermes-parser "0.15.0"
     nullthrows "^1.1.1"
 
+"@react-native/metro-config@^0.72.9":
+  version "0.72.11"
+  resolved "https://registry.yarnpkg.com/@react-native/metro-config/-/metro-config-0.72.11.tgz#c775a22fbb138cedd4513ca46c06bfd6a9dad316"
+  integrity sha512-661EyQnDdVelyc0qP/ew7kKkGAh6N6KlkuPLC2SQ8sxaXskVU6fSuNlpLW4bUTBUDFKG8gEOU2hp6rzk4wQnGQ==
+  dependencies:
+    "@react-native/js-polyfills" "^0.72.1"
+    metro-config "0.76.8"
+    metro-react-native-babel-transformer "0.76.8"
+    metro-runtime "0.76.8"
+
 "@react-native/normalize-color@^2.0.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@react-native/normalize-color/-/normalize-color-2.1.0.tgz#939b87a9849e81687d3640c5efa2a486ac266f91"
@@ -7214,6 +7224,51 @@ metro-react-native-babel-preset@0.76.8:
     babel-plugin-transform-flow-enums "^0.0.2"
     react-refresh "^0.4.0"
 
+metro-react-native-babel-preset@^0.77.0:
+  version "0.77.0"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.77.0.tgz#47457eca8e36b77156afbe790247a70dbb40faaa"
+  integrity sha512-HPPD+bTxADtoE4y/4t1txgTQ1LVR6imOBy7RMHUsqMVTbekoi8Ph5YI9vKX2VMPtVWeFt0w9YnCSLPa76GcXsA==
+  dependencies:
+    "@babel/core" "^7.20.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
+    "@babel/plugin-proposal-class-properties" "^7.18.0"
+    "@babel/plugin-proposal-export-default-from" "^7.0.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.0"
+    "@babel/plugin-proposal-numeric-separator" "^7.0.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.20.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-default-from" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.18.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
+    "@babel/plugin-transform-arrow-functions" "^7.0.0"
+    "@babel/plugin-transform-async-to-generator" "^7.20.0"
+    "@babel/plugin-transform-block-scoping" "^7.0.0"
+    "@babel/plugin-transform-classes" "^7.0.0"
+    "@babel/plugin-transform-computed-properties" "^7.0.0"
+    "@babel/plugin-transform-destructuring" "^7.20.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.20.0"
+    "@babel/plugin-transform-function-name" "^7.0.0"
+    "@babel/plugin-transform-literals" "^7.0.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0"
+    "@babel/plugin-transform-parameters" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
+    "@babel/plugin-transform-runtime" "^7.0.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
+    "@babel/plugin-transform-spread" "^7.0.0"
+    "@babel/plugin-transform-sticky-regex" "^7.0.0"
+    "@babel/plugin-transform-typescript" "^7.5.0"
+    "@babel/plugin-transform-unicode-regex" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    babel-plugin-transform-flow-enums "^0.0.2"
+    react-refresh "^0.4.0"
+
 metro-react-native-babel-transformer@0.76.8:
   version "0.76.8"
   resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.8.tgz#c3a98e1f4cd5faf1e21eba8e004b94a90c4db69b"

From 3f43c8d946ed05c7a3639d1ef0f219773d6bfa92 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 31 Jan 2024 23:39:55 -0700
Subject: [PATCH 3/6] It works!!!

---
 android/app/build.gradle                                  | 4 +++-
 .../main/java/android/railbird/app/MainApplication.java   | 4 +++-
 android/build.gradle                                      | 1 +
 android/settings.gradle                                   | 8 +++++---
 package.json                                              | 1 +
 tsconfig.json                                             | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 489dcc7..dcc7a44 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -174,9 +174,11 @@ dependencies {
     } else {
         implementation jscFlavor
     }
+
+    implementation project(':react-native-vision-camera')
 }
 
 apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
 applyNativeModulesAppBuildGradle(project)
 
-apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+apply plugin: 'com.google.gms.google-services'
diff --git a/android/app/src/main/java/android/railbird/app/MainApplication.java b/android/app/src/main/java/android/railbird/app/MainApplication.java
index 38f84b5..7388170 100644
--- a/android/app/src/main/java/android/railbird/app/MainApplication.java
+++ b/android/app/src/main/java/android/railbird/app/MainApplication.java
@@ -15,6 +15,7 @@ import com.facebook.soloader.SoLoader;
 
 import expo.modules.ApplicationLifecycleDispatcher;
 import expo.modules.ReactNativeHostWrapper;
+import com.mrousavy.camera.CameraPackage;
 
 import java.util.List;
 
@@ -32,7 +33,8 @@ public class MainApplication extends Application implements ReactApplication {
         @SuppressWarnings("UnnecessaryLocalVariable")
         List<ReactPackage> packages = new PackageList(this).getPackages();
         // Packages that cannot be autolinked yet can be added manually here, for example:
-        // packages.add(new MyReactNativePackage());
+            // packages.add(new MyReactNativePackage());
+        packages.add(new CameraPackage());
         return packages;
       }
 
diff --git a/android/build.gradle b/android/build.gradle
index 63179df..b6f57d7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -20,6 +20,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.3'
         classpath('com.android.tools.build:gradle:7.4.2')
         classpath('com.facebook.react:react-native-gradle-plugin')
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22")
     }
 }
 
diff --git a/android/settings.gradle b/android/settings.gradle
index a002532..eb532f8 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -2,14 +2,16 @@ rootProject.name = 'Railbird'
 
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle");
 
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
+
 useExpoModules()
 
 apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
 
 applyNativeModulesSettingsGradle(settings)
 
-include ':app'
-includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json')"].execute(null, rootDir).text.trim()).getParentFile())
-
 include ':react-native-vision-camera'
 project(':react-native-vision-camera').projectDir = new File(rootProject.projectDir, '../react-native-vision-camera/package/android')
+
+include ':app'
+includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json')"].execute(null, rootDir).text.trim()).getParentFile())
diff --git a/package.json b/package.json
index fb8372c..837fc48 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "@typescript-eslint/eslint-plugin": "^6.17.0",
     "@typescript-eslint/parser": "^6.17.0",
     "babel-plugin-inline-dotenv": "^1.7.0",
+    "expo-constants": "15.4.5",
     "d3-path": "^3.1.0",
     "d3-scale": "^1.0.6",
     "eslint": "^8.56.0",
diff --git a/tsconfig.json b/tsconfig.json
index 5707cd6..cc0aa3f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,5 +28,5 @@
   },
   "include": ["react-native-vision-camera/package/src", "."],
   "exclude": ["node_modules"],
-  "extends": ["expo/tsconfig.base"]
+  "extends": "./react-native-vision-camera/package/tsconfig"
 }

From 152ede26e3e4164ce0ef2f5277e79c9f8f1130ae Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 1 Feb 2024 00:36:48 -0700
Subject: [PATCH 4/6] Use http submodule in CI

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index c48e222..51c47ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "react-native-vision-camera"]
 	path = react-native-vision-camera
-	url = ssh://gitea@dev.railbird.ai:1123/railbird/react-native-vision-camera.git
+	url = https://dev.railbird.ai/railbird/react-native-vision-camera.git

From 2aa9b4b2d1d1b6d797261699f8bc531dcd0d4c25 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 1 Feb 2024 00:39:38 -0700
Subject: [PATCH 5/6] Add eslintignore for submodule

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .eslintignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..082d2b9
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+/react-native-vision-camera/

From 06f1aad38e6d7fc54ab25e1103bba64261e9a62b Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 1 Feb 2024 00:58:23 -0700
Subject: [PATCH 6/6] Lint/tsc fixes

---
 component/video/camera.tsx         |   1 +
 component/video/capture-button.tsx | 158 ++++++++++++++++-------------
 package.json                       |   4 +-
 tsconfig.json                      |  33 +-----
 4 files changed, 93 insertions(+), 103 deletions(-)

diff --git a/component/video/camera.tsx b/component/video/camera.tsx
index 45f10a2..86fef1f 100644
--- a/component/video/camera.tsx
+++ b/component/video/camera.tsx
@@ -9,6 +9,7 @@ import {
   VideoFile,
   CameraRuntimeError,
   Orientation,
+  // @ts-ignore
 } from "react-native-vision-camera";
 import { RecordingButton } from "./capture-button";
 import { useIsForeground } from "./is-foreground";
diff --git a/component/video/capture-button.tsx b/component/video/capture-button.tsx
index 35aaa4c..331f708 100644
--- a/component/video/capture-button.tsx
+++ b/component/video/capture-button.tsx
@@ -1,77 +1,89 @@
-import React, { useCallback, useRef, useState } from 'react';
-import { TouchableOpacity, StyleSheet, View, StyleProp, ViewStyle } from 'react-native';
+import React, { useCallback, useRef, useState } from "react";
+import {
+	TouchableOpacity,
+	StyleSheet,
+	View,
+	StyleProp,
+	ViewStyle,
+} from "react-native";
 import { CameraRoll } from "@react-native-camera-roll/camera-roll";
-import { Camera } from 'react-native-vision-camera/lib/typescript/Camera';
-import { VideoFile } from 'react-native-vision-camera/lib/typescript/VideoFile';
+// @ts-ignore
+import { Camera } from "react-native-vision-camera/lib/typescript/Camera";
+// @ts-ignore
+import { VideoFile } from "react-native-vision-camera/lib/typescript/VideoFile";
 
 interface RecordingButtonProps {
-  style: StyleProp<ViewStyle>;
-  camera: React.RefObject<Camera>;
-  // eslint-disable-next-line no-unused-vars
-  onMediaCaptured: (media: VideoFile, mediaType: string) => void;
-  enabled: boolean;
+	style: StyleProp<ViewStyle>;
+	camera: React.RefObject<Camera>;
+	// eslint-disable-next-line no-unused-vars
+	onMediaCaptured: (media: VideoFile, mediaType: string) => void;
+	enabled: boolean;
 }
 
-
-export const RecordingButton: React.FC<RecordingButtonProps> = ({ style, camera, onMediaCaptured, enabled }) => {
-	const isRecording = useRef(false)
+export const RecordingButton: React.FC<RecordingButtonProps> = ({
+	style,
+	camera,
+	onMediaCaptured,
+	enabled,
+}) => {
+	const isRecording = useRef(false);
 	// UseRef won't trigger a re-render
 	const [, setRecordingState] = useState(false);
 
 	const onStoppedRecording = useCallback(() => {
-		isRecording.current = false
-		setRecordingState(false)
-		console.log('stopped recording video!')
-	}, [])
+		isRecording.current = false;
+		setRecordingState(false);
+		console.log("stopped recording video!");
+	}, []);
 
 	const stopRecording = useCallback(async () => {
 		try {
 			if (camera.current === null) {
-				throw new Error('Camera ref is null!') // Error handling could be more graceful
+				throw new Error("Camera ref is null!"); // Error handling could be more graceful
 			}
-			console.log('calling stopRecording()...')
-			await camera.current.stopRecording()
-			console.log('called stopRecording()!')
+			console.log("calling stopRecording()...");
+			await camera.current.stopRecording();
+			console.log("called stopRecording()!");
 		} catch (e) {
-			console.error('failed to stop recording!', e)
+			console.error("failed to stop recording!", e);
 		}
-	}, [camera])
+	}, [camera]);
 
-const startRecording = useCallback(() => {
-	try {
-		if (camera.current === null) {
-			throw new Error('Camera ref is null!') // Error handling could be more graceful
-		}
-		console.log('calling startRecording()...')
-		camera.current.startRecording({
-			onRecordingError: (error) => {
-				console.error('Recording failed!', error)
-				onStoppedRecording()
-			},
-			onRecordingFinished: async (video) => {
-				onMediaCaptured(video, 'video')
-				const path = video.path
-				await CameraRoll.saveAsset(`file://${path}`, {
-					type: 'video',
-				})
-				onStoppedRecording()
-			},
-		})
-		console.log('called startRecording()!')
-		isRecording.current = true
-		setRecordingState(true)
+	const startRecording = useCallback(() => {
+		try {
+			if (camera.current === null) {
+				throw new Error("Camera ref is null!"); // Error handling could be more graceful
+			}
+			console.log("calling startRecording()...");
+			camera.current.startRecording({
+				onRecordingError: (error) => {
+					console.error("Recording failed!", error);
+					onStoppedRecording();
+				},
+				onRecordingFinished: async (video) => {
+					onMediaCaptured(video, "video");
+					const path = video.path;
+					await CameraRoll.saveAsset(`file://${path}`, {
+						type: "video",
+					});
+					onStoppedRecording();
+				},
+			});
+			console.log("called startRecording()!");
+			isRecording.current = true;
+			setRecordingState(true);
 		} catch (e) {
-		console.error('failed to start recording!', e, 'camera')
-	}
-}, [camera, onMediaCaptured, onStoppedRecording])
+			console.error("failed to start recording!", e, "camera");
+		}
+	}, [camera, onMediaCaptured, onStoppedRecording]);
 
-const handlePress = () => {
-	if (isRecording.current) {
+	const handlePress = () => {
+		if (isRecording.current) {
 			stopRecording();
-	} else {
+		} else {
 			startRecording();
-	}
-};
+		}
+	};
 
 	return (
 		<TouchableOpacity
@@ -79,34 +91,38 @@ const handlePress = () => {
 			onPress={handlePress}
 			disabled={!enabled}
 		>
-			<View style={isRecording.current ? styles.recordingSquare : styles.innerCircle} />
+			<View
+				style={
+					isRecording.current ? styles.recordingSquare : styles.innerCircle
+				}
+			/>
 		</TouchableOpacity>
 	);
 };
 
 const styles = StyleSheet.create({
 	captureButton: {
-			height: 80,
-			width: 80,
-			borderRadius: 40,
-			borderWidth: 3,
-			borderColor: 'white',
-			backgroundColor: 'transparent',
-			justifyContent: 'center',
-			alignItems: 'center',
+		height: 80,
+		width: 80,
+		borderRadius: 40,
+		borderWidth: 3,
+		borderColor: "white",
+		backgroundColor: "transparent",
+		justifyContent: "center",
+		alignItems: "center",
 	},
 	innerCircle: {
-			height: 70,
-			width: 70,
-			borderRadius: 35,
-			backgroundColor: '#FF3B30',
+		height: 70,
+		width: 70,
+		borderRadius: 35,
+		backgroundColor: "#FF3B30",
 	},
 	recordingSquare: {
-			height: 40,
-			width: 40,
-			borderRadius: 10,
-			backgroundColor: '#FF3B30',
+		height: 40,
+		width: 40,
+		borderRadius: 10,
+		backgroundColor: "#FF3B30",
 	},
 });
 
-export default RecordingButton;
\ No newline at end of file
+export default RecordingButton;
diff --git a/package.json b/package.json
index 837fc48..caebbba 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
     "start": "cp .env.development .env && expo start",
     "android": "expo run:android",
     "ios": "expo run:ios",
-    "run:android": "expo run:android",
-    "run:ios": "expo run:ios",
+    "run:android": "expo start --android",
+    "run:ios": "expo start --android",
     "web": "expo start --web",
     "lint": "eslint . --ext .js,.ts,.tsx",
     "lint:fix": "eslint . --ext .ts,.tsx --fix",
diff --git a/tsconfig.json b/tsconfig.json
index cc0aa3f..937557b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,32 +1,5 @@
 {
-  "compilerOptions": {
-    "allowJs": false,
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react-native",
-    "lib": ["esnext"],
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": true,
-    "noStrictGenericChecks": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noUncheckedIndexedAccess": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "target": "esnext",
-    "outDir": "lib",
-    "paths": {
-      "react-native-vision-camera": [
-        "./react-native-vision-camera/package/src/index"
-      ]
-    }
-  },
-  "include": ["react-native-vision-camera/package/src", "."],
-  "exclude": ["node_modules"],
-  "extends": "./react-native-vision-camera/package/tsconfig"
+  "include": ["."],
+  "exclude": ["node_modules", "./react-native-vision-camera/package"],
+  "extends": ["expo/tsconfig.base"]
 }