Merge branch 'main' into clean/imports

PapillonApp · Jan 2, 2025 · 469b21c · 469b21c
2 parents 18f2265 + af0b72b
commit 469b21c
Show file tree

Hide file tree

Showing 92 changed files with 2,851 additions and 1,363 deletions.
diff --git a/App.tsx b/App.tsx
@@ -99,7 +99,9 @@ export default function App () {
     LogBox.ignoreLogs([
       "[react-native-gesture-handler]",
       "VirtualizedLists should never be nested",
-      "TNodeChildrenRenderer: Support for defaultProps"
+      "TNodeChildrenRenderer: Support for defaultProps",
+      "Service not implemented",
+      "Linking found multiple possible"
     ]);
 
     expoGoWrapper(async () => {

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -88,8 +88,8 @@ android {
         applicationId 'xyz.getpapillon.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 7501
-        versionName "7.6.0"
+        versionCode 7700
+        versionName "7.7.0"
     }
     signingConfigs {
         debug {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -37,6 +37,13 @@
         <data android:scheme="xyz.getpapillon.app"/>
         <data android:scheme="izly"/>
       </intent-filter>
+      <intent-filter data-generated="true">
+        <action android:name="android.intent.action.VIEW"/>
+        <data android:scheme="papillon"/>
+        <data android:scheme="izly"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
   </application>

diff --git a/app.json b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "Papillon",
     "slug": "papillonvex",
-    "scheme": ["papillon", "izly"],
+    "scheme": "papillon", 
     "version": "7.7.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
@@ -20,6 +20,13 @@
       "appStoreUrl": "https://apps.apple.com/us/app/papillon-lappli-scolaire/id6477761165",
       "bundleIdentifier": "xyz.getpapillon.ios",
       "associatedDomains": ["applinks:getpapillon.xyz"],
+      "infoPlist": {
+        "CFBundleURLTypes": [
+          {
+            "CFBundleURLSchemes": ["papillon", "izly"]
+          }
+        ]
+      },
       "splash": {
         "backgroundColor": "#32AB8E",
         "image": "./assets/launch/splash.png",
@@ -43,6 +50,16 @@
         "monochromeImage": "./assets/launch/adaptive-icon-monochrome.png",
         "backgroundColor": "#32AB8E"
       },
+      "intentFilters": [
+        {
+          "action": "VIEW",
+          "data": [
+            { "scheme": "papillon" },
+            { "scheme": "izly" }
+          ],
+          "category": ["BROWSABLE", "DEFAULT"]
+        }
+      ],
       "splash": {
         "backgroundColor": "#32AB8E",
         "image": "./assets/launch/splash.png",

diff --git a/assets/images/service_alise.png → assets/images/service_alise.jpg b/assets/images/service_alise.png → assets/images/service_alise.jpg
diff --git a/ios/Papillon.xcodeproj/project.pbxproj b/ios/Papillon.xcodeproj/project.pbxproj
@@ -336,11 +336,9 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoMediaLibrary/ExpoMediaLibrary_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoSystemUI/ExpoSystemUI_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/EXDevMenu.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/LottiePrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/Lottie_React_Native_Privacy.bundle",
 			);
@@ -354,11 +352,9 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoMediaLibrary_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoSystemUI_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevMenu.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LottiePrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Lottie_React_Native_Privacy.bundle",
 			);
@@ -457,7 +453,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = xyz.getpapillon.ios;
-				PRODUCT_NAME = Papillon;
+				PRODUCT_NAME = "Papillon";
 				SWIFT_OBJC_BRIDGING_HEADER = "Papillon/Papillon-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -490,7 +486,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = xyz.getpapillon.ios;
-				PRODUCT_NAME = Papillon;
+				PRODUCT_NAME = "Papillon";
 				SWIFT_OBJC_BRIDGING_HEADER = "Papillon/Papillon-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/ios/Papillon/Info.plist b/ios/Papillon/Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>7.6.0</string>
+    <string>7.7.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -29,7 +29,6 @@
         <array>
           <string>papillon</string>
           <string>izly</string>
-          <string>xyz.getpapillon.ios</string>
         </array>
       </dict>
     </array>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -23,7 +23,7 @@ PODS:
     - ExpoModulesCore
   - EXManifests (0.14.3):
     - ExpoModulesCore
-  - Expo (51.0.38):
+  - Expo (51.0.39):
     - ExpoModulesCore
   - expo-dev-menu (5.0.23):
     - DoubleConversion
@@ -266,6 +266,11 @@ PODS:
     - fmt (= 9.1.0)
     - glog
     - RCT-Folly/Default (= 2024.01.01.00)
+  - RCT-Folly/Default (2024.01.01.00):
+    - boost
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
   - RCT-Folly/Fabric (2024.01.01.00):
     - boost
     - DoubleConversion
@@ -1879,7 +1884,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   candlefinance-app-icon: 9d7562e14a7a087c4ce87c262f59300a4f18106a
-  DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
+  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
   EXApplication: c08200c34daca7af7fd76ac4b9d606077410e8ad
   EXAV: afa491e598334bbbb92a92a2f4dd33d7149ad37f
   EXBarCodeScanner: e2dd9b42c1b522a2adc9202b1dfbc64cb34456d1
@@ -1888,7 +1893,7 @@ SPEC CHECKSUMS:
   EXJSONUtils: 30c17fd9cc364d722c0946a550dfbf1be92ef6a4
   EXLocation: 43e9b582ca63a23c6f0a18d8cbe2145b3a388b55
   EXManifests: c1fab4c3237675e7b0299ea8df0bcb14baca4f42
-  Expo: 9b6666ef2fedcfc89c5b9be2aa1ce12b81f9e7f5
+  Expo: 8c995afb875c15bf8439af0b20bcb9ed8f90d0bd
   expo-dev-menu: 12b319a9bc73d76a1ed47ce52055b5356edb971d
   expo-dev-menu-interface: 5764ad537419c1a5e8f66f668e29c81e8aca290c
   ExpoAsset: 323700f291684f110fb55f0d4022a3362ea9f875
@@ -1915,12 +1920,12 @@ SPEC CHECKSUMS:
   EXSplashScreen: 17a656c08a0095be15b620c52e61dfdb665863d2
   EXTaskManager: 9c3520305c3aa1b4a12a7c6d1e3f85f2779c06e9
   FBLazyVector: 4b1589d37c9ff4dba11a63083fe7515fad3ac111
-  fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
-  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
+  fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
+  glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
   hermes-engine: 2102c92e54a031a270fd1fe84169ec8a0901b7bd
   lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494
   lottie-react-native: 4279da8b681e89c29a2adb9f99985d6cf372d49d
-  RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
+  RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
   RCTDeprecation: 5f1d7e1f8ef6c53f0207e3ac0d0ca23575e8a6ab
   RCTRequired: dcfd24ece09940bbf24b7c2974f4eb68a9baee55
   RCTTypeSafety: 3d65944055cc73f3bb28c3f05c7eaff2bb7ceb83
@@ -1988,4 +1993,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 7f0387b1ee3dbf846a6b743dd3d86d401c33d8c2
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "openid-client": "^5.7.0",
     "pawdirecte": "^1.7.1",
     "pawnilim": "^0.2.0",
-    "pawnote": "^1.2.2",
+    "pawnote": "^1.3.1",
     "pawrd": "^0.6.1",
     "react": "18.2.0",
     "react-native": "^0.74.3",

diff --git a/src/components/FirstInstallation/ButtonCta.tsx b/src/components/FirstInstallation/ButtonCta.tsx
@@ -59,7 +59,7 @@ const ButtonCta: React.FC<{
       <Pressable
         style={[
           styles.button,
-          primary ? void 0 : styles.secondary,
+          (primary && !disabled) ? styles.primary : styles.secondary,
           { backgroundColor: backgroundColor },
           {
             borderColor: colors.border,
@@ -84,22 +84,26 @@ const ButtonCta: React.FC<{
 const styles = StyleSheet.create({
   button: {
     minWidth: "100%",
-    height: 48,
-    borderRadius: 12,
+    height: 46,
+    borderRadius: 120,
     borderCurve: "continuous",
     justifyContent: "center",
     alignItems: "center",
     gap: 8,
     flexDirection: "row",
   },
 
+  primary: {
+    elevation: 3,
+  },
+
   secondary: {
     borderWidth: 2,
     opacity: 0.5 ,
   },
 
   text: {
-    fontSize: 16,
+    fontSize: 15,
     fontFamily: "semibold",
     letterSpacing: 1,
     textTransform: "uppercase",

diff --git a/src/components/FirstInstallation/DuoListPressable.tsx b/src/components/FirstInstallation/DuoListPressable.tsx
@@ -67,7 +67,7 @@ const DuoListPressable: React.FC<{
           styles.pressable,
           enabled ? {
             borderColor: colors.primary,
-            backgroundColor: colors.primary + "22",
+            backgroundColor: colors.primary + "26",
             shadowColor: colors.primary,
           } : {
             borderColor: colors.border,
@@ -135,10 +135,9 @@ const styles = StyleSheet.create({
   pressable: {
     width: "100%",
     borderWidth: 1.5,
-    borderBottomWidth: 3,
     paddingHorizontal: 18,
     paddingVertical: 12,
-    borderRadius: 12,
+    borderRadius: 14,
     borderCurve: "continuous",
     flexDirection: "row",
     gap: 18,

diff --git a/src/components/Global/PapillonModernHeader.tsx b/src/components/Global/PapillonModernHeader.tsx
@@ -30,18 +30,18 @@ export const PapillonModernHeader: React.FC<ModernHeaderProps> = (props) => {
   }
 
   return (
-    <LinearGradientModernHeader {...props} />
+    <LinearGradientModernHeader {...props} tint={props.tint}/>
   );
 };
 
-const LinearGradientModernHeader: React.FC<ModernHeaderProps> = ({ children, outsideNav = false, height = 70, startLocation = 0.5 }) => {
+const LinearGradientModernHeader: React.FC<ModernHeaderProps> = ({ children, outsideNav = false, height = 70, startLocation = 0.5, tint = null }) => {
   const theme = useTheme();
   const insets = useSafeAreaInsets();
 
   return (
     <>
       <LinearGradient
-        colors={[theme.colors.background + "EE", theme.colors.background + "00"]}
+        colors={tint && tint !== "" ? [tint + "EE", tint + "00"] : [theme.colors.background + "EE", theme.colors.background + "00"]}
         locations={[startLocation, 1]}
         style={{
           position: "absolute",