feat: expo 53 and formatter

.github/pull_request_template.md

@@ -1,15 +1,19 @@
 ## Describe your changes
+
 (provide a description of changes and a overview of solution)
 
 ## Issue number and link
+
 (if this PR is in response to a issue, put the link to the issue here)
 
 ## Dependency Changes
+
 (place any new libraries or updates to exisiting libraries here, you can check by looking at the changes to `package.json`)
 
 ## Checklist before requesting a review
+
 - [ ] I have performed a self-review of my code
 - [ ] I have verified that any UI changes I have made work in dark mode
 - [ ] All of my GitHub checks have passed
 - [ ] I have added any new packages/updates above
-- [ ] I have verified that I am not submitting other changes/features outside the scope of my PR
+- [ ] I have verified that I am not submitting other changes/features outside the scope of my PR

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: "Build App and Upload"
+name: 'Build App and Upload'
 
 on:
   # manual trigger but change to any supported event
@@ -11,14 +11,13 @@ on:
         default: 'all'
         type: choice
         options:
-        - all
-        - ios
-        - android
+          - all
+          - ios
+          - android
 
   release:
     types: [published]
 
-
 jobs:
   build_ios:
     runs-on: macos-latest
@@ -37,22 +36,22 @@ jobs:
         run: /usr/bin/xcodebuild -version
 
       - name: Checkout Repository
-        uses: actions/checkout@v4 
+        uses: actions/checkout@v4
 
       - name: Install Fastlane and Fix CocoaPods
         run: |
           sudo gem install cocoapods -v 1.15.2
           sudo gem install fastlane -NV
           fastlane --version
-          
+
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '22.x'
-  
+
       - name: Install Dependencies
-        run: npm install
-      
+        run: pnpm install
+
       - name: Expo Prebuild [iOS]
         run: |
           npx expo prebuild --platform ios --npm
@@ -69,7 +68,7 @@ jobs:
 
   build_android:
     runs-on: ubuntu-latest
-    
+
     # build for android if platform is android or all, or if triggered by a release
     if: github.event_name == 'release' || inputs.buildPlatform == 'all' || inputs.buildPlatform == 'android'
 
@@ -87,21 +86,26 @@ jobs:
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
-          
+
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '22.x'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
       - name: Install Dependencies
-        run: npm install
+        run: pnpm install
 
       - name: Write Google Maps API Key to app.json
         run: |
           sed -i "s/{{GOOGLE_MAPS_KEY}}/$GOOGLE_MAPS_KEY/g" app.json
         env:
           GOOGLE_MAPS_KEY: ${{ secrets.GOOGLE_MAPS_KEY }}
-      
+
       - name: Expo Prebuild [Android]
         run: |
           npx expo prebuild --platform android --npm
@@ -129,16 +133,16 @@ jobs:
           KEY_PASSWORD: ${{ secrets.AAB_PASSWORD }}
           STORE_PASSWORD: ${{ secrets.AAB_PASSWORD }}
           KEY_PATH: ${{ github.workspace }}/android/app/maroon-rides-release-key.jks
-          
+
           GOOGLE_PLAY_KEY: ${{ secrets.GOOGLE_PLAY_KEY }}
-          PACKAGE_NAME: "com.maroonrides.maroonrides"
+          PACKAGE_NAME: 'com.maroonrides.maroonrides'
           APP_GRADLE_FILE: ${{ github.workspace }}/android/app/build.gradle
-      
+
       - uses: actions/upload-artifact@v4
         with:
           name: app-bundle.aab
           path: ./android/app/build/outputs/bundle/release/app-release.aab
-        
+
       - name: Set outputs
         id: git_sha
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
@@ -148,4 +152,4 @@ jobs:
         env:
           GOOGLE_PLAY_KEY: ${{ secrets.GOOGLE_PLAY_KEY }}
           RELEASE_NAME: ${{ github.event.release.tag_name || steps.git_sha.outputs.sha_short }}
-          PACKAGE_NAME: "com.maroonrides.maroonrides"
+          PACKAGE_NAME: 'com.maroonrides.maroonrides'

.github/workflows/format.yml

@@ -0,0 +1,52 @@
+name: Fix formatting
+
+on:
+  pull_request:
+    types: [labeled]
+
+permissions: {}
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.label.name == 'ci:format' }}
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Lint with expo
+        run: npx expo lint --fix
+
+      - name: Commit and push
+        uses: EndBug/add-and-commit
+        with:
+          default_author: github_actions
+          message: 'chore: fix formatting'
+
+      - name: Remove label
+        uses: actions/github-script
+        if: always()
+        with:
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.payload.pull_request.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: 'ci:format'
+            })

.github/workflows/tsc.yml → .github/workflows/lint.yml

@@ -3,12 +3,14 @@ name: TypeScript Linting
 on:
   push:
     paths-ignore:
-      - ".github/**"
-      - "fastlane/**"
+      - '.github/**'
+      - 'fastlane/**'
+    branches:
+      - main
   pull_request:
 
 jobs:
-  tsc:
+  lint:
     runs-on: ubuntu-latest
 
     steps:
@@ -20,9 +22,16 @@ jobs:
         with:
           node-version: 22
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
       - name: Install dependencies
-        run: npm install
+        run: pnpm install
+
+      - name: Lint with expo
+        run: npx expo lint --max-warnings 0
 
       - name: Run TypeScript checks
         run: npx tsc
-

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "singleQuote": true
+}

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["dbaeumer.vscode-eslint"]
+}

.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "always"
+  },
+  "eslint.rules.customizations": [
+    {
+      "rule": "prettier/prettier",
+      "severity": "off"
+    }
+  ]
+}

README.md

@@ -1,7 +1,7 @@
 # Maroon Rides
+
 [![API Canary](https://github.com/Maroon-Rides/canary/actions/workflows/canary.yml/badge.svg)](https://github.com/Maroon-Rides/canary/actions/workflows/canary.yml)
 
 We are building the best native mobile app for the Texas A&M University bus system.
 
-
 ![maroonrides_header](https://github.com/user-attachments/assets/f85ba3ce-9ad9-49cc-aebc-f26d1cee1105)

app.d.ts

@@ -1 +1 @@
-declare module 'moment-strftime';
+declare module 'moment-strftime';

app.json

@@ -1,11 +1,12 @@
 {
   "expo": {
     "name": "Maroon Rides",
-    "slug": "Maroon Rides",
+    "slug": "Maroon_Rides",
     "version": "1.6.5",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "automatic",
+    "newArchEnabled": false,
     "scheme": "myapp",
     "assetBundlePatterns": [
       "**/*"
@@ -82,7 +83,6 @@
       "bundler": "metro"
     },
     "plugins": [
-      "@config-plugins/detox",
       [
         "@bacons/apple-targets",
         {
@@ -97,16 +97,21 @@
           "locationWhenInUsePermission": "Allow location for map display and route planning"
         }
       ],
-      ["expo-build-properties", {
-        "android": {
+      [
+        "expo-build-properties",
+        {
+          "android": {
             "compileSdkVersion": 35,
             "targetSdkVersion": 35,
             "buildToolsVersion": "35.0.0"
-        },
-        "ios": {
-          "deploymentTarget": "13.4"
+          },
+          "ios": {
+            "deploymentTarget": "15.1"
+          }
         }
-      }]
+      ],
+      "expo-font",
+      "expo-router"
     ]
   }
-}
+}

app/_layout.tsx

@@ -1,7 +1,11 @@
 import { Stack } from 'expo-router';
 
 export default function Layout() {
-  return <Stack screenOptions={{
-    headerShown: false
-  }} />;
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
 }

app/components/Error.tsx

@@ -1,15 +1,23 @@
-import useAppStore from "../data/app_state";
-import React from "react";
+import useAppStore from '../data/app_state';
+import React from 'react';
 import { SafeAreaView, Text } from 'react-native';
 
 const Error: React.FC = () => {
-    const theme = useAppStore((state) => state.theme);
+  const theme = useAppStore((state) => state.theme);
 
-    return (
-        <SafeAreaView style={{ width: '100%', height: '100%', justifyContent: 'center', alignItems: 'center', backgroundColor: theme.background}}>
-            <Text style={{color: theme.text}}>Something went wrong!</Text>
-        </SafeAreaView>
-    )
-}
+  return (
+    <SafeAreaView
+      style={{
+        width: '100%',
+        height: '100%',
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: theme.background,
+      }}
+    >
+      <Text style={{ color: theme.text }}>Something went wrong!</Text>
+    </SafeAreaView>
+  );
+};
 
 export default Error;