From 4ce6865b6a313a71f72d39e9d0948f8ef127b731 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Wed, 1 Apr 2020 14:48:11 +0200
Subject: [PATCH] Improved profile display and added new translations

---
 components/Sidebar.js            |  2 +-
 screens/Amicale/ProfileScreen.js | 46 ++++++++++++++++++++------------
 translations/en.json             |  3 ++-
 translations/fr.json             |  3 ++-
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/components/Sidebar.js b/components/Sidebar.js
index 98990dd..6e6d0af 100644
--- a/components/Sidebar.js
+++ b/components/Sidebar.js
@@ -49,7 +49,7 @@ class SideBar extends React.PureComponent<Props, State> {
                 icon: "home",
             },
             {
-                name: "AMICALE",
+                name: i18n.t('sidenav.divider4'),
                 route: "Divider4"
             },
             {
diff --git a/screens/Amicale/ProfileScreen.js b/screens/Amicale/ProfileScreen.js
index 3defbb8..5d69db4 100644
--- a/screens/Amicale/ProfileScreen.js
+++ b/screens/Amicale/ProfileScreen.js
@@ -101,22 +101,10 @@ class ProfileScreen extends React.Component<Props, State> {
                     <Divider/>
                     <List.Section>
                         <List.Subheader>{i18n.t("profileScreen.personalInformation")}</List.Subheader>
-                        <List.Item
-                            title={this.getFieldValue(this.data.birthday)}
-                            left={props => <List.Icon {...props} icon="cake-variant"/>}
-                        />
-                        <List.Item
-                            title={this.getFieldValue(this.data.phone)}
-                            left={props => <List.Icon {...props} icon="phone"/>}
-                        />
-                        <List.Item
-                            title={this.getFieldValue(this.data.email)}
-                            left={props => <List.Icon {...props} icon="email"/>}
-                        />
-                        <List.Item
-                            title={this.getFieldValue(this.data.branch)}
-                            left={props => <List.Icon {...props} icon="school"/>}
-                        />
+                        {this.getPersonalListItem(this.data.birthday, "cake-variant")}
+                        {this.getPersonalListItem(this.data.phone, "phone")}
+                        {this.getPersonalListItem(this.data.email, "email")}
+                        {this.getPersonalListItem(this.data.branch, "school")}
                     </List.Section>
                     <Divider/>
                     <Card.Actions>
@@ -208,12 +196,36 @@ class ProfileScreen extends React.Component<Props, State> {
         );
     }
 
+    isFieldAvailable(field: ?string) {
+        return field !== null;
+    }
+
     getFieldValue(field: ?string) {
-        return field !== null
+        return this.isFieldAvailable(field)
             ? field
             : i18n.t("profileScreen.noData");
     }
 
+    getFieldColor(field: ?string) {
+        return this.isFieldAvailable(field)
+            ? this.colors.text
+            : this.colors.textDisabled;
+    }
+
+    getPersonalListItem(field: ?string, icon: string) {
+        return (
+            <List.Item
+                title={this.getFieldValue(field)}
+                left={props => <List.Icon
+                    {...props}
+                    icon={icon}
+                    color={this.getFieldColor(field)}
+                />}
+                titleStyle={{color: this.getFieldColor(field)}}
+            />
+        );
+    }
+
     render() {
         return (
             <AuthenticatedScreen
diff --git a/translations/en.json b/translations/en.json
index 1c389de..8cce92c 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -20,7 +20,8 @@
   "sidenav": {
     "divider1": "Student websites",
     "divider2": "Services",
-    "divider3": "Personalisation"
+    "divider3": "Personalisation",
+    "divider4": "Amicale"
   },
   "intro": {
     "slide1": {
diff --git a/translations/fr.json b/translations/fr.json
index 52c87df..5697a5d 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -20,7 +20,8 @@
   "sidenav": {
     "divider1": "Sites étudiants",
     "divider2": "Services",
-    "divider3": "Personnalisation"
+    "divider3": "Personnalisation",
+    "divider4": "Amicale"
   },
   "intro": {
     "slide1": {