Style + added links + auto https

src/components/Home/Header.tsx

@@ -287,7 +287,7 @@ const HeaderButton: React.FC<{
   onPress: () => void
 }> = ({icon, index, text, scrolled, onPress}) => {
   const theme = useTheme();
-  const {colors} = theme;
+  const { colors } = theme;
 
   const newIcon = React.cloneElement(icon, {
     size: 24,

src/services/pronote/determinate-authentication-view.tsx

@@ -17,7 +17,10 @@ const determinateAuthenticationView = async <ScreenName extends keyof RouteParam
   showAlert: any // TODO: type
 ): Promise<void> => {
   let instance: pronote.Instance | undefined;
-  pronoteURL = pronote.cleanURL(pronoteURL);
+  if (!pronoteURL.startsWith("https://") && !pronoteURL.startsWith("http://")) {
+    pronoteURL = `https://${pronoteURL}`;
+    pronoteURL = pronote.cleanURL(pronoteURL);
+  }
 
   try {
     instance = await pronote.instance(pronoteURL);

src/views/login/pronote/PronoteAuthenticationSelector.tsx

@@ -61,8 +61,8 @@ const PronoteAuthenticationSelector: Screen<"PronoteAuthenticationSelector"> = (
       <MaskStars />
 
       <PapillonShineBubble
-        message="Pour trouver ton établissement, préfères-tu utiliser ta position ou faire autrement ?"
-        numberOfLines={3}
+        message="Que préfères-tu utiliser pour te connecter à Pronote ?"
+        numberOfLines={2}
         width={260}
         offsetTop={"16%"}
       />

src/views/login/pronote/PronoteGeolocation.tsx

@@ -53,7 +53,7 @@ const PronoteGeolocation: Screen<"PronoteGeolocation"> = ({ navigation }) => {
 
       <PapillonShineBubble
         message={PapillonMessage}
-        numberOfLines={permission?.granted ? 1 : 3}
+        numberOfLines={permission?.granted ? 1 : 4}
         width={250}
       />
       {!permission?.granted && (

src/views/login/pronote/PronoteManualLocation.tsx

@@ -123,7 +123,7 @@ const PronoteManualLocation: Screen<"PronoteManualLocation"> = ({ navigation })
             layout={LinearTransition}
           >
             <PapillonShineBubble
-              message={"Dans quelle ville se trouve votre établissement ?"}
+              message={"Dans quelle ville se trouve ton établissement ?"}
               numberOfLines={2}
               width={250}
               noFlex

src/views/login/pronote/PronoteManualURL.tsx

@@ -96,7 +96,7 @@ const PronoteManualURL: Screen<"PronoteManualURL"> = ({ route, navigation }) =>
             "Indique moi l'adresse URL Pronote de ton établissement"
             : "J'ai trouvé cette adresse dans ton presse-papier !"
         }
-        numberOfLines={2}
+        numberOfLines={3}
         width={250}
         noFlex
       />

src/views/login/skolengo/SkolengoAuthenticationSelector.tsx

@@ -55,8 +55,8 @@ const SkolengoAuthenticationSelector: Screen<"SkolengoAuthenticationSelector"> =
       <MaskStars />
 
       <PapillonShineBubble
-        message="Pour trouver ton établissement, préfères-tu utiliser ta position ou faire autrement ?"
-        numberOfLines={3}
+        message="Que préfères-tu pour te connecter à Skolengo ?"
+        numberOfLines={2}
         width={260}
         offsetTop={"16%"}
       />

src/views/login/skolengo/SkolengoGeolocation.tsx

@@ -53,7 +53,7 @@ const SkolengoGeolocation: Screen<"SkolengoGeolocation"> = ({ navigation }) => {
 
       <PapillonShineBubble
         message={PapillonMessage}
-        numberOfLines={permission?.granted ? 1 : 3}
+        numberOfLines={permission?.granted ? 1 : 4}
         width={250}
       />
       {!permission?.granted && (

src/views/settings/Settings.tsx

@@ -3,6 +3,7 @@ import React, { useEffect, useLayoutEffect, useState } from "react";
 import { Alert, Image, Platform, Text, View } from "react-native";
 import { useAccounts, useCurrentAccount } from "@/stores/account";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import * as WebBrowser from "expo-web-browser";
 import AppJSON from "../../../app.json";
 
 import Reanimated, {
@@ -28,7 +29,8 @@ import {
   Settings as SettingsLucide,
   Sparkles,
   SwatchBook,
-  WandSparkles
+  WandSparkles,
+  X
 } from "lucide-react-native";
 
 import { NativeIcon, NativeItem, NativeList, NativeListHeader, NativeText } from "@/components/Global/NativeComponents";
@@ -39,6 +41,7 @@ import {get_settings_widgets} from "@/addons/addons";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import {AddonPlacementManifest} from "@/addons/types";
 import { useFlagsStore } from "@/stores/flags";
+import { useAlert } from "@/providers/AlertProvider";
 
 const Settings: Screen<"Settings"> = ({ route, navigation }) => {
   const theme = useTheme();
@@ -51,6 +54,13 @@ const Settings: Screen<"Settings"> = ({ route, navigation }) => {
 
   const removeAccount = useAccounts((store) => store.remove);
 
+  const openUrl = async (url: string) => {
+    await WebBrowser.openBrowserAsync(url, {
+      controlsColor: colors.primary,
+      presentationStyle: WebBrowser.WebBrowserPresentationStyle.PAGE_SHEET,
+    });
+  };
+
   useEffect(() => {
     AsyncStorage.getItem("devmode")
       .then((res) => {
@@ -80,6 +90,8 @@ const Settings: Screen<"Settings"> = ({ route, navigation }) => {
     return unsubscribe;
   }, []);
 
+  const { showAlert } = useAlert();
+
   const tabs = [
     {
       icon: <SettingsLucide />,
@@ -164,6 +176,7 @@ const Settings: Screen<"Settings"> = ({ route, navigation }) => {
           icon: <WandSparkles />,
           color: "#58A3C3",
           label: "Papillon Magic",
+          description: "Beta",
           onPress: () => navigation.navigate("SettingsMagic"),
         },
       ],
@@ -176,9 +189,9 @@ const Settings: Screen<"Settings"> = ({ route, navigation }) => {
           icon: <HandCoins />,
           color: "#CBA024",
           label: "Soutenir Papillon",
-          description: "Disponible prochainement",
-          onPress: () => {},
-          disabled: true,
+          onPress: () => {
+            Platform.OS === "android" ? openUrl("https://papillon.bzh/donate") : undefined;
+          },
         },
         {
           icon: <Info />,
@@ -195,23 +208,51 @@ const Settings: Screen<"Settings"> = ({ route, navigation }) => {
           color: "#CF0029",
           label: "Se déconnecter",
           onPress: () => {
-            Alert.alert("Se déconnecter", "Êtes-vous sûr de vouloir vous déconnecter ?", [
-              {
-                text: "Annuler",
-                style: "cancel",
-              },
-              {
-                text: "Se déconnecter",
-                style: "destructive",
-                onPress: () => {
-                  removeAccount(account.localID);
-                  navigation.reset({
-                    index: 0,
-                    routes: [{ name: "AccountSelector" }],
-                  });
+            if (Platform.OS === "ios") {
+              Alert.alert("Se déconnecter", "Êtes-vous sûr de vouloir vous déconnecter ?", [
+                {
+                  text: "Annuler",
+                  style: "cancel",
                 },
-              },
-            ]);
+                {
+                  text: "Se déconnecter",
+                  style: "destructive",
+                  onPress: () => {
+                    removeAccount(account.localID);
+                    navigation.reset({
+                      index: 0,
+                      routes: [{ name: "AccountSelector" }],
+                    });
+                  },
+                },
+              ]);
+            } else {
+              showAlert({
+                title: "Se déconnecter",
+                message: "Êtes-vous sûr de vouloir vous déconnecter ?",
+                actions: [
+                  {
+                    title: "Annuler",
+                    onPress: () => {},
+                    backgroundColor: colors.card,
+                    icon: <X color={colors.text} />,
+                  },
+                  {
+                    title: "Se déconnecter",
+                    onPress: () => {
+                      removeAccount(account.localID);
+                      navigation.reset({
+                        index: 0,
+                        routes: [{ name: "AccountSelector" }],
+                      });
+                    },
+                    primary: true,
+                    backgroundColor: "#CF0029",
+                    icon: <LogOut color="#FFFFFF" />,
+                  },
+                ],
+              });
+            }
           },
         },
       ]
@@ -366,11 +407,12 @@ const Settings: Screen<"Settings"> = ({ route, navigation }) => {
           }}
         >
           version {AppJSON.expo.version} {"\n"}
-          fabriqué avec ❤️ par les contributeurs de Papillon
+          {Platform.OS} {Platform.Version} {"\n"}
+          fabriqué avec ❤️ par les contributeurs Papillon
         </Text>
       </Reanimated.ScrollView>
     </>
   );
 };
 
-export default Settings;
+export default Settings;

src/views/welcome/AccountCreated.tsx

@@ -115,7 +115,7 @@ const AccountCreated: Screen<"AccountCreated"> = ({ navigation }) => {
 
       <PapillonShineBubble
         message={name ? `Enchanté, ${name} ! On va personnaliser ton expérience !` : "Bienvenue sur Papillon !"}
-        numberOfLines={2}
+        numberOfLines={name ? 3 : 1}
         width={260}
         style={{
           zIndex: 10,

src/views/welcome/FirstInstallation.tsx

@@ -14,6 +14,7 @@ import * as WebBrowser from "expo-web-browser";
 import { Audio } from "expo-av";
 
 const PRIVACY_POLICY_URL = "https://safety.getpapillon.xyz/documents/privacy-policy";
+const TERMS_OF_SERVICE_URL = "https://safety.getpapillon.xyz/documents/terms-of-service";
 
 const FirstInstallation: Screen<"FirstInstallation"> = ({ navigation }) => {
   const theme = useTheme();
@@ -97,14 +98,14 @@ const FirstInstallation: Screen<"FirstInstallation"> = ({ navigation }) => {
         En continuant, vous acceptez les&nbsp;
         <Text
           style={{ textDecorationLine: "underline" }}
-          onPress={() => openUrl("https://safety.getpapillon.xyz/documents/terms-of-service")}
+          onPress={() => openUrl(TERMS_OF_SERVICE_URL)}
         >
           conditions d'utilisation
         </Text>
         &nbsp;et la&nbsp;
         <Text
           style={{ textDecorationLine: "underline" }}
-          onPress={() => openUrl("https://safety.getpapillon.xyz/documents/privacy-policy")}
+          onPress={() => openUrl(PRIVACY_POLICY_URL)}
         >
           politique de confidentialité
         </Text>.

src/widgets/Components/GeneralAverage.tsx

@@ -58,7 +58,7 @@ const GeneralAverageWidget = forwardRef(({
   }, [defaultPeriod]);
 
   useEffect(() => {
-    setHidden(typeof average !== "number" || average < 0);
+    setHidden(typeof average !== "number" || average < 0 || average + "" === "NaN");
   }, [average]);
 
   if (isNaN(average ?? 0)) {

src/widgets/Components/NextCourse.tsx

@@ -61,7 +61,7 @@ const NextCourseWidget = forwardRef(({ hidden, setHidden, loading, setLoading }:
 
       setLoading(false);
     }();
-  }, [account.instance, timetables]);  
+  }, [account.instance, timetables]);
 
   return !hidden && (
     <View