feat: split diary

App.js

@@ -1,8 +1,10 @@
 import 'react-native-gesture-handler';
+import 'react-native-get-random-values';
 import React from 'react';
 
 import Router from './src/navigation/router';
-import {DiaryDataProvider} from './src/context';
+import {DiaryDataProvider} from './src/context/diaryData';
+import {DiaryNotesProvider} from './src/context/diaryNotes';
 import NPS from './src/services/NPS/NPS';
 import VersionChecker from './src/services/versionChecker';
 import {Sentry} from 'react-native-sentry';
@@ -14,11 +16,13 @@ if (!__DEV__) {
 }
 
 const App = () => (
-  <DiaryDataProvider>
-    <VersionChecker />
-    <Router />
-    <NPS />
-  </DiaryDataProvider>
+  <DiaryNotesProvider>
+    <DiaryDataProvider>
+      <VersionChecker />
+      <Router />
+      <NPS />
+    </DiaryDataProvider>
+  </DiaryNotesProvider>
 );
 
 export default App;

README.md

@@ -1,4 +1,4 @@
-![Mobile version](https://img.shields.io/badge/mobile%20app%20version-1.14.21-blue)
+![Mobile version](https://img.shields.io/badge/mobile%20app%20version-1.16.8-blue)
 
 # Mon Suivi Psy
 

android/app/build.gradle

@@ -131,8 +131,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 64
-        versionName "1.14.21"
+        versionCode 80
+        versionName "1.16.8"
     }
     splits {
         abi {
@@ -189,6 +189,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+
+    implementation 'com.facebook.android:facebook-android-sdk:latest.release'
+
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:0.63.4"  // From node_modules
 

android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustPan">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
@@ -32,6 +32,7 @@
       <meta-data
         android:name="com.dieam.reactnativepushnotification.default_notification_channel_id"
         android:value="@string/default_notification_channel_id" />
+      <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
       <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
       <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
       <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">

android/app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">Mon Suivi Psy</string>
     <string name="default_notification_channel_id">REMINDER-CHANNEL-ID</string>
+    <string name="facebook_app_id">100979222345072</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
     </style>

app.json

@@ -2,7 +2,7 @@
   "name": "monsuivipsy",
   "displayName": "Mon Suivi Psy",
   "version": {
-    "buildNumber": 64,
-    "buildName": "1.14.21"
+    "buildNumber": 80,
+    "buildName": "1.16.8"
   }
 }

assets/svg/Bin.js

@@ -0,0 +1,24 @@
+import * as React from 'react';
+import Svg, {Path} from 'react-native-svg';
+
+function SvgComponent(props) {
+  return (
+    <Svg
+      viewBox="-47 0 512 512"
+      width="100%"
+      height="100%"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}>
+      <Path
+        fill="currentColor"
+        d="M416.875 114.441L405.57 80.555a31.527 31.527 0 00-29.941-21.578h-95.012V28.043C280.617 12.582 268.047 0 252.59 0h-87.008c-15.453 0-28.027 12.582-28.027 28.043v30.934H42.547a31.528 31.528 0 00-29.945 21.578L1.297 114.44a25.426 25.426 0 003.484 22.856 25.427 25.427 0 0020.578 10.539h11.817L63.184 469.44C65.117 493.305 85.367 512 109.293 512h204.863c23.922 0 44.176-18.695 46.106-42.563l26.008-321.601h6.543A25.434 25.434 0 00413.39 137.3a25.434 25.434 0 003.484-22.86zM167.555 30h83.062v28.977h-83.062zm162.804 437.02c-.68 8.402-7.796 14.98-16.203 14.98H109.293c-8.406 0-15.523-6.578-16.203-14.98L67.273 147.836h288.899zM31.793 117.836l9.27-27.79c.21-.64.808-1.07 1.484-1.07h333.082c.676 0 1.27.43 1.484 1.07l9.27 27.79zm0 0"
+      />
+      <Path
+        fill="currentColor"
+        d="M282.516 465.957c.265.016.527.02.793.02 7.925 0 14.55-6.211 14.964-14.22L312.36 181.36c.43-8.273-5.93-15.332-14.199-15.761-8.293-.442-15.328 5.925-15.762 14.199l-14.082 270.398c-.43 8.274 5.926 15.332 14.2 15.762zm0 0M120.566 451.793c.438 7.996 7.055 14.184 14.965 14.184.274 0 .555-.008.832-.024 8.27-.45 14.61-7.52 14.16-15.793L135.77 179.762c-.45-8.274-7.52-14.614-15.793-14.16-8.27.449-14.61 7.52-14.16 15.793zm0 0M209.254 465.977c8.285 0 15-6.715 15-15V180.578c0-8.285-6.715-15-15-15s-15 6.715-15 15v270.399c0 8.285 6.715 15 15 15zm0 0"
+      />
+    </Svg>
+  );
+}
+
+export default SvgComponent;

assets/svg/Chat.js

@@ -2,7 +2,7 @@ import React from 'react';
 import Svg, {Path} from 'react-native-svg';
 
 const Screen3 = (props) => (
-  <Svg width={128} viewBox="0 0 128 128" {...props}>
+  <Svg width={128} height={128} viewBox="0 0 128 128" {...props}>
     <Path
       d="M120.931 70.5106C125.56 63.1756 127.999 54.7315 127.999 45.9998C127.999 20.6355 107.364 0 81.9996 0C73.5036 0 65.2026 2.33525 57.9945 6.75326C56.8173 7.47476 56.4478 9.01376 57.1695 10.191C57.8908 11.368 59.4298 11.7378 60.6073 11.016C67.0288 7.08026 74.4263 5 81.9998 5C104.607 5 123 23.3923 123 45.9998C123 54.199 120.588 62.1118 116.025 68.8826C115.419 69.7806 115.471 70.9416 116.094 71.7753L118.833 81.9993L107.837 79.0528C107.117 78.8598 106.348 78.9981 105.741 79.4306C98.7813 84.3826 90.5718 86.9998 81.9998 86.9998C77.1166 86.9998 72.3403 86.1468 67.7978 84.4686C64.6 72.6923 55.3083 63.4003 43.532 60.2028C41.8535 55.6603 41 50.8848 41 46C41 38.3425 43.1238 30.8748 47.1418 24.404C47.87 23.231 47.5095 21.6898 46.3365 20.9613C45.164 20.233 43.6223 20.5933 42.8938 21.7665C38.3835 29.03 35.9998 37.4098 35.9998 46C35.9998 50.4968 36.6453 54.9123 37.9178 59.17C36.793 59.059 35.653 59.0008 34.4998 59.0008C15.4765 59.0008 0 74.4776 0 93.5006C0 100.328 1.974 106.882 5.7195 112.531L3.044 122.517C2.81275 123.38 3.0595 124.301 3.691 124.932C4.3225 125.564 5.24275 125.81 6.10575 125.579L16.3395 122.837C21.7895 126.218 28.0435 128 34.4998 128C41.071 128 47.4628 126.145 52.984 122.636C54.1493 121.895 54.4933 120.35 53.7528 119.185C53.012 118.019 51.4665 117.675 50.3018 118.416C45.5833 121.415 40.1195 123 34.4998 123C28.6498 123 22.9955 121.291 18.1488 118.056C17.5505 117.657 16.8093 117.534 16.114 117.721L8.99401 119.629L10.8475 112.711C11.0408 111.99 10.9015 111.22 10.4678 110.612C6.89051 105.598 4.99975 99.6811 4.99975 93.5001C4.99975 77.2338 18.2335 64.0003 34.4995 64.0003C50.7655 64.0003 63.9996 77.2341 63.9996 93.5003C63.9996 96.9741 63.4023 100.374 62.2243 103.605C61.7513 104.902 62.4196 106.337 63.7168 106.81C65.0138 107.283 66.4491 106.615 66.9218 105.318C68.3006 101.536 68.9996 97.5601 68.9996 93.5003C68.9996 92.3471 68.9416 91.2073 68.8306 90.0828C73.0886 91.3551 77.5046 91.9996 81.9998 91.9996C91.2186 91.9996 100.065 89.3006 107.661 84.1818L121.722 87.9493C122.585 88.1806 123.505 87.9338 124.137 87.3023C124.768 86.6708 125.015 85.7503 124.784 84.8873L120.931 70.5106Z"
       fill="currentColor"

assets/svg/Courbes.js

@@ -4,26 +4,38 @@ import Svg, {Path} from 'react-native-svg';
 function SvgComponent(props) {
   return (
     <Svg
+      width={25}
+      height={25}
+      fill="none"
       xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 321.493 321.493"
       {...props}>
       <Path
-        fill="currentColor"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        d="M294.507 0c-14.933 0-26.987 12.053-26.987 26.987s12.053 26.987 26.987 26.987 26.987-12.053 26.987-26.987C321.493 12.053 309.44 0 294.507 0zm0 40.107c-7.253 0-13.12-5.867-13.12-13.12 0-7.253 5.867-13.12 13.12-13.12 7.253 0 13.12 5.867 13.12 13.12 0 7.253-5.867 13.12-13.12 13.12zM26.987 153.813C12.053 153.813 0 165.867 0 180.8s12.053 26.987 26.987 26.987 26.987-12.053 26.987-26.987-12.054-26.987-26.987-26.987zm0 40.107c-7.253 0-13.12-5.867-13.12-13.12s5.867-13.12 13.12-13.12c7.253 0 13.12 5.867 13.12 13.12s-5.867 13.12-13.12 13.12zM107.2 73.6c-14.933 0-26.987 12.053-26.987 26.987 0 14.933 12.053 26.987 26.987 26.987 14.933 0 26.987-12.053 26.987-26.987 0-14.934-12.054-26.987-26.987-26.987zm0 40.107c-7.253 0-13.12-5.867-13.12-13.12 0-7.253 5.867-13.12 13.12-13.12 7.253 0 13.12 5.867 13.12 13.12 0 7.253-5.867 13.12-13.12 13.12zM164.053 130.453c-14.933 0-26.987 12.053-26.987 26.987 0 14.933 12.053 26.987 26.987 26.987s26.987-12.053 26.987-26.987c0-14.933-12.053-26.987-26.987-26.987zm0 40.107c-7.253 0-13.12-5.867-13.12-13.12s5.867-13.12 13.12-13.12c7.253 0 13.12 5.867 13.12 13.12s-5.866 13.12-13.12 13.12z"
+        d="M1 4h22.5v19.5H1V4z"
+        fill="#fff"
+        stroke="currentColor"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
       />
+      <Path d="M7 6.25V1v5.25z" fill="#fff" />
       <Path
-        fill="currentColor"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        d="M173.373 138.296L275.32 36.147l9.815 9.796-101.947 102.15zM116.532 119.659l9.787-9.823 28.563 28.457-9.787 9.824zM36.326 161.654l51.816-51.816 9.805 9.806-51.815 51.815zM.213 307.627H321.28v13.867H.213z"
+        d="M7 6.25V1"
+        stroke="currentColor"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <Path d="M17.5 6.25V1v5.25z" fill="#fff" />
+      <Path
+        d="M17.5 6.25V1"
+        stroke="currentColor"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
       />
       <Path
+        d="M7 17.5l.182-.728-.412-.103-.3.3.53.531zm2 .5l-.182.728.09.022H9V18zm1.5 0v.75h.416l.22-.352L10.5 18zm2.5-4l.469-.586-.658-.526-.447.714L13 14zm2.5 2l-.469.586.699.559.428-.786L15.5 16zm3.658-5.14a.75.75 0 10-1.316-.72l1.316.72zM5.03 20.53l2.5-2.5-1.06-1.06-2.5 2.5 1.06 1.06zm1.788-2.302l2 .5.364-1.456-2-.5-.364 1.456zM9 18.75h1.5v-1.5H9v1.5zm2.136-.352l2.5-4-1.272-.796-2.5 4 1.272.796zm1.396-3.812l2.5 2 .937-1.172-2.5-2-.938 1.172zm3.626 1.773l3-5.5-1.316-.718-3 5.5 1.316.718z"
         fill="currentColor"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        d="M287.573 113.92h13.867v200.64h-13.867zM160.533 214.293H174.4V314.56h-13.867zM20.053 234.347H33.92v80.213H20.053zM100.267 174.08h13.867v140.48h-13.867z"
       />
     </Svg>
   );

assets/svg/Cross.js

@@ -0,0 +1,29 @@
+import * as React from 'react';
+import Svg, {Path} from 'react-native-svg';
+
+function SvgComponent(props) {
+  return (
+    <Svg
+      width="100%"
+      height="100%"
+      viewBox="0 0 8 8"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}>
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M6.953 1.047a.597.597 0 010 .844L1.891 6.953a.597.597 0 01-.844-.844l5.062-5.062a.597.597 0 01.844 0z"
+        fill="currentColor"
+      />
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M1.047 1.047a.597.597 0 01.844 0l5.062 5.062a.597.597 0 01-.844.844L1.047 1.891a.597.597 0 010-.844z"
+        fill="currentColor"
+      />
+    </Svg>
+  );
+}
+
+export default SvgComponent;

assets/svg/DiaryMenu.js

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import Svg, {Path} from 'react-native-svg';
+
+function SvgComponent(props) {
+  return (
+    <Svg
+      width={29}
+      height={28}
+      viewBox="0 0 29 28"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}>
+      <Path
+        d="M7.943.875c-3.11 0-6.258 1.183-6.39 1.232l-.607.231v19.999l-.071.1H15.61l-.742-.74-2.05-2.052c-1.235-.346-3.056-.749-4.875-.749-1.938 0-3.964.459-5.193.817V3.655c1.006-.321 3.183-.905 5.193-.905 2.023 0 4.122.587 5.12.906V7.68l1.874.374V3.656c.996-.32 3.09-.906 5.12-.906 2.01 0 4.187.584 5.193.905v12.773l1.804 1.804V2.338l-.606-.23c-.133-.05-3.28-1.233-6.39-1.233-2.563 0-5.152.803-6.058 1.113-.906-.31-3.495-1.113-6.057-1.113zM9.838 8.86l1.31 6.546.2.2 12.01 12.012.533-.533.05.047a2.963 2.963 0 004.167.002l.002-.002a2.964 2.964 0 000-4.167l-.05-.05.535-.534-12.213-12.21-6.544-1.31zm3.508 2.615l1.764.353-.42 1.885-1.884.419-.353-1.764.893-.893zm3.384 1.696l6.68 6.676-2.586 2.585-6.676-6.678 2.113-.47.47-2.114zm8.005 8.001l1.209 1.209-2.585 2.585-1.209-1.208 2.585-2.586zm2 3.07l.05.049c.453.453.453 1.056 0 1.514-.459.457-1.065.456-1.518.002l-.048-.05 1.516-1.516z"
+        fill="currentColor"
+      />
+    </Svg>
+  );
+}
+
+export default SvgComponent;

assets/svg/Done.js

@@ -0,0 +1,27 @@
+import * as React from 'react';
+import Svg, {Path} from 'react-native-svg';
+
+function SvgComponent({color, backgroundColor, ...props}) {
+  return (
+    <Svg
+      width={48}
+      height={48}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}>
+      {/* <Path
+        d="M0 24C0 10.745 10.745 0 24 0s24 10.745 24 24-10.745 24-24 24S0 37.255 0 24z"
+        fill={backgroundColor}
+      /> */}
+      <Path
+        d="M17 25l4 4 10-10"
+        stroke={color}
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </Svg>
+  );
+}
+
+export default SvgComponent;

assets/svg/ExerciseMenu.js

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import Svg, {Path} from 'react-native-svg';
+
+function SvgComponent(props) {
+  return (
+    <Svg
+      width={26}
+      height={26}
+      viewBox="0 0 26 26"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}>
+      <Path
+        d="M9.813.25C7.567.25 5.71 1.69 4.938 3.668 2.29 4.218.25 6.473.25 9.28c0 2.327 1.41 4.278 3.385 5.213.458 2.155 2.295 3.819 4.584 3.819.968 0 1.822-.364 2.577-.864 1.144 1.117 2.604 1.926 4.329 1.926 1.888 0 3.513-.908 4.675-2.212 3.301-.232 5.95-2.93 5.95-6.288 0-2.8-1.856-5.115-4.383-5.964C21.03 2.308 18.878.25 16.187.25 14.956.25 13.896.769 13 1.474 12.104.77 11.045.25 9.812.25zm0 2.125c.958 0 1.794.424 2.386 1.102l.801.917.801-.917c.592-.678 1.428-1.102 2.386-1.102a3.172 3.172 0 013.188 3.188c0-.152-.004-.13-.01.074l-.027.897.88.176a4.242 4.242 0 013.407 4.165 4.235 4.235 0 01-4.273 4.248h-.529l-.317.421c-.783 1.036-1.992 1.706-3.381 1.706-1.406 0-2.628-.684-3.408-1.739l-.738-.998-.874.884c-.483.49-1.142.79-1.886.79-1.418 0-2.54-1.084-2.634-2.48l-.047-.7-.662-.231c-1.455-.509-2.501-1.864-2.501-3.495 0-1.96 1.495-3.524 3.414-3.683l.76-.062.182-.74a3.172 3.172 0 013.082-2.421zM8.219 20.438a1.594 1.594 0 100 3.187 1.594 1.594 0 000-3.188zM4.5 23.625a1.062 1.062 0 100 2.125 1.062 1.062 0 000-2.125z"
+        fill="currentColor"
+      />
+    </Svg>
+  );
+}
+
+export default SvgComponent;