From 4a5894184259d5fd9bc02e439f02b008f6bfe72b Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 2 Aug 2025 10:18:05 -0700 Subject: [PATCH 1/2] CU-868ex18rd Updating colors for icons --- app.config.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app.config.ts b/app.config.ts index 978964de..3fdae79c 100644 --- a/app.config.ts +++ b/app.config.ts @@ -35,7 +35,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ versionCode: Env.ANDROID_VERSION_CODE, adaptiveIcon: { foregroundImage: './assets/adaptive-icon.png', - backgroundColor: '#2E3C4B', + backgroundColor: '#2a7dd5', }, softwareKeyboardLayoutMode: 'pan', package: Env.PACKAGE, @@ -59,7 +59,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ [ 'expo-splash-screen', { - backgroundColor: '#2E3C4B', + backgroundColor: '#2a7dd5', image: './assets/adaptive-icon.png', imageWidth: 250, }, @@ -77,7 +77,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ 'expo-notifications', { icon: './assets/notification-icon.png', - color: '#2E3C4B', + color: '#2a7dd5', permissions: { ios: { allowAlert: true, @@ -143,9 +143,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ [ 'expo-location', { - locationWhenInUsePermission: 'Allow Resgird Unit to show current location on map.', - locationAlwaysAndWhenInUsePermission: 'Allow Resgrid Unit to use your location.', - locationAlwaysPermission: 'Resgrid Unit needs to track your location', + locationWhenInUsePermission: 'Allow Resgrid Unit to show current location on map.', + locationAlwaysAndWhenInUsePermission: 'Allow Resgrid Unit to use your location for department updates.', + locationAlwaysPermission: 'Resgrid Unit needs to track your location for department AVL.', isIosBackgroundLocationEnabled: true, isAndroidBackgroundLocationEnabled: true, isAndroidForegroundServiceEnabled: true, @@ -215,7 +215,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ { isBackgroundEnabled: true, modes: ['peripheral', 'central'], - bluetoothAlwaysPermission: 'Allow Resgrid Unit to connect to bluetooth devices', + bluetoothAlwaysPermission: 'Allow Resgrid Unit to connect to bluetooth devices for PTT.', }, ], [ From 3b7cbff7cfc76b395f22866a9930b384d3b5bb4e Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 2 Aug 2025 12:24:22 -0700 Subject: [PATCH 2/2] CU-868ex18rd Changing to Firebase App Dist instead of Testfairy --- .DS_Store | Bin 10244 -> 10244 bytes .github/workflows/react-native-cicd.yml | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.DS_Store b/.DS_Store index 481251fac23d0173d908626b6032ec509a76cf81..b2aad7229375a161f4c70f189507c66b0f60b637 100644 GIT binary patch delta 67 zcmZn(XbG6$&uF?aU^hRb>1G~*_F#mPze`8kZ6FNmvfY-U$DgDExn Hg1908!ekV{ delta 36 scmZn(XbG6$&uFqSU^hRb$z~pbR diff --git a/.github/workflows/react-native-cicd.yml b/.github/workflows/react-native-cicd.yml index 70bf997c..8a2d17f5 100644 --- a/.github/workflows/react-native-cicd.yml +++ b/.github/workflows/react-native-cicd.yml @@ -258,20 +258,20 @@ jobs: ./ResgridUnit-ios-prod.ipa retention-days: 7 - - name: 📦 Upload Android build artifacts to Testfairy + - name: 📦 Upload Android artifact to Firebase App Distribution if: (matrix.platform == 'android') - uses: alexfu/testfairy-upload-action@main + uses: wzieba/Firebase-Distribution-Github-Action@v1 with: - api-key: ${{ secrets.TESTFAIRY_API_KEY }} + appId: ${{secrets.FIREBASE_ANDROID_APP_ID}} + serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} + groups: testers file: ./ResgridUnit-prod.apk - groups: Resgrid - notify: on - - - name: 📦 Upload iOS build artifacts to Testfairy + + - name: 📦 Upload iOS artifact to Firebase App Distribution if: (matrix.platform == 'ios') - uses: alexfu/testfairy-upload-action@main + uses: wzieba/Firebase-Distribution-Github-Action@v1 with: - api-key: ${{ secrets.TESTFAIRY_API_KEY }} + appId: ${{secrets.FIREBASE_IOS_APP_ID}} + serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} + groups: testers file: ./ResgridUnit-ios-adhoc.ipa - groups: Resgrid - notify: on