From 460d84c5f4c30693e88f06cca94b52e57e8f1c0e Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Tue, 14 Jul 2020 18:51:00 +0200
Subject: [PATCH] Improved mascot popup buttons layout

---
 src/components/Mascot/MascotPopup.js | 29 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/Mascot/MascotPopup.js b/src/components/Mascot/MascotPopup.js
index 74d17a8..74999ef 100644
--- a/src/components/Mascot/MascotPopup.js
+++ b/src/components/Mascot/MascotPopup.js
@@ -173,26 +173,17 @@ class MascotPopup extends React.Component<Props, State> {
         const cancel = this.props.buttons.cancel;
         return (
             <View style={{
-                flexDirection: "row",
                 marginLeft: "auto",
                 marginRight: "auto",
                 marginTop: "auto",
                 marginBottom: "auto",
             }}>
-                {cancel != null
-                    ? <Button
-                        mode={"contained"}
-                        icon={cancel.icon}
-                        color={cancel.color}
-                        onPress={cancel.onPress}
-                    >
-                        {cancel.message}
-                    </Button>
-                    : null}
                 {action != null
                     ? <Button
                         style={{
-                            marginLeft: 20,
+                            marginLeft: 'auto',
+                            marginRight: 'auto',
+                            marginBottom: 10,
                         }}
                         mode={"contained"}
                         icon={action.icon}
@@ -202,6 +193,20 @@ class MascotPopup extends React.Component<Props, State> {
                         {action.message}
                     </Button>
                     : null}
+                {cancel != null
+                    ? <Button
+                        style={{
+                            marginLeft: 'auto',
+                            marginRight: 'auto',
+                        }}
+                        mode={"contained"}
+                        icon={cancel.icon}
+                        color={cancel.color}
+                        onPress={cancel.onPress}
+                    >
+                        {cancel.message}
+                    </Button>
+                    : null}
             </View>
         );
     }