Merge branch 'main' of github.com:wyne/scorepad-react-native into nav…

…igation-tests

.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
         jest: true,
     },
     parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint'],
+    plugins: ['@typescript-eslint', 'import'],
     extends: [
         'plugin:@typescript-eslint/recommended',
         'plugin:jest/recommended',
@@ -16,6 +16,23 @@ module.exports = {
         'jest/no-disabled-tests': 0,
         'semi': ['error', 'always'],
         'eol-last': ['error', 'always'],
+        'import/order': ['error', {
+            "pathGroups": [
+                {
+                    "pattern": "react",
+                    "group": "builtin",
+                    "position": "before"
+                }
+            ],
+            "pathGroupsExcludedImportTypes": ["react"],
+            'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
+            'alphabetize': {
+                'order': 'asc',
+                'caseInsensitive': true,
+            },
+            'newlines-between': 'always',
+        }],
+        'import/no-duplicates': 'error',
     },
     ignorePatterns: ['web-build', '__mocks__'],
 };

.github/workflows/beta.yml

@@ -8,11 +8,11 @@ jobs:
     name: Install and publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.6.0
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 14.x
-      - uses: expo/expo-github-action@8.0.0
+      - uses: expo/expo-github-action@8.2.1
         with:
           expo-version: 4.x
           token: ${{ secrets.EXPO_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/node.yml

@@ -20,9 +20,9 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'

.nvmrc

@@ -1 +1 @@
-16.19.0
+18.18.0

App.tsx

@@ -1,20 +1,39 @@
 import React from 'react';
+
+import analytics from '@react-native-firebase/analytics';
+import { StatusBar } from 'expo-status-bar';
+import { View } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { MenuProvider } from 'react-native-popup-menu';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
-import { store, persistor } from './redux/store';
-import { StatusBar } from 'expo-status-bar';
+
+import { persistor, store } from './redux/store';
+import { AddendModalContextProvider } from './src/components/Sheets/AddendModalContext';
+import { GameSheetContextProvider } from './src/components/Sheets/GameSheetContext';
 import { Navigation } from './src/Navigation';
-import { View } from 'react-native';
+
+if (process.env.EXPO_PUBLIC_FIREBASE_ANALYTICS == "false") {
+    analytics().setAnalyticsCollectionEnabled(false);
+}
 
 export default function App() {
     return (
         <View style={{ flex: 1, backgroundColor: '#fff' }}>
-            <Provider store={store}>
-                <PersistGate loading={null} persistor={persistor}>
-                    <StatusBar />
-                    <Navigation />
-                </PersistGate>
-            </Provider>
+            <GestureHandlerRootView style={{ flex: 1 }}>
+                <Provider store={store}>
+                    <GameSheetContextProvider>
+                        <MenuProvider>
+                            <AddendModalContextProvider>
+                                <PersistGate loading={null} persistor={persistor}>
+                                    <StatusBar />
+                                    <Navigation />
+                                </PersistGate>
+                            </AddendModalContextProvider>
+                        </MenuProvider>
+                    </GameSheetContextProvider>
+                </Provider>
+            </GestureHandlerRootView>
         </View>
     );
 };

Contributing.md

@@ -4,12 +4,13 @@ Run any build command remotely by removing `--local` flag.
 
 ### Development - Simulator
 
-Prerequisite: `SENTRY_AUTH_TOKEN` in `.env`
+For android, use JDK 17.
 
 ```zsh
 npx react-native-clean-project
 npx expo prebuild
 eas build --profile development-simulator --platform ios --local
+eas build --profile development-simulator --platform android --local
 eas build:run -p ios # select expo build from above
 eas build:run -p android # select expo build from above
 npx expo start --dev-client
@@ -43,6 +44,8 @@ npx eas-cli build --platform android --profile preview --local
 
 ### Production Build
 
+Remember to bump `versionCode` and `buildNumber` in `app.config.js`.
+
 ```zsh
 npx expo-doctor
 npx expo prebuild

Readme.md

@@ -15,7 +15,7 @@ https://github.com/wyne/scorepad-react-native/assets/1986068/05bde405-3025-4156-
 
 ## Website
 
-https://wyne.github.io/scorepad/
+https://www.scorepadapp.com
 
 ## Contributing
 

app.config.js

@@ -2,105 +2,102 @@ const variant = process.env.APP_VARIANT;
 
 let packageName;
 switch (variant) {
-  case 'development':
-    packageName = 'com.wyne.scorepad.dev';
-    break;
-  case 'preview':
-    packageName = 'com.wyne.scorepad.preview';
-    break;
-  default:
-    packageName = 'com.wyne.scorepad';
-    break;
+    case "development":
+        packageName = "com.wyne.scorepad.dev";
+        break;
+    case "preview":
+        packageName = "com.wyne.scorepad.preview";
+        break;
+    default:
+        packageName = "com.wyne.scorepad";
+        break;
 }
 
 let name;
 switch (variant) {
-  case 'development':
-    name = 'ScorePad with Rounds (dev)';
-    break;
-  case 'preview':
-    name = 'ScorePad with Rounds (preview)';
-    break;
-  default:
-    name = 'ScorePad with Rounds';
-    break;
+    case "development":
+        name = "ScorePad with Rounds (dev)";
+        break;
+    case "preview":
+        name = "ScorePad with Rounds (preview)";
+        break;
+    default:
+        name = "ScorePad with Rounds";
+        break;
 }
 
 let icon;
 switch (variant) {
-  case 'development':
-    icon = './assets/icon-dev.png';
-    break;
-  case 'preview':
-    icon = './assets/icon-preview.png';
-    break;
-  default:
-    icon = './assets/icon.png';
-    break;
+    case "development":
+        icon = "./assets/icon-dev.png";
+        break;
+    case "preview":
+        icon = "./assets/icon-preview.png";
+        break;
+    default:
+        icon = "./assets/icon.png";
+        break;
 }
 
 export default {
-  name: name,
-  slug: 'scorepad',
-  version: "2.2.2",
-  orientation: "default",
-  icon: icon,
-  assetBundlePatterns: [
-    "assets/*"
-  ],
-  backgroundColor: "#000000",
-  ios: {
-    bundleIdentifier: packageName,
-    supportsTablet: true,
-    requireFullScreen: false,
-    buildNumber: "57",
-    infoPlist: {
-      RCTAsyncStorageExcludeFromBackup: false
+    name: name,
+    slug: "scorepad",
+    version: "2.5.0",
+    orientation: "default",
+    icon: icon,
+    assetBundlePatterns: ["assets/*"],
+    backgroundColor: "#000000",
+    ios: {
+        bundleIdentifier: packageName,
+        supportsTablet: true,
+        requireFullScreen: false,
+        buildNumber: "73",
+        infoPlist: {
+            RCTAsyncStorageExcludeFromBackup: false,
+        },
+        googleServicesFile: "./GoogleService-Info.plist",
     },
-    googleServicesFile: "./GoogleService-Info.plist",
-  },
-  android: {
-    icon: "./assets/adaptive-icon.png",
-    adaptiveIcon: {
-      "foregroundImage": "./assets/adaptive-icon-fg.png",
-      "backgroundImage": "./assets/adaptive-icon-bg.png"
+    android: {
+        icon: "./assets/adaptive-icon.png",
+        adaptiveIcon: {
+            foregroundImage: "./assets/adaptive-icon-fg.png",
+            backgroundImage: "./assets/adaptive-icon-bg.png",
+        },
+        package: packageName,
+        permissions: [],
+        versionCode: 73,
+        googleServicesFile: "./google-services.json",
     },
-    package: packageName,
-    permissions: [],
-    versionCode: 57,
-    googleServicesFile: "./google-services.json",
-  },
-  userInterfaceStyle: "dark",
-  web: {
-    "favicon": "./assets/favicon.png"
-  },
-  extra: {
-    eas: {
-      projectId: 'fc8859ea-b320-41cd-a091-36b3ec7f9b1f'
-    }
-  },
-  updates: {
-    fallbackToCacheTimeout: 0,
-    url: "https://u.expo.dev/fc8859ea-b320-41cd-a091-36b3ec7f9b1f"
-  },
-  runtimeVersion: {
-    policy: "sdkVersion",
-  },
-  description: "",
-  githubUrl: "https://github.com/wyne/scorepad-react-native",
-  owner: "wyne",
-  plugins: [
-    "@react-native-firebase/app",
-    "@react-native-firebase/crashlytics",
-    [
-      "expo-build-properties",
-      {
-        "ios": {
-          "useFrameworks": "static"
-        }
-      }
-    ]
-  ],
-  hooks: {
-  }
+    userInterfaceStyle: "dark",
+    web: {
+        favicon: "./assets/favicon.png",
+    },
+    extra: {
+        eas: {
+            projectId: "fc8859ea-b320-41cd-a091-36b3ec7f9b1f",
+        },
+    },
+    updates: {
+        fallbackToCacheTimeout: 0,
+        url: "https://u.expo.dev/fc8859ea-b320-41cd-a091-36b3ec7f9b1f",
+    },
+    runtimeVersion: {
+        policy: "sdkVersion",
+    },
+    description: "",
+    githubUrl: "https://github.com/wyne/scorepad-react-native",
+    owner: "wyne",
+    plugins: [
+        "@react-native-firebase/app",
+        "@react-native-firebase/crashlytics",
+        [
+            "expo-build-properties",
+            {
+                ios: {
+                    useFrameworks: "static",
+                },
+            },
+        ],
+    ],
+    hooks: {},
 };

assets-stores/StoreAssets.md

@@ -0,0 +1,18 @@
+# Store Assets
+
+## Test data
+
+Uncomment the `preloadedState` in `src/store.js` to load test data.
+
+## Devices
+
+| Dimensions | Device |
+| --- | --- |
+| 6.5" (required) | iPhone 14 Plus |
+| 5.5" (required) | iPhone 8 Plus |
+| 12.9" (required) | iPad Pro (6th gen) |
+
+## Generating Screenshots
+
+https://appscreens.com/
+