From 7e0f5078d4c285414bae9059c7447c4766522eb1 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Mon, 24 May 2021 21:49:35 -0300
Subject: [PATCH] remove native share

---
 .../Board/BoardShare/BoardShare.component.js  | 159 ++++++++++--------
 .../Board/BoardShare/BoardShare.css           |  10 +-
 .../Board/BoardShare/BoardShare.messages.js   |  20 +--
 src/components/Board/Navbar/Navbar.js         |  32 +---
 4 files changed, 102 insertions(+), 119 deletions(-)

diff --git a/src/components/Board/BoardShare/BoardShare.component.js b/src/components/Board/BoardShare/BoardShare.component.js
index bcd8c3933..c49f8d258 100644
--- a/src/components/Board/BoardShare/BoardShare.component.js
+++ b/src/components/Board/BoardShare/BoardShare.component.js
@@ -69,83 +69,98 @@ const BoardShare = ({
         </IconButton>
       </DialogTitle>
       <DialogContent className="ShareDialog__content">
-        <div className="ShareDialog__Subtitle">
-          <div>{
-            isLogged
-              ? <Button
+        <div className="ShareDialog__content__publish">
+          {isLogged ? (
+            <Button
               color="primary"
-              variant={isPublic ? "outlined" : "contained"}
-              className="ShareDialog__ToggleStatusButton"
+              variant={isPublic ? 'outlined' : 'contained'}
               onClick={publishBoard}
+            >
+              {!isPublic ? (
+                <FormattedMessage {...messages.publishBoard} />
+              ) : (
+                <FormattedMessage {...messages.unpublishBoard} />
+              )}
+            </Button>
+          ) : (
+            <React.Fragment>
+              <Alert severity="warning">
+                <FormattedMessage {...messages.unregisteredWarning} />
+              </Alert>
+              <Button
+                color="primary"
+                variant="contained"
+                component={Link}
+                to="/login-signup"
               >
-                {!isPublic? <FormattedMessage {...messages.publishBoard } /> : <FormattedMessage {...messages.unpublishBoard } />}
+                <FormattedMessage {...messages.loginSignUp} />
               </Button>
-              : <><Alert severity="warning"><FormattedMessage {...messages.warningUnregisterShareBoard } /></Alert><br/>
-                <Button
-                  color="primary"
-                  variant="contained"
-                  component={Link} to="/login-signup"
-                ><FormattedMessage {...messages.loginSignUpBtn } /></Button></>
-          }
-          </div>
+            </React.Fragment>
+          )}
         </div>
-        {isLogged && (<div className="ShareDialog__socialIcons">
-          <Button disabled={!isPublic} onClick={copyLinkAction} color="primary">
-            <div className="ShareDialog__socialIcons__copyAction">
-              <div>
-                <CopyIcon />
-              </div>
-              <FormattedMessage {...messages.copyLink} />
-            </div>
-          </Button>
-          <Button disabled={!isPublic}>
-            <EmailShareButton
-              subject={intl.formatMessage(messages.subject)}
-              body={intl.formatMessage(messages.body, { url: url })}
-              url={url}
-            >
-              <EmailIcon round />
-              <FormattedMessage id="email" {...messages.email} />
-            </EmailShareButton>
-          </Button>
-          <Button disabled={!isPublic}>
-            <FacebookShareButton
-              quote={intl.formatMessage(messages.subject)}
-              url={url}
-            >
-              <FacebookIcon round />
-              <FormattedMessage id="facebook" {...messages.facebook} />
-            </FacebookShareButton>
-          </Button>
-          <Button disabled={!isPublic}>
-            <TwitterShareButton
-              title={intl.formatMessage(messages.subject)}
-              hashtags={['cboard', 'AAC']}
-              url={url}
-            >
-              <TwitterIcon round />
-              <FormattedMessage id="twitter" {...messages.twitter} />
-            </TwitterShareButton>
-          </Button>
-          <Button disabled={!isPublic}>
-            <WhatsappShareButton
-              title={intl.formatMessage(messages.subject)}
-              url={url}
-            >
-              <WhatsappIcon round />
-              <FormattedMessage id="whatsapp" {...messages.whatsapp} />
-            </WhatsappShareButton>
-          </Button>
-          <Button disabled={!isPublic}>
-            <RedditShareButton
-              title={intl.formatMessage(messages.subject)}
-              url={url}
+        {isLogged && (
+          <div className="ShareDialog__socialIcons">
+            <Button
+              disabled={!isPublic}
+              onClick={copyLinkAction}
+              color="primary"
             >
-              <RedditIcon round />
-              <FormattedMessage id="reddit" {...messages.reddit} />
-            </RedditShareButton>
-          </Button>
-        </div>)}
+              <div className="ShareDialog__socialIcons__copyAction">
+                <div>
+                  <CopyIcon />
+                </div>
+                <FormattedMessage {...messages.copyLink} />
+              </div>
+            </Button>
+            <Button disabled={!isPublic}>
+              <EmailShareButton
+                subject={intl.formatMessage(messages.subject)}
+                body={intl.formatMessage(messages.body, { url: url })}
+                url={url}
+              >
+                <EmailIcon round />
+                <FormattedMessage id="email" {...messages.email} />
+              </EmailShareButton>
+            </Button>
+            <Button disabled={!isPublic}>
+              <FacebookShareButton
+                quote={intl.formatMessage(messages.subject)}
+                url={url}
+              >
+                <FacebookIcon round />
+                <FormattedMessage id="facebook" {...messages.facebook} />
+              </FacebookShareButton>
+            </Button>
+            <Button disabled={!isPublic}>
+              <TwitterShareButton
+                title={intl.formatMessage(messages.subject)}
+                hashtags={['cboard', 'AAC']}
+                url={url}
+              >
+                <TwitterIcon round />
+                <FormattedMessage id="twitter" {...messages.twitter} />
+              </TwitterShareButton>
+            </Button>
+            <Button disabled={!isPublic}>
+              <WhatsappShareButton
+                title={intl.formatMessage(messages.subject)}
+                url={url}
+              >
+                <WhatsappIcon round />
+                <FormattedMessage id="whatsapp" {...messages.whatsapp} />
+              </WhatsappShareButton>
+            </Button>
+            <Button disabled={!isPublic}>
+              <RedditShareButton
+                title={intl.formatMessage(messages.subject)}
+                url={url}
+              >
+                <RedditIcon round />
+                <FormattedMessage id="reddit" {...messages.reddit} />
+              </RedditShareButton>
+            </Button>
+          </div>
+        )}
       </DialogContent>
     </Dialog>
   </React.Fragment>
@@ -166,4 +181,4 @@ BoardShare.propTypes = {
   copyLinkAction: PropTypes.func
 };
 
-export default withMobileDialog()(BoardShare);
\ No newline at end of file
+export default withMobileDialog()(BoardShare);
diff --git a/src/components/Board/BoardShare/BoardShare.css b/src/components/Board/BoardShare/BoardShare.css
index c86e3bab7..474e3a2e7 100644
--- a/src/components/Board/BoardShare/BoardShare.css
+++ b/src/components/Board/BoardShare/BoardShare.css
@@ -12,20 +12,18 @@
   color: #000;
 }
 
-.ShareDialog__container .ShareDialog__Subtitle {
+.ShareDialog__container .ShareDialog__content__publish {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
   align-items: center;
   position: relative;
   padding: 8px 0;
-  margin-bottom: 15px;
+  margin-bottom: 16px;
 }
 
-.ShareDialog__container
-  .ShareDialog__Subtitle
-  .ShareDialog__ToggleStatusButton {
-  top: 0;
+.ShareDialog__content__publish > a {
+  margin: 16px;
 }
 
 .ShareDialog__socialIcons {
diff --git a/src/components/Board/BoardShare/BoardShare.messages.js b/src/components/Board/BoardShare/BoardShare.messages.js
index 6dc5633d5..ed053f6be 100644
--- a/src/components/Board/BoardShare/BoardShare.messages.js
+++ b/src/components/Board/BoardShare/BoardShare.messages.js
@@ -9,13 +9,9 @@ export default defineMessages({
     id: 'cboard.components.BoardShare.close',
     defaultMessage: 'Close'
   },
-  unregisteredWarning:{
+  unregisteredWarning: {
     id: 'cboard.components.BoardShare.unregisteredWarning',
-    defaultMessage: 'warning — you need to be registered to share a board'
-  },
-  loginSingup:{
-    id: 'cboard.components.BoardShare.loginSingup',
-    defaultMessage: 'LOGIN or SING UP'
+    defaultMessage: 'You need to be registered to share a board!'
   },
   publishBoard: {
     id: 'cboard.components.BoardShare.publishBoard',
@@ -25,13 +21,9 @@ export default defineMessages({
     id: 'cboard.components.BoardShare.unpublishBoard',
     defaultMessage: 'Unpublish Board'
   },
-  warningUnregisterShareBoard: {
-    id: 'cboard.components.boardshare.warningUnregisterShareBoard',
-    defaultMessage: 'warning — you need to be registered to share a board',
-  },
-  loginSignUpBtn: {
-    id: 'cboard.components.boardshare.loginSignUpBtn',
-    defaultMessage: 'LOGIN or SIGN UP',
+  loginSignUp: {
+    id: 'cboard.components.boardshare.loginSignUp',
+    defaultMessage: 'Login or Sign up'
   },
   copyLink: {
     id: 'cboard.components.BoardShare.copyLink',
@@ -66,4 +58,4 @@ export default defineMessages({
     defaultMessage:
       'Hello! I want to share a communication board from the Cboard tool. Please find it at: {url}'
   }
-});
\ No newline at end of file
+});
diff --git a/src/components/Board/Navbar/Navbar.js b/src/components/Board/Navbar/Navbar.js
index 373fa88e5..0080c5136 100644
--- a/src/components/Board/Navbar/Navbar.js
+++ b/src/components/Board/Navbar/Navbar.js
@@ -34,28 +34,7 @@ export class Navbar extends React.Component {
   }
 
   onShareClick = () => {
-    let nativeShare = false;
-    // https://developer.mozilla.org/en-US/docs/Web/API/Navigator/share#Examples
-    if (
-      this.props.board &&
-      this.props.board.isPublic &&
-      window &&
-      window.navigator &&
-      window.navigator.share
-    ) {
-      try {
-        window.navigator.share({
-          title: this.props.board.name,
-          text: this.props.board.name,
-          url: window.location.href
-        });
-        nativeShare = true;
-      } catch (e) {}
-    }
-
-    if (!nativeShare) {
-      this.setState({ openShareDialog: true });
-    }
+    this.setState({ openShareDialog: true });
   };
 
   onShareClose = () => {
@@ -126,7 +105,7 @@ export class Navbar extends React.Component {
 
     const isPublic = board && board.isPublic;
     const isOwnBoard = board && board.email === userData.email;
-    const isLogged = !isCordova() && userData && userData.name && userData.email;
+    const isLogged = userData && userData.name && userData.email;
 
     return (
       <div className={classNames('Navbar', className)}>
@@ -167,9 +146,7 @@ export class Navbar extends React.Component {
             <React.Fragment>
               <PrintBoardButton />
               {!isMobile.any && <FullScreenButton />}
-              {isLogged && (
-                <AnalyticsButton component={Link} to="/analytics" />
-              )}
+              {isLogged && <AnalyticsButton component={Link} to="/analytics" />}
               <SettingsButton component={Link} to="/settings" />
               <BoardShare
                 label={intl.formatMessage(messages.share)}
@@ -183,6 +160,7 @@ export class Navbar extends React.Component {
                 copyLinkAction={this.copyLinkAction}
                 open={this.state.openShareDialog}
                 url={this.getBoardToShare()}
+                fullScreen={false}
               />
             </React.Fragment>
           )}
@@ -228,4 +206,4 @@ Navbar.propTypes = {
   history: PropTypes.object.isRequired
 };
 
-export default withRouter(injectIntl(Navbar));
\ No newline at end of file
+export default withRouter(injectIntl(Navbar));