chore: mettre à jour la version de l'application à 7.12.3 et corriger la gestion des couleurs dans les sujets

Author: ecnivtwelve

.github/ISSUE_TEMPLATE/bug.yml

@@ -61,7 +61,7 @@ body:
     attributes:
       label: Version utilisée
       description: Paramètres (de Papillon) -> Version affichée en bas de la page
-      placeholder: "7.12.2"
+      placeholder: "7.12.3"
     validations:
       required: true
 

android/app/build.gradle

@@ -89,7 +89,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 71220
-        versionName "7.12.2"
+        versionName "7.12.3"
     }
     signingConfigs {
         debug {

ios/Papillon/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>7.12.2</string>
+    <string>7.12.3</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "papillonvex",
-  "version": "7.12.2",
+  "version": "7.12.3",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "expo start",

package.json

@@ -27,9 +27,14 @@ export const COLORS_LIST = [
 ];
 
 // @ts-expect-error
-export const getRandColor = (usedColors) => {
+export const getRandColor = (usedColors?) => {
   const availableColors = COLORS_LIST.filter(
-    (color) => !usedColors.includes(color)
+    (color) => {
+      if(usedColors.length > 0) {
+        return !usedColors.includes(color);
+      }
+      return true;
+    }
   );
   return (
     availableColors[Math.floor(Math.random() * availableColors.length)] ||
@@ -105,46 +110,52 @@ const getClosestGradeEmoji = (subjectName) => {
 
 // @ts-expect-error
 export const getSubjectData = (entry) => {
-  const state = useCurrentAccount.getState();
-  const { account, mutateProperty } = state;
-  const subject = entry
-    .trim()
-    .toLowerCase()
-    .normalize("NFD")
-    .replace(/[\u0300-\u036f]/g, "");
-
-  if (!subject) {
-    return { color: "#888888", pretty: "Matière inconnue", emoji: "❓" };
-  }
-
-  const allSubjects = account?.personalization?.subjects || {};
-
-  // Check if the subject already exists
-  const existingSubject = allSubjects[subject];
-  if (existingSubject) {
-    return existingSubject;
+  try {
+    const state = useCurrentAccount.getState();
+    const { account, mutateProperty } = state;
+    const subject = entry
+      .trim()
+      .toLowerCase()
+      .normalize("NFD")
+      .replace(/[\u0300-\u036f]/g, "");
+
+    if (!subject) {
+      return { color: "#888888", pretty: "Matière inconnue", emoji: "❓" };
+    }
+
+    const allSubjects = account?.personalization?.subjects || {};
+
+    // Check if the subject already exists
+    const existingSubject = allSubjects[subject];
+    if (existingSubject) {
+      return existingSubject;
+    }
+
+    const formattedCoursName = findObjectByPronoteString(subject);
+    const usedColors = new Set(
+      Object.values(allSubjects).map((subj) => subj.color)
+    );
+    const color = getRandColor(Array.from(usedColors));
+    const emoji = getClosestGradeEmoji(subject);
+
+    const newSubject = { color, pretty: formattedCoursName.pretty, emoji };
+
+    // Check for existing subject with the same pretty name
+    const existing = Object.values(allSubjects).find(
+      (subj) => subj.pretty === formattedCoursName.pretty
+    );
+    if (existing) {
+      return existing;
+    }
+
+    mutateProperty("personalization", {
+      subjects: { ...allSubjects, [subject]: newSubject },
+    });
+
+    return newSubject;
   }
-
-  const formattedCoursName = findObjectByPronoteString(subject);
-  const usedColors = new Set(
-    Object.values(allSubjects).map((subj) => subj.color)
-  );
-  const color = getRandColor(Array.from(usedColors));
-  const emoji = getClosestGradeEmoji(subject);
-
-  const newSubject = { color, pretty: formattedCoursName.pretty, emoji };
-
-  // Check for existing subject with the same pretty name
-  const existing = Object.values(allSubjects).find(
-    (subj) => subj.pretty === formattedCoursName.pretty
-  );
-  if (existing) {
-    return existing;
+  catch (error) {
+    console.error("Error in getSubjectData:", error);
+    return { color: getRandColor(), pretty: entry.toString(), emoji: getClosestGradeEmoji(entry) };
   }
-
-  mutateProperty("personalization", {
-    subjects: { ...allSubjects, [subject]: newSubject },
-  });
-
-  return newSubject;
 };