package.json

@@ -45,13 +45,13 @@
     "react-native-gesture-handler": "~1.6.0",
     "react-native-image-modal": "^1.0.1",
     "react-native-modalize": "^1.3.6",
-    "react-native-paper": "^3.8.0",
+    "react-native-paper": "^3.6.0",
     "react-native-reanimated": "~1.7.0",
     "react-native-render-html": "^4.1.2",
     "react-native-safe-area-context": "0.7.3",
     "react-native-screens": "~2.2.0",
     "react-native-webview": "8.1.1",
-    "react-navigation-collapsible": "^5.5.0",
+    "react-navigation-collapsible": "^5.4.0",
     "react-navigation-header-buttons": "^3.0.5"
   },
   "devDependencies": {

src/components/Custom/AnimatedBottomBar.js

@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import {StyleSheet, View} from "react-native";
-import {FAB, IconButton, Surface, withTheme} from "react-native-paper";
+import {Button, IconButton, Surface, withTheme} from "react-native-paper";
 import AutoHideComponent from "./AutoHideComponent";
 
 type Props = {
@@ -41,9 +41,8 @@ class AnimatedBottomBar extends React.Component<Props, State> {
         this.displayModeIcons[DISPLAY_MODES.MONTH] = "calendar-range";
     }
 
-    shouldComponentUpdate(nextProps: Props, nextState: State) {
+    shouldComponentUpdate(nextProps: Props) {
-        return (nextProps.currentGroup !== this.props.currentGroup)
+        return (nextProps.currentGroup !== this.props.currentGroup);
-            || (nextState.currentMode !== this.state.currentMode);
     }
 
     onScroll = (event: Object) => {
@@ -86,13 +85,13 @@ class AnimatedBottomBar extends React.Component<Props, State> {
                             style={{marginLeft: 5}}
                             onPress={() => this.props.onPress('today', undefined)}/>
                     </View>
-                    <View style={styles.fabContainer}>
+                        <Button
-                    <FAB
+                            icon="book-variant"
-                        style={styles.fab}
+                            onPress={() => this.props.navigation.navigate('group-select')}
-                        icon="account-clock"
+                            style={{maxWidth: '40%'}}
-                        onPress={() => this.props.navigation.navigate('group-select')}
+                        >
-                    />
+                            {this.props.currentGroup.replace(/_/g, " ")}
-                    </View>
+                        </Button>
                     <View style={{flexDirection: 'row'}}>
                         <IconButton
                             icon="chevron-left"
@@ -118,25 +117,13 @@ const styles = StyleSheet.create({
         width: '90%',
     },
     surface: {
-        position: 'relative',
         flexDirection: 'row',
         justifyContent: 'space-between',
         alignItems: 'center',
         borderRadius: 50,
         elevation: 2,
-    },
+        padding: 10,
-    fabContainer: {
+        paddingHorizontal: 20,
-        position: "absolute",
-        left: 0,
-        right: 0,
-        alignItems: "center",
-        width: '100%',
-        height: '100%'
-    },
-    fab: {
-        position: 'absolute',
-        alignSelf: 'center',
-        top: -10,
     }
 });
 

src/components/Custom/ErrorView.js

@@ -12,9 +12,6 @@ type Props = {
     route: Object,
     errorCode: number,
     onRefresh: Function,
-    icon: string,
-    message: string,
-    showRetryButton: boolean,
 }
 
 type State = {
@@ -30,13 +27,6 @@ class ErrorView extends React.PureComponent<Props, State> {
 
     showLoginButton: boolean;
 
-    static defaultProps = {
-        errorCode: 0,
-        icon: '',
-        message: '',
-        showRetryButton: true,
-    }
-
     state = {
         refreshing: false,
     };
@@ -48,47 +38,41 @@ class ErrorView extends React.PureComponent<Props, State> {
 
     generateMessage() {
         this.showLoginButton = false;
-        if (this.props.errorCode !== 0) {
+        switch (this.props.errorCode) {
-            switch (this.props.errorCode) {
+            case ERROR_TYPE.BAD_CREDENTIALS:
-                case ERROR_TYPE.BAD_CREDENTIALS:
+                this.message = i18n.t("errors.badCredentials");
-                    this.message = i18n.t("errors.badCredentials");
+                this.icon = "account-alert-outline";
-                    this.icon = "account-alert-outline";
+                break;
-                    break;
+            case ERROR_TYPE.BAD_TOKEN:
-                case ERROR_TYPE.BAD_TOKEN:
+                this.message = i18n.t("errors.badToken");
-                    this.message = i18n.t("errors.badToken");
+                this.icon = "account-alert-outline";
-                    this.icon = "account-alert-outline";
+                this.showLoginButton = true;
-                    this.showLoginButton = true;
+                break;
-                    break;
+            case ERROR_TYPE.NO_CONSENT:
-                case ERROR_TYPE.NO_CONSENT:
+                this.message = i18n.t("errors.noConsent");
-                    this.message = i18n.t("errors.noConsent");
+                this.icon = "account-remove-outline";
-                    this.icon = "account-remove-outline";
+                break;
-                    break;
+            case ERROR_TYPE.BAD_INPUT:
-                case ERROR_TYPE.BAD_INPUT:
+                this.message = i18n.t("errors.badInput");
-                    this.message = i18n.t("errors.badInput");
+                this.icon = "alert-circle-outline";
-                    this.icon = "alert-circle-outline";
+                break;
-                    break;
+            case ERROR_TYPE.FORBIDDEN:
-                case ERROR_TYPE.FORBIDDEN:
+                this.message = i18n.t("errors.forbidden");
-                    this.message = i18n.t("errors.forbidden");
+                this.icon = "lock";
-                    this.icon = "lock";
+                break;
-                    break;
+            case ERROR_TYPE.CONNECTION_ERROR:
-                case ERROR_TYPE.CONNECTION_ERROR:
+                this.message = i18n.t("errors.connectionError");
-                    this.message = i18n.t("errors.connectionError");
+                this.icon = "access-point-network-off";
-                    this.icon = "access-point-network-off";
+                break;
-                    break;
+            case ERROR_TYPE.SERVER_ERROR:
-                case ERROR_TYPE.SERVER_ERROR:
+                this.message = i18n.t("errors.serverError");
-                    this.message = i18n.t("errors.serverError");
+                this.icon = "server-network-off";
-                    this.icon = "server-network-off";
+                break;
-                    break;
+            default:
-                default:
+                this.message = i18n.t("errors.unknown");
-                    this.message = i18n.t("errors.unknown");
+                this.icon = "alert-circle-outline";
-                    this.icon = "alert-circle-outline";
+                break;
-                    break;
-            }
-        } else {
-            this.message = this.props.message;
-            this.icon = this.props.icon;
         }
-
     }
 
     getRetryButton() {
@@ -104,11 +88,10 @@ class ErrorView extends React.PureComponent<Props, State> {
 
     goToLogin = () => {
         this.props.navigation.navigate("login",
-            {
+        {
-                screen: 'login',
+           screen: 'login',
-                params: {nextScreen: this.props.route.name}
+           params: {nextScreen: this.props.route.name}
-            })
+        })};
-    };
 
     getLoginButton() {
         return <Button
@@ -141,11 +124,9 @@ class ErrorView extends React.PureComponent<Props, State> {
                     }}>
                         {this.message}
                     </Subheading>
-                    {this.props.showRetryButton
+                    {this.showLoginButton
-                        ? (this.showLoginButton
+                        ? this.getLoginButton()
-                            ? this.getLoginButton()
+                        : this.getRetryButton()}
-                            : this.getRetryButton())
-                        : null}
                 </View>
             </View>
         );
@@ -167,7 +148,6 @@ const styles = StyleSheet.create({
     },
     subheading: {
         textAlign: 'center',
-        paddingHorizontal: 20
     },
     button: {
         marginTop: 10,

src/components/Lists/GroupListAccordion.js

@@ -1,18 +1,15 @@
 // @flow
 
 import * as React from 'react';
-import {IconButton, List, withTheme} from 'react-native-paper';
+import {List} from 'react-native-paper';
 import {FlatList} from "react-native";
 import {stringMatchQuery} from "../../utils/Search";
 
 type Props = {
     item: Object,
     onGroupPress: Function,
-    onFavoritePress: Function,
     currentSearchString: string,
-    favoriteNumber: number,
     height: number,
-    theme: Object,
 }
 
 type State = {
@@ -21,13 +18,12 @@ type State = {
 
 const LIST_ITEM_HEIGHT = 64;
 
-class GroupListAccordion extends React.Component<Props, State> {
+const REPLACE_REGEX = /_/g;
 
-    constructor(props) {
+export default class GroupListAccordion extends React.Component<Props, State> {
-        super(props);
+
-        this.state = {
+    state = {
-            expanded: props.item.id === "0",
+        expanded: false,
-        }
     }
 
     shouldComponentUpdate(nextProps: Props, nextSate: State) {
@@ -35,37 +31,28 @@ class GroupListAccordion extends React.Component<Props, State> {
             this.state.expanded = nextProps.currentSearchString.length > 0;
 
         return (nextProps.currentSearchString !== this.props.currentSearchString)
-            || (nextSate.expanded !== this.state.expanded)
+            || (nextSate.expanded !== this.state.expanded);
-            || (nextProps.favoriteNumber !== this.props.favoriteNumber);
     }
 
     onPress = () => this.setState({expanded: !this.state.expanded});
 
     keyExtractor = (item: Object) => item.id.toString();
 
-    isItemFavorite(item: Object) {
-        return item.isFav !== undefined && item.isFav;
-    }
-
     renderItem = ({item}: Object) => {
         if (stringMatchQuery(item.name, this.props.currentSearchString)) {
             const onPress = () => this.props.onGroupPress(item);
-            const onStartPress = () => this.props.onFavoritePress(item);
             return (
                 <List.Item
-                    title={item.name}
+                    title={item.name.replace(REPLACE_REGEX, " ")}
                     onPress={onPress}
                     left={props =>
                         <List.Icon
                             {...props}
                             icon={"chevron-right"}/>}
                     right={props =>
-                        <IconButton
+                        <List.Icon
                             {...props}
-                            icon={"star"}
+                            icon={"star"}/>}
-                            onPress={onStartPress}
-                            color={this.isItemFavorite(item) ? this.props.theme.colors.tetrisScore : props.color}
-                        />}
                     style={{
                         height: LIST_ITEM_HEIGHT,
                         justifyContent: 'center',
@@ -89,14 +76,6 @@ class GroupListAccordion extends React.Component<Props, State> {
                     height: this.props.height,
                     justifyContent: 'center',
                 }}
-                left={props =>
-                    item.id === "0"
-                    ? <List.Icon
-                        {...props}
-                        icon={"star"}
-                        color={this.props.theme.colors.tetrisScore}
-                    />
-                : null}
             >
                 {/*$FlowFixMe*/}
                 <FlatList
@@ -113,5 +92,3 @@ class GroupListAccordion extends React.Component<Props, State> {
         );
     }
 }
-
-export default withTheme(GroupListAccordion)

src/managers/AsyncStorageManager.js

@@ -84,11 +84,6 @@ export default class AsyncStorageManager {
             default: '',
             current: '',
         },
-        planexFavoriteGroups: {
-            key: 'planexFavoriteGroups',
-            default: '[]',
-            current: '',
-        },
     };
 
     /**

src/managers/DateManager.js

@@ -58,8 +58,4 @@ export default class DateManager {
         return this.daysOfWeek[date.getDay()] + " " + date.getDate() + " " + this.monthsOfYear[date.getMonth()] + " " + date.getFullYear();
     }
 
-    static isWeekend(date: Date) {
-        return date.getDay() === 6 || date.getDay() === 0;
-    }
-
 }

src/navigation/MainTabNavigator.js

@@ -291,9 +291,6 @@ function PlanexStackComponent() {
                     options={({navigation}) => {
                         return {
                             title: 'GroupSelectionScreen',
-                            headerStyle: {
-                                backgroundColor: colors.surface,
-                            },
                             ...TransitionPresets.ModalSlideFromBottomIOS,
                         };
                     }}
@@ -348,14 +345,11 @@ class TabNavigator extends React.Component<Props> {
             >
                 <Tab.Screen
                     name="proximo"
-                    option
                     component={ProximoStackComponent}
-                    options={{title: i18n.t('screens.proximo')}}
                 />
                 <Tab.Screen
                     name="planning"
                     component={PlanningStackComponent}
-                    options={{title: i18n.t('screens.planning')}}
                 />
                 <Tab.Screen
                     name="home"
@@ -365,12 +359,10 @@ class TabNavigator extends React.Component<Props> {
                 <Tab.Screen
                     name="proxiwash"
                     component={ProxiwashStackComponent}
-                    options={{title: i18n.t('screens.proxiwash')}}
                 />
                 <Tab.Screen
                     name="planex"
                     component={PlanexStackComponent}
-                    options={{title: "Planex"}}
                 />
             </Tab.Navigator>
         );

src/screens/GroupSelectionScreen.js

@@ -7,7 +7,6 @@ import {Searchbar, withTheme} from "react-native-paper";
 import {stringMatchQuery} from "../utils/Search";
 import WebSectionList from "../components/Lists/WebSectionList";
 import GroupListAccordion from "../components/Lists/GroupListAccordion";
-import AsyncStorageManager from "../managers/AsyncStorageManager";
 
 const LIST_ITEM_HEIGHT = 70;
 
@@ -20,7 +19,6 @@ type Props = {
 
 type State = {
     currentSearchString: string,
-    favoriteGroups: Array<Object>,
 };
 
 function sortName(a, b) {
@@ -32,7 +30,6 @@ function sortName(a, b) {
 }
 
 const GROUPS_URL = 'http://planex.insa-toulouse.fr/wsAdeGrp.php?projectId=1';
-const REPLACE_REGEX = /_/g;
 
 /**
  * Class defining proximo's article list of a certain category.
@@ -43,7 +40,6 @@ class GroupSelectionScreen extends React.Component<Props, State> {
         super(props);
         this.state = {
             currentSearchString: '',
-            favoriteGroups: JSON.parse(AsyncStorageManager.getInstance().preferences.planexFavoriteGroups.current),
         };
     }
 
@@ -96,49 +92,6 @@ class GroupSelectionScreen extends React.Component<Props, State> {
         });
     };
 
-    onListFavoritePress = (item: Object) => {
-        this.updateGroupFavorites(item);
-    };
-
-    isGroupInFavorites(group: Object) {
-        let isFav = false;
-        for (let i = 0; i < this.state.favoriteGroups.length; i++) {
-            if (group.id === this.state.favoriteGroups[i].id) {
-                isFav = true;
-                break;
-            }
-        }
-        return isFav;
-    }
-
-    removeGroupFromFavorites(favorites: Array<Object>, group: Object) {
-        for (let i = 0; i < favorites.length; i++) {
-            if (group.id === favorites[i].id) {
-                favorites.splice(i, 1);
-                break;
-            }
-        }
-    }
-
-    addGroupToFavorites(favorites: Array<Object>, group: Object) {
-        group.isFav = true;
-        favorites.push(group);
-        favorites.sort(sortName);
-    }
-
-    updateGroupFavorites(group: Object) {
-        let newFavorites = [...this.state.favoriteGroups]
-        if (this.isGroupInFavorites(group))
-            this.removeGroupFromFavorites(newFavorites, group);
-        else
-            this.addGroupToFavorites(newFavorites, group);
-        this.setState({favoriteGroups: newFavorites})
-        console.log(newFavorites);
-        AsyncStorageManager.getInstance().savePref(
-            AsyncStorageManager.getInstance().preferences.planexFavoriteGroups.key,
-            JSON.stringify(newFavorites));
-    }
-
     shouldDisplayAccordion(item: Object) {
         let shouldDisplay = false;
         for (let i = 0; i < item.content.length; i++) {
@@ -162,9 +115,7 @@ class GroupSelectionScreen extends React.Component<Props, State> {
                 <GroupListAccordion
                     item={item}
                     onGroupPress={this.onListItemPress}
-                    onFavoritePress={this.onListFavoritePress}
                     currentSearchString={this.state.currentSearchString}
-                    favoriteNumber={this.state.favoriteGroups.length}
                     height={LIST_ITEM_HEIGHT}
                 />
             );
@@ -175,21 +126,12 @@ class GroupSelectionScreen extends React.Component<Props, State> {
     generateData(fetchedData: Object) {
         let data = [];
         for (let key in fetchedData) {
-            this.formatGroups(fetchedData[key]);
             data.push(fetchedData[key]);
         }
         data.sort(sortName);
-        data.unshift({name: "FAVORITES", id: "0", content: this.state.favoriteGroups});
         return data;
     }
 
-    formatGroups(item: Object) {
-        for (let i = 0; i < item.content.length; i++) {
-            item.content[i].name = item.content[i].name.replace(REPLACE_REGEX, " ")
-            item.content[i].isFav = this.isGroupInFavorites(item.content[i]);
-        }
-    }
-
     /**
      * Creates the dataset to be used in the FlatList
      *
@@ -217,7 +159,7 @@ class GroupSelectionScreen extends React.Component<Props, State> {
                     refreshOnFocus={false}
                     fetchUrl={GROUPS_URL}
                     renderItem={this.renderItem}
-                    updateData={this.state.currentSearchString + this.state.favoriteGroups.length}
+                    updateData={this.state.currentSearchString}
                     itemHeight={LIST_ITEM_HEIGHT}
                 />
             </View>

src/screens/Websites/PlanexScreen.js

@@ -13,7 +13,6 @@ import {dateToString, getTimeOnlyString} from "../../utils/Planning";
 import DateManager from "../../managers/DateManager";
 import AnimatedBottomBar from "../../components/Custom/AnimatedBottomBar";
 import {CommonActions} from "@react-navigation/native";
-import ErrorView from "../../components/Custom/ErrorView";
 
 type Props = {
     navigation: Object,
@@ -137,18 +136,16 @@ class PlanexScreen extends React.Component<Props, State> {
     /**
      * Defines custom injected JavaScript to improve the page display on mobile
      */
-    constructor(props) {
+    constructor() {
-        super(props);
+        super();
         this.webScreenRef = React.createRef();
         this.barRef = React.createRef();
 
         let currentGroup = AsyncStorageManager.getInstance().preferences.planexCurrentGroup.current;
         if (currentGroup === '')
-            currentGroup = {name: "SELECT GROUP", id: -1};
+            currentGroup = {name: "SELECT GROUP", id: 0};
-        else {
+        else
             currentGroup = JSON.parse(currentGroup);
-            props.navigation.setOptions({title: currentGroup.name})
-        }
         this.state = {
             bannerVisible:
                 AsyncStorageManager.getInstance().preferences.planexShowBanner.current === '1' &&
@@ -185,7 +182,6 @@ class PlanexScreen extends React.Component<Props, State> {
         AsyncStorageManager.getInstance().savePref(
             AsyncStorageManager.getInstance().preferences.planexCurrentGroup.key,
             JSON.stringify(group));
-        this.props.navigation.setOptions({title: group.name})
         this.generateInjectedJS(group.id);
     }
 
@@ -194,7 +190,6 @@ class PlanexScreen extends React.Component<Props, State> {
             + OBSERVE_MUTATIONS_INJECTED
             + FULL_CALENDAR_SETTINGS
             + "displayAde(" + groupID + ");" // Reset Ade
-            + (DateManager.isWeekend(new Date()) ? "calendar.next()" : "")
             + LISTEN_TO_MESSAGES
             + INJECT_STYLE;
 
@@ -265,28 +260,15 @@ class PlanexScreen extends React.Component<Props, State> {
     };
 
     getWebView() {
-        const showWebview = this.state.currentGroup.id !== -1;
-
         return (
-            <View style={{height: '100%'}}>
+            <WebViewScreen
-                {!showWebview
+                ref={this.webScreenRef}
-                    ? <ErrorView
+                navigation={this.props.navigation}
-                        {...this.props}
+                url={PLANEX_URL}
-                        icon={'account-clock'}
+                customJS={this.customInjectedJS}
-                        message={i18n.t("planexScreen.noGroupSelected")}
+                onMessage={this.onMessage}
-                        showRetryButton={false}
+                onScroll={this.onScroll}
-                    />
+            />
-                    : null}
-
-                <WebViewScreen
-                    ref={this.webScreenRef}
-                    navigation={this.props.navigation}
-                    url={PLANEX_URL}
-                    customJS={this.customInjectedJS}
-                    onMessage={this.onMessage}
-                    onScroll={this.onScroll}
-                />
-            </View>
         );
     }
 

translations/en.json

@@ -212,8 +212,7 @@
   "planexScreen": {
     "enableStartScreen": "Come here often? Set it as default screen!",
     "enableStartOK": "Yes please!",
-    "enableStartCancel": "Later",
+    "enableStartCancel": "Later"
-    "noGroupSelected": "No group selected. Please select your group using the big beautiful red button bellow."
   },
   "availableRoomScreen": {
     "normalRoom": "Work",

translations/fr.json

@@ -212,8 +212,7 @@
   "planexScreen": {
     "enableStartScreen": "Vous venez souvent ici ? Démarrez l'appli sur cette page!",
     "enableStartOK": "Oui svp!",
-    "enableStartCancel": "Plus tard",
+    "enableStartCancel": "Plus tard"
-    "noGroupSelected": "Pas de group sélectionné. Merci de choisir un groupe avec le beau bouton rouge ci-dessous."
   },
   "availableRoomScreen": {
     "normalRoom": "Travail",