feat: one page survey (#86)

SocialGouv · Nov 12, 2021 · 2202c63 · 2202c63
1 parent a684540
commit 2202c63
Show file tree

Hide file tree

Showing 39 changed files with 950 additions and 361 deletions.
diff --git a/README.md b/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.15.6-blue)
 
 # Mon Suivi Psy
 

diff --git a/android/app/build.gradle b/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 71
+        versionName "1.15.6"
     }
     splits {
         abi {

diff --git a/android/app/src/main/res/values/styles.xml b/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>

diff --git a/app.json b/app.json
@@ -2,7 +2,7 @@
   "name": "monsuivipsy",
   "displayName": "Mon Suivi Psy",
   "version": {
-    "buildNumber": 64,
-    "buildName": "1.14.21"
+    "buildNumber": 71,
+    "buildName": "1.15.6"
   }
 }
diff --git a/assets/svg/Globe.js b/assets/svg/Globe.js
@@ -0,0 +1,21 @@
+import * as React from 'react';
+import Svg, {G, Circle, Path} from 'react-native-svg';
+
+function SvgComponent(props) {
+  return (
+    <Svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" {...props}>
+      <G
+        fill="none"
+        stroke="currentColor"
+        strokeWidth={3}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeMiterlimit={10}>
+        <Circle cx={36} cy={36} r={28} />
+        <Path d="M36 8v56c-8.6 0-15.5-12.5-15.5-28S27.4 8 36 8s15.5 12.5 15.5 28S44.6 64 36 64M64 36H8M60 22H12M60 50H12" />
+      </G>
+    </Svg>
+  );
+}
+
+export default SvgComponent;
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -345,7 +345,7 @@ PODS:
     - React-Core
   - RNCMaskedView (0.1.10):
     - React
-  - RNCPicker (1.16.0):
+  - RNCPicker (2.2.0):
     - React-Core
   - RNCPushNotificationIOS (1.8.0):
     - React-Core
@@ -549,7 +549,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: 33c82491102f20ecddb6c6a2c273696ace3191e0
   FBReactNativeSpec: df8f81d2a7541ee6755a047b398a5cb5a72acd0e
   Flipper: b1fddf9a17c32097b2b4c806ad158b2f36bb2692
@@ -562,7 +562,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  glog: 5337263514dd6f09803962437687240c5dc39aa4
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46
@@ -594,7 +594,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 05bae7ecfab1cbd5441993f1ca098f7c3b3f8d0e
   RNCCheckbox: 80ee60cd2e67b46986e8e244db520655372deab4
   RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
-  RNCPicker: 918e98b54a141791e99614b1c320ef2e58300490
+  RNCPicker: 2568e0d0b4644dd9d5f2cec9eca197f5f3f5acb3
   RNCPushNotificationIOS: 61a7c72bd1ebad3568025957d001e0f0e7b32191
   RNDateTimePicker: d4f276aabaf26386bb4dca86e8c92087e7151ba0
   RNDeviceInfo: 7b82d1467b87f7e74d1c7ba9439a9a57d0c68ee9
@@ -609,4 +609,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d97579f170dd13d3faf4c0387e07263686756731
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.10.1
diff --git a/ios/monsuivipsy.xcodeproj/project.pbxproj b/ios/monsuivipsy.xcodeproj/project.pbxproj
@@ -284,7 +284,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1230;
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
@@ -434,8 +434,8 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-monsuivipsy/Pods-monsuivipsy-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -454,8 +454,8 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-monsuivipsy-monsuivipsyTests/Pods-monsuivipsy-monsuivipsyTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -606,13 +606,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FD6D90E79AFB4E006865C584 /* Pods-monsuivipsy-monsuivipsyTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = monsuivipsyTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -629,10 +630,11 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 101EDD5DE7D5C67674AE797F /* Pods-monsuivipsy-monsuivipsyTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = monsuivipsyTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -651,13 +653,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 64;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = 76GBKHVK25;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = monsuivipsy/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.14.21;
+				MARKETING_VERSION = 1.15.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -677,12 +679,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 64;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = 76GBKHVK25;
 				INFOPLIST_FILE = monsuivipsy/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.14.21;
+				MARKETING_VERSION = 1.15.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -718,7 +720,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Debug;
 		};
@@ -745,7 +747,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Release;
 		};
@@ -771,7 +773,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/monsuivipsy-tvOS.app/monsuivipsy-tvOS";
-				TVOS_DEPLOYMENT_TARGET = 10.1;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Debug;
 		};
@@ -797,7 +799,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/monsuivipsy-tvOS.app/monsuivipsy-tvOS";
-				TVOS_DEPLOYMENT_TARGET = 10.1;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Release;
 		};
@@ -824,6 +826,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -833,7 +836,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -849,7 +852,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -885,6 +888,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -894,7 +898,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -903,7 +907,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",

diff --git a/ios/monsuivipsy.xcodeproj/xcshareddata/xcschemes/monsuivipsy.xcscheme b/ios/monsuivipsy.xcodeproj/xcshareddata/xcschemes/monsuivipsy.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monsuivipsy",
-  "version": "1.14.21",
+  "version": "1.15.6",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -25,7 +25,7 @@
     "@react-native-community/masked-view": "^0.1.10",
     "@react-native-community/netinfo": "^5.9.9",
     "@react-native-community/push-notification-ios": "^1.8.0",
-    "@react-native-picker/picker": "^1.15.0",
+    "@react-native-picker/picker": "^2.2.0",
     "@react-navigation/material-top-tabs": "^5.3.10",
     "@react-navigation/native": "^5.8.10",
     "@react-navigation/stack": "^5.12.8",

diff --git a/src/components/CircledIcon.js b/src/components/CircledIcon.js
@@ -48,8 +48,10 @@ const CircledIcon = ({
   icon,
   color,
   borderColor = 'lightgrey',
+  borderWidth = 1,
   iconColor = 'black',
   opacity = 1,
+  iconContainerStyle,
 }) => {
   const Icon = mapIconToSvg(icon);
   return (
@@ -58,7 +60,9 @@ const CircledIcon = ({
         ...styles.iconContainer,
         backgroundColor: color,
         borderColor,
+        borderWidth,
         opacity,
+        ...iconContainerStyle,
       }}>
       <Icon width={20} height={20} color={iconColor} />
     </View>

diff --git a/src/components/Icon.js b/src/components/Icon.js
@@ -25,6 +25,7 @@ import BinSvg from '../../assets/svg/bin.svg';
 import NotesSvg from '../../assets/svg/notes.svg';
 import Text from '../components/MyText';
 import PhoneSvg from '../../assets/svg/Phone';
+import GlobeSvg from '../../assets/svg/Globe';
 
 import {
   StyleSheet,
@@ -61,6 +62,7 @@ const mapIconToSvg = (icon) => {
     BinSvg,
     NotesSvg,
     PhoneSvg,
+    GlobeSvg,
   };
   return iconMap[icon];
 };

diff --git a/src/components/bubble/reminder-item.js b/src/components/bubble/reminder-item.js
@@ -19,7 +19,7 @@ const ReminderItem = ({onPress}) => {
           );
         } else {
           return setMessage(
-            'Saisir au moins 3 à 4 fois par semaine vos symptômes est l’idéal pour les suivre.',
+            'Saisir au moins 3 à 4 fois par semaine mon questionnaire quotidien me permet de mieux suivre mon évolution.',
           );
         }
       }

diff --git a/src/components/drawer/index.js b/src/components/drawer/index.js
@@ -83,6 +83,13 @@ export default ({navigation, visible, onClick}) => {
               onClick={onClick}
               icon="PhoneSvg"
             />
+            <DrawerItem
+              title="Site internet"
+              icon="GlobeSvg"
+              onClick={() => {
+                Linking.openURL('https://monsuivipsy.fabrique.social.gouv.fr/');
+              }}
+            />
             <DrawerItem
               title="Protection des données"
               path="privacy"
@@ -98,14 +105,6 @@ export default ({navigation, visible, onClick}) => {
               icon="SymptomsSetting"
             />
             <Separator />
-            <DrawerItem
-              title="Exporter mes données"
-              path="export"
-              navigation={navigation}
-              onClick={onClick}
-              icon="ExportDataSettingSvg"
-            />
-            {/* <DrawerItem title="Donnez mon avis" onClick={() => {}} /> */}
             {updateVisible ? (
               <DrawerItem
                 badge