2024: get it running again

ricokareem · Feb 6, 2024 · 1ea79d0 · 1ea79d0
1 parent a0c21bf
commit 1ea79d0
Show file tree

Hide file tree

Showing 14 changed files with 70,438 additions and 12,951 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1,2 @@
 nodejs 16.15.0
+ruby 3.3.0
diff --git a/App.tsx b/App.tsx
@@ -24,7 +24,7 @@ import Credits from "./screens/Credits";
 
 const Stack = createStackNavigator();
 
-export default function App(): JSX.Element {
+export default function App(): JSX.Element | null {
   const [fontsLoaded] = useFonts({
     ...Ionicons.font,
     ...Feather.font,

diff --git a/app.json b/app.json
@@ -28,6 +28,11 @@
     },
     "android": {
       "package": "com.ricokareem.bioenergetics3"
+    },
+    "extra": {
+      "eas": {
+        "projectId": "0b530a30-c4e0-11e8-a6b0-fdbd974bb46a"
+      }
     }
   }
 }
diff --git a/babel.config.js b/babel.config.js
@@ -3,5 +3,15 @@ module.exports = function (api) {
   return {
     presets: ["@babel/preset-typescript", "babel-preset-expo"],
     plugins: ["react-native-reanimated/plugin"],
+    // compilerOptions: {
+    //   strict: true,
+    //   baseUrl: ".",
+    //   paths: {
+    //     "@components/*": ["./components/*"],
+    //     "@screens/*": ["./screens/*"],
+    //     "@navigation/*": ["./navigation/*"],
+    //     "@media/*": ["./media/*"],
+    //   },
+    // },
   };
 };
diff --git a/components/MediaCard.tsx b/components/MediaCard.tsx
@@ -32,7 +32,7 @@ const styles = StyleSheet.create({
   },
 });
 
-const timeDisplay = ({ remainingTime }) => {
+const timeDisplay = ({ remainingTime }: { remainingTime: number }) => {
   const minutes = Math.floor(remainingTime / 60);
   const seconds = remainingTime % 60;
 
@@ -53,9 +53,10 @@ export default function MediaCard({
   const [isPlaying, setIsPlaying] = useState(true);
   const [currentMovie, setCurrentMovie] = useState(moviePlaylist[0]);
   const [nextMovieIndex, setMovieIndex] = useState(1);
-  const videoRef = useRef<Video>();
+  const videoRef = useRef() as React.MutableRefObject<Video>;
 
-  const videoSourceFile = VideoSourceFiles[currentMovie.file];
+  const videoSourceFile =
+    VideoSourceFiles[currentMovie?.file as keyof typeof VideoSourceFiles];
 
   const onPlaybackStatusUpdate = useCallback(
     (playbackStatus: AVPlaybackStatus) => {
@@ -76,14 +77,14 @@ export default function MediaCard({
   const onPress = () => {
     setIsPlaying(!isPlaying);
     if (status.isLoaded && status.isPlaying) {
-      videoRef.current.pauseAsync();
+      videoRef.current?.pauseAsync();
     } else if (status.isLoaded && !status.isPlaying) {
-      videoRef.current.playAsync();
+      videoRef.current?.playAsync();
     }
   };
 
   useEffect(() => {
-    videoRef.current.setOnPlaybackStatusUpdate(onPlaybackStatusUpdate);
+    videoRef.current?.setOnPlaybackStatusUpdate(onPlaybackStatusUpdate);
     setMovieIndex((i) => i + 1);
   }, [currentMovie, onPlaybackStatusUpdate]);
 
@@ -104,7 +105,7 @@ export default function MediaCard({
         style={styles.backgroundVideo}
         onPlaybackStatusUpdate={(newStatus) => setStatus(newStatus)}
       />
-      <Text style={{ marginBottom: 10 }}>{currentMovie.description}</Text>
+      <Text style={{ marginBottom: 10 }}>{currentMovie?.description}</Text>
       {!!showTimer && (
         <>
           <CountdownCircleTimer

diff --git a/components/index.tsx b/components/index.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+// @ts-ignore
 import styled from "styled-components/native";
 
 export const WhiteContainer = styled.View`

diff --git a/eas.json b/eas.json
@@ -0,0 +1,11 @@
+{
+    "build": {
+        "development-simulator": {
+            "developmentClient": true,
+            "distribution": "internal",
+            "ios": {
+                "simulator": true
+            }
+        }
+    }
+}
diff --git a/ios/Podfile b/ios/Podfile
@@ -17,7 +17,7 @@ install! 'cocoapods',
          deterministic_uuids: false
 
 target 'bioenergetics3' do
-  use_expo_modules!
+  # use_expo_modules!
   config = use_native_modules!
 
   use_frameworks! linkage: podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']

diff --git a/navigation/TabNavigator.tsx b/navigation/TabNavigator.tsx
@@ -3,6 +3,7 @@ import * as React from "react";
 import { Platform } from "react-native";
 import {
   NavigationProp,
+  Route,
   RouteProp,
   getFocusedRouteNameFromRoute,
 } from "@react-navigation/native";
@@ -31,7 +32,7 @@ type TabBarIconPropType = {
 
 const isAndroid = Platform.OS === "android";
 
-function getHeaderTitle(route) {
+function getHeaderTitle(route: Route<string>) {
   const routeName = getFocusedRouteNameFromRoute(route) ?? "Main";
 
   switch (routeName) {
@@ -90,7 +91,7 @@ function TabNavigator({
         component={MainScreen}
         options={{
           tabBarLabel: "Home",
-          tabBarIcon: ({ focused }) => (
+          tabBarIcon: ({ focused }: { focused: boolean }) => (
             <TabBarIcon iconName="home" focused={focused} />
           ),
         }}
@@ -100,7 +101,7 @@ function TabNavigator({
         component={CardStackScreen}
         options={{
           tabBarLabel: "Card Stack",
-          tabBarIcon: ({ focused }) => (
+          tabBarIcon: ({ focused }: { focused: boolean }) => (
             <TabBarIcon iconName="layers" focused={focused} />
           ),
         }}
@@ -110,7 +111,7 @@ function TabNavigator({
         component={ReferenceGuideScreen}
         options={{
           tabBarLabel: "Symptoms",
-          tabBarIcon: ({ focused }) => (
+          tabBarIcon: ({ focused }: { focused: boolean }) => (
             <TabBarIcon iconName="book-open" focused={focused} />
           ),
         }}
@@ -120,7 +121,7 @@ function TabNavigator({
         component={InfoScreen}
         options={{
           tabBarLabel: "Info",
-          tabBarIcon: ({ focused }) => (
+          tabBarIcon: ({ focused }: { focused: boolean }) => (
             <TabBarIcon
               iconName={isAndroid ? "information" : "info"}
               focused={focused}