feedbacks

SocialGouv · Dec 23, 2024 · 8fdeecb · 8fdeecb
1 parent 1cad407
commit 8fdeecb
Show file tree

Hide file tree

Showing 38 changed files with 12,383 additions and 5,225 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,9 +1,9 @@
 # Expo
 .expo/
 # Ios
-/ios
+ios/
 # Android
-/android
+android/
 # OSX
 #
 .DS_Store

diff --git a/app/App.js b/app/App.js
@@ -1,3 +1,4 @@
+import 'expo-dev-client';
 import 'react-native-gesture-handler';
 import 'react-native-get-random-values';
 import React from 'react';

diff --git a/app/UPDATE.md b/app/UPDATE.md
@@ -20,6 +20,13 @@
 - - scenes/suivi/chartPie.js
 - - scenes/goals/suivi/GoalsChartPie.js
 
+- asset moved
+- - fonts to assets/fonts
+- - - all the `fontFamily: "Karla"` style were changed to `fontFamily: "Karla-Regular"` (follow the best practices of expo naming file https://docs.expo.dev/develop/user-interface/fonts/#how-to-determine-which-font-family-name-to-use)
+- - images to assets/imgs
+- status/DiaryList.js was not working having a warning, so I use forwardRef to fix it
+- scenes/indicateurs/settings/IndicatorsSettingsMore.js and goals/settings/GoalsSettingsMore.js were crashing the app cause of incompatible version of react-native-draggable-flatlist (v3) and react-native-reanimated, so I use the react-native-draggable-flatlist@4
+
 # What's removed
 
 - removed the /ios and /android folders, as they are now generated automatically from the code
@@ -32,6 +39,7 @@
 - - fix the pdf viewer for android not working
 - - check the notification system
 - - add sentry
+- - check if assets are how they were before (icons, fonts and splash screen)
 - P1
 - - Safe Area View badly handled (android the top is cut and ios with not rectangle screen the bottom is hidden)
 - - Use nativewind

diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
@@ -33,7 +33,6 @@
         <category android:name="android.intent.category.BROWSABLE"/>
         <data android:scheme="monsuivipsy"/>
         <data android:scheme="com.monsuivipsy"/>
-        <data android:scheme="exp+monsuivipsy"/>
       </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>

diff --git a/app/app.json b/app/app.json
@@ -4,7 +4,7 @@
     "slug": "monsuivipsy",
     "version": "1.40.3",
     "orientation": "portrait",
-    "icon": "./assets/imgs/logo2.png",
+    "icon": "./assets/imgs/playstore-icon.png",
     "scheme": "monsuivipsy",
     "ios": {
       "supportsTablet": true,
@@ -22,15 +22,36 @@
       [
         "expo-notifications",
         {
-          "icon": "./assets/imgs/logo2.png",
+          "icon": "./assets/imgs/ic_notification.png",
           "color": "#ffffff"
         }
       ],
       [
         "expo-splash-screen",
         {
           "backgroundColor": "#ffffff",
-          "image": "./assets/imgs/logo2.png"
+          "image": "./assets/imgs/ic_launcher_foreground.png"
+        }
+      ],
+      [
+        "expo-font",
+        {
+          "fonts": [
+            "./assets/fonts/Karla-Bold.ttf",
+            "./assets/fonts/Karla-BoldItalic.ttf",
+            "./assets/fonts/Karla-ExtraBold.ttf",
+            "./assets/fonts/Karla-ExtraBoldItalic.ttf",
+            "./assets/fonts/Karla-ExtraLight.ttf",
+            "./assets/fonts/Karla-ExtraLightItalic.ttf",
+            "./assets/fonts/Karla-Italic.ttf",
+            "./assets/fonts/Karla-Light.ttf",
+            "./assets/fonts/Karla-LightItalic.ttf",
+            "./assets/fonts/Karla-Medium.ttf",
+            "./assets/fonts/Karla-MediumItalic.ttf",
+            "./assets/fonts/Karla-Regular.ttf",
+            "./assets/fonts/Karla-SemiBold.ttf",
+            "./assets/fonts/Karla-SemiBoldItalic.ttf"
+          ]
         }
       ]
     ],

diff --git a/app/assets/imgs/bootsplash_logo.png b/app/assets/imgs/bootsplash_logo.png
diff --git a/app/assets/imgs/ic_launcher-web.png b/app/assets/imgs/ic_launcher-web.png
diff --git a/app/assets/imgs/ic_launcher.png b/app/assets/imgs/ic_launcher.png
diff --git a/app/assets/imgs/ic_launcher_foreground.png b/app/assets/imgs/ic_launcher_foreground.png
diff --git a/app/assets/imgs/ic_launcher_round.png b/app/assets/imgs/ic_launcher_round.png
diff --git a/app/assets/imgs/ic_notification.png b/app/assets/imgs/ic_notification.png
diff --git a/app/assets/imgs/playstore-icon.png b/app/assets/imgs/playstore-icon.png
diff --git a/app/assets/imgs/playstore-presentation.png b/app/assets/imgs/playstore-presentation.png
diff --git a/app/build-1734944841497.aab b/app/build-1734944841497.aab
diff --git a/app/build-1734945775068.aab b/app/build-1734945775068.aab
diff --git a/app/eas.json b/app/eas.json
@@ -6,13 +6,34 @@
   "build": {
     "development": {
       "developmentClient": true,
-      "distribution": "internal"
+      "distribution": "internal",
+      "env": {
+        "EXPO_PUBLIC_SCHEME": "http",
+        "EXPO_PUBLIC_HOST": "localhost",
+        "EXPO_PUBLIC_APP_ENV": "development",
+        "EXPO_PUBLIC_TIPIMAIL_API_KEY": "1234567890",
+        "EXPO_PUBLIC_TIPIMAIL_API_USER": "1234567890"
+      }
     },
     "preview": {
-      "distribution": "internal"
+      "distribution": "internal",
+      "env": {
+        "EXPO_PUBLIC_SCHEME": "https",
+        "EXPO_PUBLIC_HOST": "api-monsuivipsy.fabrique.social.gouv.fr",
+        "EXPO_PUBLIC_APP_ENV": "production",
+        "EXPO_PUBLIC_TIPIMAIL_API_KEY": "1234567890",
+        "EXPO_PUBLIC_TIPIMAIL_API_USER": "1234567890"
+      }
     },
     "production": {
-      "autoIncrement": true
+      "autoIncrement": true,
+      "env": {
+        "EXPO_PUBLIC_SCHEME": "https",
+        "EXPO_PUBLIC_HOST": "api-monsuivipsy.fabrique.social.gouv.fr",
+        "EXPO_PUBLIC_APP_ENV": "production",
+        "EXPO_PUBLIC_TIPIMAIL_API_KEY": "1234567890",
+        "EXPO_PUBLIC_TIPIMAIL_API_USER": "1234567890"
+      }
     }
   },
   "submit": {

diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -253,8 +253,6 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - ExpoWebBrowser (13.0.3):
-    - ExpoModulesCore
   - EXSplashScreen (0.27.7):
     - DoubleConversion
     - ExpoModulesCore
@@ -285,12 +283,12 @@ PODS:
   - hermes-engine (0.74.5):
     - hermes-engine/Pre-built (= 0.74.5)
   - hermes-engine/Pre-built (0.74.5)
-  - lottie-ios (4.4.3)
-  - lottie-react-native (6.7.0):
+  - lottie-ios (4.5.0)
+  - lottie-react-native (7.1.0):
     - DoubleConversion
     - glog
     - hermes-engine
-    - lottie-ios (~> 4.4.1)
+    - lottie-ios (= 4.5.0)
     - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
@@ -1259,10 +1257,6 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-config (1.5.3):
-    - react-native-config/App (= 1.5.3)
-  - react-native-config/App (1.5.3):
-    - React-Core
   - react-native-date-picker (5.0.8):
     - React-Core
   - react-native-get-random-values (1.11.0):
@@ -1290,8 +1284,6 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-pdf (6.7.6):
-    - React-Core
   - react-native-safe-area-context (4.10.5):
     - React-Core
   - react-native-webview (13.8.6):
@@ -1551,8 +1543,6 @@ PODS:
   - RNCCheckbox (0.5.17):
     - BEMCheckBox (~> 1.4)
     - React-Core
-  - RNCMaskedView (0.3.1):
-    - React-Core
   - RNCPicker (2.7.5):
     - React-Core
   - RNDateTimePicker (8.0.1):
@@ -1625,7 +1615,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNSVG (15.2.0):
+  - RNSVG (15.10.1):
     - React-Core
   - SocketRocket (0.7.0)
   - Yoga (0.0.0)
@@ -1649,7 +1639,6 @@ DEPENDENCIES:
   - ExpoFont (from `../node_modules/expo-font/ios`)
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
-  - ExpoWebBrowser (from `../node_modules/expo-web-browser/ios`)
   - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
   - EXUpdatesInterface (from `../node_modules/expo-updates-interface/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
@@ -1685,12 +1674,10 @@ DEPENDENCIES:
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
-  - react-native-config (from `../node_modules/react-native-config`)
   - react-native-date-picker (from `../node_modules/react-native-date-picker`)
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
-  - react-native-pdf (from `../node_modules/react-native-pdf`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
@@ -1719,7 +1706,6 @@ DEPENDENCIES:
   - RNBootSplash (from `../node_modules/react-native-bootsplash`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCCheckbox (from `../node_modules/@react-native-community/checkbox`)"
-  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
   - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
@@ -1773,8 +1759,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-keep-awake/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core"
-  ExpoWebBrowser:
-    :path: "../node_modules/expo-web-browser/ios"
   EXSplashScreen:
     :path: "../node_modules/expo-splash-screen/ios"
   EXUpdatesInterface:
@@ -1842,8 +1826,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-blob-util"
   react-native-blur:
     :path: "../node_modules/@react-native-community/blur"
-  react-native-config:
-    :path: "../node_modules/react-native-config"
   react-native-date-picker:
     :path: "../node_modules/react-native-date-picker"
   react-native-get-random-values:
@@ -1852,8 +1834,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-pager-view:
     :path: "../node_modules/react-native-pager-view"
-  react-native-pdf:
-    :path: "../node_modules/react-native-pdf"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   react-native-webview:
@@ -1910,8 +1890,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCCheckbox:
     :path: "../node_modules/@react-native-community/checkbox"
-  RNCMaskedView:
-    :path: "../node_modules/@react-native-masked-view/masked-view"
   RNCPicker:
     :path: "../node_modules/@react-native-picker/picker"
   RNDateTimePicker:
@@ -1951,15 +1929,14 @@ SPEC CHECKSUMS:
   ExpoFont: 00756e6c796d8f7ee8d211e29c8b619e75cbf238
   ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08
   ExpoModulesCore: 831ece8311a489418746925820bbffdda587d6f4
-  ExpoWebBrowser: 7595ccac6938eb65b076385fd23d035db9ecdc8e
   EXSplashScreen: 3cad09949c2ca6730cbb2801b8c51cb87692425a
   EXUpdatesInterface: 996527fd7d1a5d271eb523258d603f8f92038f24
   FBLazyVector: ac12dc084d1c8ec4cc4d7b3cf1b0ebda6dab85af
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
   glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
   hermes-engine: 8c1577f3fdb849cbe7729c2e7b5abc4b845e88f8
-  lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
-  lottie-react-native: f851c0e235f171d99083c803f728f644be1dcf65
+  lottie-ios: a881093fab623c467d3bce374367755c272bdd59
+  lottie-react-native: 810dfddcceec23b045b78d2b963d6460035cb8ea
   RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
   RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584
   RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1
@@ -1986,12 +1963,10 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
   react-native-blob-util: c612e76c9af1db973af86fda79c6843ea9d08660
   react-native-blur: 30d91a67da86a4d4d924b0c7c36f6e01479a246b
-  react-native-config: 8f7283449bbb048902f4e764affbbf24504454af
   react-native-date-picker: 8a0d56cdef18f61945e6d0dfd250dc1b8e7a313e
   react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
   react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
   react-native-pager-view: c1e29e1a6105a02807392ba822ad322447a72f55
-  react-native-pdf: 70ec85fc764070ce9324f5aea504795e889e6ba0
   react-native-safe-area-context: a240ad4b683349e48b1d51fed1611138d1bdad97
   react-native-webview: 05bae3a03a1e4f59568dfc05286c0ebf8954106c
   React-nativeconfig: ba9a2e54e2f0882cf7882698825052793ed4c851
@@ -2020,15 +1995,14 @@ SPEC CHECKSUMS:
   RNBootSplash: 85f6b879c080e958afdb4c62ee04497b05fd7552
   RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
   RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
-  RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
   RNCPicker: 3e2c37a8328f368ce14da050cdc8231deb5fc9f9
   RNDateTimePicker: b6a9b35a785ecbe12b4e7d6de5439d0aa4614146
   RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
   RNGestureHandler: 2282cfbcf86c360d29f44ace393203afd5c6cff7
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   RNReanimated: 35f9ac9c3ac42d0497ebd1cce5c39d7687a8493e
   RNScreens: b32a9ff15bea7fcdbe5dff6477bc503f792b1208
-  RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec
+  RNSVG: 7ff26379b2d1871b8571e6f9bc9630de6baf9bdf
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 950bbfd7e6f04790fdb51149ed51df41f329fcc8