Added a little surprise

Improved HTML parsing
Improved layout margins
2020-06-27 19:37:34 +02:00 · 2020-06-26 18:22:00 +02:00 · 2020-06-26 18:07:04 +02:00 · 2020-06-26 17:54:28 +02:00 · 2020-06-26 17:50:42 +02:00
7 changed files with 41 additions and 41 deletions
--- a/src/components/Lists/Clubs/ClubListHeader.js
+++ b/src/components/Lists/Clubs/ClubListHeader.js
@ -26,7 +26,7 @@ class ClubListHeader extends React.Component<Props> {
            selected={isItemInCategoryFilter(this.props.selectedCategories, [category.id])}
            mode={'outlined'}
            onPress={onPress}
-            style={{marginRight: 5, marginBottom: 5}}
+            style={{marginRight: 5, marginLeft: 5, marginBottom: 5}}
            key={key}
        >
            {category.name}
--- a/src/components/Lists/Clubs/ClubListItem.js
+++ b/src/components/Lists/Clubs/ClubListItem.js
@ -55,7 +55,11 @@ class ClubListItem extends React.Component<Props> {
                onPress={this.props.onPress}
                left={(props) => <Avatar.Image
                    {...props}
-                    style={{backgroundColor: 'transparent'}}
+                    style={{
+                        backgroundColor: 'transparent',
+                        marginLeft: 10,
+                        marginRight: 10,
+                    }}
                    size={64}
                    source={{uri: this.props.item.logo}}/>}
                right={(props) => <Avatar.Icon
--- a/src/components/Overrides/CustomHTML.js
+++ b/src/components/Overrides/CustomHTML.js
@ -21,15 +21,25 @@ class CustomHTML extends React.Component<Props> {
        return <Text {...passProps}>{children}</Text>;
    };

+    getListBullet = (htmlAttribs, children, convertedCSSStyles, passProps) => {
+        return (
+            <Text>- </Text>
+        );
+    };
+
    render() {
        // Surround description with p to allow text styling if the description is not html
        return <HTML
            html={"<p>" + this.props.html + "</p>"}
            renderers={{
                p: this.getBasicText,
+                li: this.getBasicText,
            }}
+            listsPrefixesRenderers={{
+                ul: this.getListBullet
+            }}
+            ignoredTags={['img']}
            ignoredStyles={['color', 'background-color']}
-
            onLinkPress={this.openWebLink}/>;
    }
 }
--- a/src/screens/About/AboutScreen.js
+++ b/src/screens/About/AboutScreen.js
@ -25,6 +25,7 @@ const links = {
        "Coucou !\n\n",
    yohanLinkedin: 'https://www.linkedin.com/in/yohan-simard',
    react: 'https://facebook.github.io/react-native/',
+    meme: "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
 };

 type Props = {
@ -84,7 +85,7 @@ class AboutScreen extends React.Component<Props> {
     */
    authorData: Array<Object> = [
        {
-            onPressCallback: () => console.log('cc'),
+            onPressCallback: () => openWebLink(links.meme),
            icon: 'account-circle',
            text: 'Arnaud VERGNET',
            showChevron: false
--- a/src/screens/Services/ServicesScreen.js
+++ b/src/screens/Services/ServicesScreen.js
@ -11,6 +11,7 @@ import {Avatar, Card, Divider, List, TouchableRipple, withTheme} from "react-nat
 import type {CustomTheme} from "../../managers/ThemeManager";
 import i18n from 'i18n-js';
 import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
+import ConnectionManager from "../../managers/ConnectionManager";

 type Props = {
    navigation: Object,
@ -61,13 +62,13 @@ class ServicesScreen extends React.Component<Props, State> {
                title: i18n.t('screens.clubsAbout'),
                subtitle: i18n.t('servicesScreen.descriptions.clubs'),
                image: CLUBS_IMAGE,
-                onPress: () => nav.navigate("club-list"),
+                onPress: () => this.onAmicaleServicePress("club-list"),
            },
            {
                title: i18n.t('screens.profile'),
                subtitle: i18n.t('servicesScreen.descriptions.profile'),
                image: PROFILE_IMAGE,
-                onPress: () => nav.navigate("profile"),
+                onPress: () => this.onAmicaleServicePress("profile"),
            },
            {
                title: i18n.t('screens.amicaleWebsite'),
@ -79,7 +80,7 @@ class ServicesScreen extends React.Component<Props, State> {
                title: i18n.t('screens.vote'),
                subtitle: i18n.t('servicesScreen.descriptions.vote'),
                image: VOTE_IMAGE,
-                onPress: () => nav.navigate("vote"),
+                onPress: () => this.onAmicaleServicePress("vote"),
            },
        ];
        this.studentsDataset = [
@ -196,6 +197,13 @@ class ServicesScreen extends React.Component<Props, State> {
            />
    }

+    onAmicaleServicePress(route: string) {
+        if (ConnectionManager.getInstance().isLoggedIn())
+            this.props.navigation.navigate(route);
+        else
+            this.props.navigation.navigate("login", {nextScreen: route});
+    }
+
    renderItem = ({item}: { item: listItem }) => {
        return (
            <TouchableRipple
--- a/src/screens/Services/ServicesSectionScreen.js
+++ b/src/screens/Services/ServicesSectionScreen.js
@ -6,10 +6,7 @@ import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 import {withCollapsible} from "../../utils/withCollapsible";
 import {Collapsible} from "react-navigation-collapsible";
 import {CommonActions} from "@react-navigation/native";
-import ConnectionManager from "../../managers/ConnectionManager";
 import type {listItem} from "./ServicesScreen";
-import ErrorView from "../../components/Screens/ErrorView";
-import {ERROR_TYPE} from "../../utils/WebData";

 type Props = {
    navigation: Object,
@ -17,29 +14,13 @@ type Props = {
    collapsibleStack: Collapsible,
 }

-type State = {
-    isLoggedIn: boolean,
-}
-
-class ServicesSectionScreen extends React.Component<Props, State> {
+class ServicesSectionScreen extends React.Component<Props> {

    finalDataset: listItem;

    constructor(props) {
        super(props);
        this.handleNavigationParams();
-        this.state = {
-            isLoggedIn: ConnectionManager.getInstance().isLoggedIn(),
-        }
-    }
-
-    componentDidMount() {
-        this.props.navigation.addListener('focus', this.onFocus);
-
-    }
-
-    onFocus = () => {
-        this.setState({isLoggedIn: ConnectionManager.getInstance().isLoggedIn()})
    }

    handleNavigationParams() {
@ -57,19 +38,16 @@ class ServicesSectionScreen extends React.Component<Props, State> {

    render() {
        const {containerPaddingTop, scrollIndicatorInsetTop, onScroll} = this.props.collapsibleStack;
-        if (!this.state.isLoggedIn && this.finalDataset.shouldLogin)
-            return <ErrorView {...this.props} errorCode={ERROR_TYPE.BAD_TOKEN}/>;
-        else
-            return <CardList
-                dataset={this.finalDataset.content}
-                isHorizontal={false}
-                onScroll={onScroll}
-                contentContainerStyle={{
-                    paddingTop: containerPaddingTop,
-                    paddingBottom: CustomTabBar.TAB_BAR_HEIGHT + 20
-                }}
-                scrollIndicatorInsets={{top: scrollIndicatorInsetTop}}
-            />
+        return <CardList
+            dataset={this.finalDataset.content}
+            isHorizontal={false}
+            onScroll={onScroll}
+            contentContainerStyle={{
+                paddingTop: containerPaddingTop,
+                paddingBottom: CustomTabBar.TAB_BAR_HEIGHT + 20
+            }}
+            scrollIndicatorInsets={{top: scrollIndicatorInsetTop}}
+        />
    }
 }

--- a/src/screens/Services/Websites/AmicaleWebsiteScreen.js
+++ b/src/screens/Services/Websites/AmicaleWebsiteScreen.js
@ -16,7 +16,6 @@ export const AmicaleWebsiteScreen = (props: Object) => {
            path = path.replace(URL, '');
        }
    }
-    console.log(URL + path);
    return (
        <WebViewScreen
            {...props}
Author	SHA1	Message	Date
Arnaud Vergnet	32c77fab05	Added a little surprise	2020-06-27 19:37:34 +02:00
Arnaud Vergnet	b6915a1ebe	Improved HTML parsing	2020-06-26 18:22:00 +02:00
Arnaud Vergnet	82371e89e7	Improved layout margins	2020-06-26 18:07:04 +02:00
Arnaud Vergnet	217e918ce8	Allow navigating to amicale services section without being logged in	2020-06-26 17:54:28 +02:00
Arnaud Vergnet	88b2120c8a	Open login screen when user tries to access an amicale service instead of showing an error	2020-06-26 17:50:42 +02:00