Release 6.6.2

Development => Beta (release 6.6.2)

app.json

@@ -3,7 +3,7 @@
     "name": "Papillon",
     "slug": "papillonvex",
     "scheme": "papillon",
-    "version": "6.6.1",
+    "version": "6.6.2",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "automatic",

fetch/background/Lessons.ts

@@ -73,6 +73,9 @@ const notifyLessons = async (lessons: PapillonLesson[]) => {
   for (const lesson of lessonsWithStatus) {
     const lessonStart = new Date(lesson.start);
     lessonStart.setMinutes(lessonStart.getMinutes() - 30);
+
+    // if lessonStart is in the past
+    if (lessonStart.getTime() < Date.now()) continue;
 
     const lessonID = (lesson.subject?.name ? lesson.subject.name : '') + new Date(lesson.start).getTime();
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "papillonvex",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "canal": "beta",
   "private": true,
   "scripts": {

stacks/AuthStack.tsx

@@ -56,23 +56,23 @@ const AuthStack = ({ navigation }) => {
       options: {
         headerTitle: 'Se connecter',
         headerTransparent: true,
-        presentation: 'modal',
       }
     },
     { 
       name: 'NGPronoteWebviewLogin',
       component: require('../views/NewAuthStack/Pronote/NGPronoteWebviewLogin').default,
       options: {
         headerTitle: 'Portail de l\'établissement',
-        presentation: 'modal',
+        headerBackTitle: 'Retour',
+        headerBackTitleVisible: false,
       }
     },
     {
       name: 'LoginURL',
       component: require('../views/NewAuthStack/Pronote/LoginURL').default,
       options: {
-        headerTitle: 'Connexion via PRONOTE',
-        presentation: 'modal',
+        headerTitle: 'Connexion via URL',
+        headerBackTitle: 'Retour',
       }
     },
     {
@@ -81,16 +81,14 @@ const AuthStack = ({ navigation }) => {
       options: {
         headerTitle: 'Localiser mon établissement',
         headerBackTitle: 'Retour',
-        presentation: 'modal',
       }
     },
     {
       name: 'LocateEtabList',
       component: require('../views/NewAuthStack/Pronote/LocateEtabList').default,
       options: {
         headerTitle: 'Établissements',
-        headerBackTitle: 'Ville',
-        presentation: 'modal',
+        headerBackTitle: 'Localiser',
       }
     },
     {

views/NewAuthStack/Pronote/LocateEtabList.tsx

@@ -45,14 +45,11 @@ const LocateEtabList = ({ route, navigation }: {
         instanceURL = instanceURL.replace('index-education.net', 'pronote.toutatice.fr');
       });
 
-    navigation.goBack();
-    navigation.goBack();
     navigation.navigate('NGPronoteWebviewLogin', { instanceURL: instanceURL });
   };
 
   useLayoutEffect(() => {
     navigation.setOptions({
-      headerBackTitle: location.properties.name,
       headerRight: () => (
         isInstancesLoading ? (
           <ActivityIndicator />
@@ -97,11 +94,10 @@ const LocateEtabList = ({ route, navigation }: {
       <StatusBar
         animated
         barStyle={
-          Platform.OS === 'ios'
-            ? 'light-content'
-            : UIColors.theme === 'light'
-              ? 'dark-content'
-              : 'light-content'
+          UIColors.dark ?
+            'light-content'
+            :
+            'dark-content'
         }
       />
 

views/NewAuthStack/Pronote/LoginURL.tsx

@@ -14,6 +14,8 @@ import AlertBottomSheet from '../../../interface/AlertBottomSheet';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { TouchableOpacity } from 'react-native-gesture-handler';
 
+import * as Clipboard from 'expo-clipboard';
+
 const LoginURL = ({ navigation }: {
   navigation: any // TODO
 }) => {
@@ -23,6 +25,8 @@ const LoginURL = ({ navigation }: {
   const [currentURL, setCurrentURL] = React.useState('');
   const [urlAlert, setURLAlert] = React.useState(false);
 
+  const textInputRef = React.useRef(null);
+
   const login = () => {
     if (!currentURL || !currentURL.startsWith('http')) {
       setURLAlert(true);
@@ -35,6 +39,16 @@ const LoginURL = ({ navigation }: {
     });
   };
 
+  // get url from clipboard if it's a pronote url
+  React.useEffect(() => {
+    (async () => {
+      const clipboard = await Clipboard.getUrlAsync();
+      if (clipboard && clipboard.includes('/pronote/')) {
+        setCurrentURL(clipboard);
+      }
+    })();
+  }, []);
+
   return (
     <ScrollView
       contentInsetAdjustmentBehavior='automatic'
@@ -52,13 +66,10 @@ const LoginURL = ({ navigation }: {
       <StatusBar
         animated
         barStyle={
-          Platform.OS === 'ios' ?
+          UIColors.dark ?
             'light-content'
             :
-            UIColors.theme == 'light' ?
-              'dark-content'
-              :
-              'light-content'
+            'dark-content'
         }
       />
 
@@ -71,6 +82,7 @@ const LoginURL = ({ navigation }: {
             style={[styles.input, {color: UIColors.text}]}
             value={currentURL}
             onChangeText={text => setCurrentURL(text)}
+            ref={textInputRef}
           />
         </View>
 
@@ -104,6 +116,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     paddingLeft: 16,
+    paddingRight: 16,
   },
 
   input: {