Skip to content

Commit 7732ee9

Browse files
authored
Merge pull request #119 from Resgrid/develop
Develop
2 parents 98e4ac4 + dbc3d70 commit 7732ee9

210 files changed

Lines changed: 5490 additions & 6267 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const path = require('path');
22

33
module.exports = {
4-
extends: ['expo', 'plugin:tailwindcss/recommended', 'prettier'],
5-
plugins: ['prettier', 'unicorn', '@typescript-eslint', 'unused-imports', 'tailwindcss', 'simple-import-sort', 'eslint-plugin-react-compiler'],
4+
extends: ['expo', 'prettier'],
5+
plugins: ['prettier', 'unicorn', '@typescript-eslint', 'unused-imports', 'simple-import-sort', 'eslint-plugin-react-compiler'],
66
parserOptions: {
77
project: './tsconfig.json',
88
},
@@ -25,16 +25,9 @@ module.exports = {
2525
], // Ensure `import type` is used when it's necessary
2626
'import/prefer-default-export': 'off', // Named export is easier to refactor automatically
2727
'import/no-cycle': ['error', { maxDepth: '∞' }],
28-
'tailwindcss/classnames-order': [
29-
'warn',
30-
{
31-
officialSorting: true,
32-
},
33-
], // Follow the same ordering as the official plugin `prettier-plugin-tailwindcss`
3428
'simple-import-sort/imports': 'error', // Import configuration for `eslint-plugin-simple-import-sort`
3529
'simple-import-sort/exports': 'error', // Export configuration for `eslint-plugin-simple-import-sort`
3630
'@typescript-eslint/no-unused-vars': 'off',
37-
'tailwindcss/no-custom-classname': 'off',
3831
'unused-imports/no-unused-imports': 'off',
3932
'unused-imports/no-unused-vars': [
4033
'off',

.github/workflows/react-native-cicd.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@ jobs:
452452
| grep -v "✏️ Tip: You can customize this high-level summary" \
453453
| grep -v "<!-- This is an auto-generated comment: release notes by coderabbit.ai -->" \
454454
| grep -v "<!-- end of auto-generated comment: release notes by coderabbit.ai -->")"
455+
# Replace occurrences of "PR" with "Release"
456+
NOTES="$(printf '%s\n' "$NOTES" | sed -E 's/\bPR\b/Release/g')"
455457
else
456458
NOTES="$(git log -n 5 --pretty=format:'- %s')"
457459
fi

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ Gemfile
4040
expo-env.d.ts
4141
# @end expo-cli
4242
.dual-graph/
43+
/.dual-graph-pro
44+
.mcp.json

app.config.ts

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
3232
orientation: 'default',
3333
icon: './assets/icon.png',
3434
userInterfaceStyle: 'automatic',
35-
newArchEnabled: true,
3635
updates: {
3736
fallbackToCacheTimeout: 0,
3837
},
@@ -145,6 +144,27 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
145144
'assets/audio/unitstatusupdated.wav',
146145
'assets/audio/upcomingshift.wav',
147146
'assets/audio/upcomingtraining.wav',
147+
// Modern notification sounds (bundled into Android res/raw and the iOS app bundle by the expo-notifications config plugin at prebuild)
148+
'assets/audio/modernavailabilityalert.wav',
149+
'assets/audio/moderncalendar.wav',
150+
'assets/audio/moderncallclosed.wav',
151+
'assets/audio/moderncallemergency.wav',
152+
'assets/audio/moderncallhigh.wav',
153+
'assets/audio/moderncalllow.wav',
154+
'assets/audio/moderncallmedium.wav',
155+
'assets/audio/moderncallupdated.wav',
156+
'assets/audio/modernchat.wav',
157+
'assets/audio/modernmessage.wav',
158+
'assets/audio/modernnotification.wav',
159+
'assets/audio/modernpersonnelstatus.wav',
160+
'assets/audio/modernresourceorder.wav',
161+
'assets/audio/modernshift.wav',
162+
'assets/audio/modernstaffing.wav',
163+
'assets/audio/moderntraining.wav',
164+
'assets/audio/moderntroublealert.wav',
165+
'assets/audio/modernunitnotice.wav',
166+
'assets/audio/modernunitstatus.wav',
167+
'assets/audio/modernweatheralert.wav',
148168
'assets/audio/custom/c1.wav',
149169
'assets/audio/custom/c2.wav',
150170
'assets/audio/custom/c3.wav',
@@ -257,7 +277,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
257277
'expo-navigation-bar',
258278
{
259279
position: 'relative',
260-
visibility: 'hidden',
280+
hidden: true,
261281
behavior: 'inset-touch',
262282
},
263283
],
@@ -272,6 +292,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
272292
'@config-plugins/react-native-webrtc',
273293
'@config-plugins/react-native-callkeep',
274294
'@sentry/react-native',
295+
'expo-image',
296+
'expo-sharing',
297+
'expo-status-bar',
275298
'expo-web-browser',
276299
'./customGradle.plugin.js',
277300
'./customManifest.plugin.js',
172 KB
Binary file not shown.

assets/audio/moderncalendar.wav

345 KB
Binary file not shown.

assets/audio/moderncallclosed.wav

517 KB
Binary file not shown.
517 KB
Binary file not shown.

assets/audio/moderncallhigh.wav

517 KB
Binary file not shown.

assets/audio/moderncalllow.wav

517 KB
Binary file not shown.

0 commit comments

Comments
 (0)