Merge branch 'main' of https://github.com/PapillonApp/Papillon

Author: ecnivtwelve

App.tsx

@@ -12,7 +12,6 @@ import { isExpoGo } from "@/utils/native/expoGoAlert";
 import { atobPolyfill, btoaPolyfill } from "js-base64";
 import { registerBackgroundTasks } from "@/background/BackgroundTasks";
 import { SoundHapticsProvider } from "@/hooks/Theme_Sound_Haptics";
-import { PapillonNavigation } from "@/router/refs";
 import * as Device from "expo-device";
 import * as ScreenOrientation from "expo-screen-orientation";
 import {getToLoadFonts} from "@/consts/Fonts";
@@ -55,30 +54,6 @@ export default function App () {
     configureOrientation();
   }, []);
 
-  const handleNotificationPress = async (notification: any) => {
-    if (notification?.data) {
-      const accountID = notification.data.accountID;
-      if (accountID) {
-        useAccounts.getState().setLastOpenedAccountID(accountID);
-
-        setTimeout(() => {
-          PapillonNavigation.current?.navigate(
-            notification.data.page,
-            notification.data.parameters,
-          );
-        }, 1000);
-      }
-    }
-  };
-
-  const checkInitialNotification = async () => {
-    const notifee = (await import("@notifee/react-native")).default;
-    const initialNotification = await notifee.getInitialNotification();
-    if (initialNotification) {
-      await handleNotificationPress(initialNotification.notification);
-    }
-  };
-
   const getBackgroundTimeLimit = useCallback((service: keyof typeof BACKGROUND_LIMITS) => {
     return BACKGROUND_LIMITS[service] ?? DEFAULT_BACKGROUND_TIME;
   }, []);
@@ -112,11 +87,6 @@ export default function App () {
     await AsyncStorage.removeItem("@background_timestamp");
   }, [currentAccount, switchTo, getBackgroundTimeLimit]);
 
-
-  useEffect(() => {
-    if (!isExpoGo()) checkInitialNotification();
-  }, []);
-
   useEffect(() => {
     const subscription = AppState.addEventListener("change", async (nextAppState) => {
       if (appState === nextAppState) return;

package-lock.json

@@ -12,50 +12,20 @@ import { fetchLessons } from "./data/Lessons";
 import { fetchAttendance } from "./data/Attendance";
 import { fetchEvaluation } from "./data/Evaluation";
 import { papillonNotify } from "./Notifications";
-
 import { useFlagsStore } from "@/stores/flags";
 
-const notifeeEvent = async () => {
-  const notifee = (await import("@notifee/react-native")).default;
-  const EventType = (await import("@notifee/react-native")).EventType;
-
-  // Gestion des badges quand app en arrière-plan
-  notifee.onBackgroundEvent(async ({ type, detail }) => {
-    const { notification, pressAction } = detail;
-
-    switch (type) {
-      case EventType.ACTION_PRESS:
-        console.log(`[Notifee] Action press: ${pressAction?.id}`);
-        break;
-      case EventType.DISMISSED:
-        let badgeCount = await notifee.getBadgeCount();
-        badgeCount = Math.max(badgeCount - 1, 0);
-        await notifee.setBadgeCount(badgeCount);
-        break;
-    }
-  });
+let isBackgroundFetchRunning = false;
+const BACKGROUND_TASK_NAME = "background-fetch";
 
-  // Gestion des badges quand app en premier plan
-  notifee.onForegroundEvent(async ({ type, detail }) => {
-    const { notification, pressAction } = detail;
-
-    switch (type) {
-      case EventType.ACTION_PRESS:
-        console.log(`[Notifee] Action press: ${pressAction?.id}`);
-        break;
-      case EventType.DISMISSED:
-        let badgeCount = await notifee.getBadgeCount();
-        badgeCount = Math.max(badgeCount - 1, 0);
-        await notifee.setBadgeCount(badgeCount);
-        break;
-    }
-  });
+const fetch = async (label: string, fn: () => Promise<any>) => {
+  try {
+    info(`▶️ Running background ${label}`, "BACKGROUND");
+    await fn();
+  } catch (e) {
+    error(`❌ ${label} fetch failed: ${e}`, "BACKGROUND");
+  }
 };
 
-if (!isExpoGo()) notifeeEvent();
-
-let isBackgroundFetchRunning = false;
-
 const backgroundFetch = async () => {
   const disableBackgroundTasks = useFlagsStore.getState().defined("disablebackgroundtasks");
   if (disableBackgroundTasks) {
@@ -99,18 +69,12 @@ const backgroundFetch = async () => {
         account.personalization.notifications;
 
       if (notificationsTypesPermissions?.enabled) {
-        info("▶️ Running background News", "BACKGROUND");
-        await fetchNews();
-        info("▶️ Running background Homeworks", "BACKGROUND");
-        await fetchHomeworks();
-        info("▶️ Running background Grades", "BACKGROUND");
-        await fetchGrade();
-        info("▶️ Running background Lessons", "BACKGROUND");
-        await fetchLessons();
-        info("▶️ Running background Attendance", "BACKGROUND");
-        await fetchAttendance();
-        info("▶️ Running background Evaluation", "BACKGROUND");
-        await fetchEvaluation();
+        await fetch("News", fetchNews);
+        await fetch("Homeworks", fetchHomeworks);
+        await fetch("Grades", fetchGrade);
+        await fetch("Lessons", fetchLessons);
+        await fetch("Attendance", fetchAttendance);
+        await fetch("Evaluation", fetchEvaluation);
       }
     }
 
@@ -127,14 +91,14 @@ const backgroundFetch = async () => {
   }
 };
 
-if (!isExpoGo()) TaskManager.defineTask("background-fetch", backgroundFetch);
+if (!isExpoGo()) TaskManager.defineTask(BACKGROUND_TASK_NAME, backgroundFetch);
 
 const unsetBackgroundFetch = async () =>
-  await BackgroundFetch.unregisterTaskAsync("background-fetch");
+  await BackgroundFetch.unregisterTaskAsync(BACKGROUND_TASK_NAME);
 
 const setBackgroundFetch = async () =>
-  await BackgroundFetch.registerTaskAsync("background-fetch", {
-    minimumInterval: 60 * 15,
+  await BackgroundFetch.registerTaskAsync(BACKGROUND_TASK_NAME, {
+    minimumInterval: 60 * (__DEV__ ? 1 : 15),
     stopOnTerminate: false,
     startOnBoot: true,
   });
@@ -152,11 +116,11 @@ const registerBackgroundTasks = async () => {
   }
 
   const isRegistered = await TaskManager.isTaskRegisteredAsync(
-    "background-fetch"
+    BACKGROUND_TASK_NAME
   );
 
   if (isRegistered) {
-    warn(
+    info(
       "⚠️ Background task already registered. Unregister background task...",
       "BACKGROUND"
     );

src/background/BackgroundTasks.ts

@@ -124,19 +124,12 @@ const papillonNotify = async (
   // Add timestamp for Android
   const timestamp = new Date().getTime();
 
-  // Get badge count
-  let badgeCount = await notifee.getBadgeCount();
-  if (channelId !== "Status") {
-    badgeCount++;
-  }
-
   // Display a notification
   await notifee.displayNotification({
     ...props,
     android: {
       channelId,
       timestamp,
-      badgeCount,
       showTimestamp: channelId !== "Status" ? true : false,
       showChronometer: channelId === "Status" ? true : false,
       smallIcon: "@mipmap/ic_launcher_foreground",
@@ -148,7 +141,6 @@ const papillonNotify = async (
     },
     ios: {
       threadId: channelId,
-      badgeCount,
       sound: channelId !== "Status" ? "default" : "",
     }
   });

src/background/Notifications.ts

@@ -1,50 +1,50 @@
 export const latexVocabulary: Record<string, string> = {
-  "∈": "\\in",
-  "∉": "\\notin",
-  "∀": "\\forall",
-  "∃": "\\exists",
-  "∅": "\\emptyset",
-  "∪": "\\cup",
-  "∩": "\\cap",
-  "⊂": "\\subset",
-  "⊆": "\\subseteq",
-  "⊃": "\\supset",
-  "⊇": "\\supseteq",
-  "π": "\\pi",
-  "∑": "\\sum",
-  "√": "\\sqrt{}",
-  "∞": "\\infty",
-  "→": "\\to",
-  "⇒": "\\Rightarrow",
-  "↔": "\\leftrightarrow",
-  "±": "\\pm",
-  "≤": "\\leq",
-  "≥": "\\geq",
-  "≠": "\\neq",
-  "×": "\\times",
-  "÷": "\\div",
-  "α": "\\alpha",
-  "β": "\\beta",
-  "γ": "\\gamma",
-  "θ": "\\theta",
-  "λ": "\\lambda",
-  "μ": "\\mu",
-  "σ": "\\sigma",
-  "φ": "\\phi",
-  "ω": "\\omega",
-  "≈": "\\approx",
-  "≡": "\\equiv",
-  "≜": "\\triangleq",
-  "⊥": "\\perp",
-  "∠": "\\angle",
-  "∥": "\\parallel",
-  "∂": "\\partial",
-  "∇": "\\nabla",
-  "∧": "\\land",
-  "∨": "\\lor",
-  "¬": "\\neg",
-  "⊢": "\\vdash",
-  "⊨": "\\models",
-  "⊤": "\\top",
-  "⊻": "\\veebar"
-} as const;
+  "\\in": "∈",
+  "\\notin": "∉",
+  "\\forall": "∀",
+  "\\exists": "∃",
+  "\\emptyset": "∅",
+  "\\cup": "∪",
+  "\\cap": "∩",
+  "\\subset": "⊂",
+  "\\subseteq": "⊆",
+  "\\supset": "⊃",
+  "\\supseteq": "⊇",
+  "\\pi": "π",
+  "\\sum": "∑",
+  "\\sqrt{}": "√",
+  "\\infty": "∞",
+  "\\to": "→",
+  "\\Rightarrow": "⇒",
+  "\\leftrightarrow": "↔",
+  "\\pm": "±",
+  "\\leq": "≤",
+  "\\geq": "≥",
+  "\\neq": "≠",
+  "\\times": "×",
+  "\\div": "÷",
+  "\\alpha": "α",
+  "\\beta": "β",
+  "\\gamma": "γ",
+  "\\theta": "θ",
+  "\\lambda": "λ",
+  "\\mu": "μ",
+  "\\sigma": "σ",
+  "\\phi": "φ",
+  "\\omega": "ω",
+  "\\approx": "≈",
+  "\\equiv": "≡",
+  "\\triangleq": "≜",
+  "\\perp": "⊥",
+  "\\angle": "∠",
+  "\\parallel": "∥",
+  "\\partial": "∂",
+  "\\nabla": "∇",
+  "\\land": "∧",
+  "\\lor": "∨",
+  "\\neg": "¬",
+  "\\vdash": "⊢",
+  "\\models": "⊨",
+  "\\top": "⊤",
+  "\\veebar": "⊻"
+} as const;

src/consts/LatexVocabulary.ts

@@ -23,14 +23,13 @@ const IGNORED_TAGS = new Set([
 const TAG_REGEX = /<\/?([a-zA-Z]+)(?:\s[^>]*)?>|([^<]+)/g;
 const NUMERIC_ENTITY_REGEX = /&#(\d+);/g;
 const NAMED_ENTITY_REGEX = /&([a-zA-Z]+);/g;
-const UNICODE_SYMBOLS_REGEX = /[\u2200-\u22FF\u03B1-\u03C9]/g;
+const LATEX_REGEX = /\\[a-zA-Z]+(?:\{\})?/g;
 const MULTI_NEWLINE_REGEX = /\n{2,}/g;
 
 const HTML_ENTITIES: Record<string, string> = {
   "&nbsp;": " ",
   "&quot;": "\"",
-  "&#039;": "'",
-  ...latexVocabulary,
+  "&#039;": "'"
 };
 
 const DECODE_CACHE = new Map<string, string>();
@@ -126,7 +125,10 @@ function decodeHtmlEntities (text: string): string {
       NAMED_ENTITY_REGEX,
       (_, entity) => HTML_ENTITIES[`&${entity};`] || `&${entity};`
     )
-    .replace(UNICODE_SYMBOLS_REGEX, (match) => HTML_ENTITIES[match] || match);
+    .replace(LATEX_REGEX, (match) => {
+      match = match.replace("{}", "");
+      return latexVocabulary[match] || match;
+    });
 }
 
 export default parse_homeworks;

src/utils/format/format_pronote_homeworks.ts

@@ -125,6 +125,7 @@ export interface Log {
   date: string;
   from?: string;
   message: string;
+  formattedDate?: string;
 }
 
 async function get_logs (): Promise<Log[]> {

src/utils/logger/logger.ts

@@ -206,7 +206,7 @@ const GradeReaction: Screen<"GradeReaction"> = ({ navigation, route }) => {
         <View ref={composerRef} style={[
           styles.cameraContainer,
           {
-            marginTop: inset.top + 75,
+            marginTop: inset.top,
             maxHeight: isTablet ? "65%" : "75%",
           }
         ]}

src/views/account/Grades/Modals/GradeReaction.tsx

@@ -112,7 +112,9 @@ const Subject: React.FC<SubjectProps> = ({
                 textTransform: "uppercase",
               }}
             >
-              {sortings[sorting]?.label}
+              {typeof sortings[sorting] === "string"
+                ? sortings[sorting]
+                : sortings[sorting]?.label}
             </NativeText>
             {isLoading && (
               <PapillonSpinner

src/views/account/Grades/Subject/Subject.tsx

@@ -20,6 +20,11 @@ interface SubjectItemProps {
   index?: number;
 }
 
+interface renderGradeItemProps {
+  item: Grade;
+  index: number;
+}
+
 const SubjectItem: React.FC<SubjectItemProps> = ({
   subject,
   allGrades,
@@ -41,7 +46,7 @@ const SubjectItem: React.FC<SubjectItemProps> = ({
     return null;
   }
 
-  const renderGradeItem = useCallback(({ item, index }) => (
+  const renderGradeItem = useCallback(({ item, index }: renderGradeItemProps) => (
     <SubjectGradeItem
       subject={subject}
       grade={item}
@@ -50,7 +55,7 @@ const SubjectItem: React.FC<SubjectItemProps> = ({
     />
   ), [subject, allGrades, navigation]);
 
-  const keyExtractor = useCallback((item) => item.id, []);
+  const keyExtractor = useCallback((item: Grade) => item.id, []);
 
   return (
     <NativeList