From 31705e5aea579b7dd2678faa6782fc60d1e6931f Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Thu, 17 Jun 2021 14:53:47 +0300
Subject: [PATCH] [PE SSE mobile] Fix Bug 50889

---
 .../src/view/settings/ApplicationSettings.jsx | 10 +--
 .../mobile/src/view/settings/Settings.jsx     |  8 ++-
 .../src/view/settings/ApplicationSettings.jsx | 71 ++++++++++---------
 .../mobile/src/view/settings/Settings.jsx     |  8 ++-
 4 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
index 9fbb4f59f..54a805d50 100644
--- a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -16,14 +16,14 @@ const PageApplicationSettings = props => {
     };
 
     // set mode
-    // const appOptions = props.storeAppOptions;
-    // const _isEdit = appOptions.isEdit;
+    const appOptions = props.storeAppOptions;
+    const _isEdit = appOptions.isEdit;
     // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true;
 
     return (
         <Page>
             <Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
-            {/* {_isEdit && */}
+            {_isEdit &&
                 <Fragment>
                     <BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
                     <List>
@@ -46,7 +46,7 @@ const PageApplicationSettings = props => {
                         </ListItem>
                     </List>
                 </Fragment>
-            {/* } */}
+            }
             {/* {_isShowMacros && */}
                 <List mediaList>
                     <ListItem title={_t.textMacrosSettings} link="/macros-settings/" routeProps={{
@@ -84,7 +84,7 @@ const PageMacrosSettings = props => {
     );
 };
 
-const ApplicationSettings = inject("storeApplicationSettings")(observer(PageApplicationSettings));
+const ApplicationSettings = inject("storeApplicationSettings", "storeAppOptions")(observer(PageApplicationSettings));
 const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings));
 
 export {ApplicationSettings, MacrosSettings};
\ No newline at end of file
diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx
index 22f9a2339..6a3704aea 100644
--- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx
+++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx
@@ -130,9 +130,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
                             <Icon slot="media" icon="icon-collaboration"></Icon>
                         </ListItem> 
                     : null}
-                    <ListItem link="#" title={_t.textPresentationSettings} onClick={onoptionclick.bind(this, '/presentation-settings/')}>
-                        <Icon slot="media" icon="icon-setup"></Icon>
-                    </ListItem>
+                    {_isEdit && 
+                        <ListItem link="#" title={_t.textPresentationSettings} onClick={onoptionclick.bind(this, '/presentation-settings/')}>
+                            <Icon slot="media" icon="icon-setup"></Icon>
+                        </ListItem>
+                    }
                     <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
                         <Icon slot="media" icon="icon-app-settings"></Icon>
                     </ListItem>
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
index 9039e0cda..d2738b577 100644
--- a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -27,14 +27,14 @@ const PageApplicationSettings = props => {
     };
 
     // set mode
-    // const appOptions = props.storeAppOptions;
-    // const _isEdit = appOptions.isEdit;
+    const appOptions = props.storeAppOptions;
+    const _isEdit = appOptions.isEdit;
     // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true;
 
     return (
         <Page>
             <Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
-            {/* {_isEdit && */}
+            {_isEdit &&
                 <Fragment>
                     <BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
                     <List>
@@ -59,39 +59,40 @@ const PageApplicationSettings = props => {
                             onRegSettings: props.onRegSettings
                         }}></ListItem>
                     </List>
-                    <BlockTitle>{_t.textCommentingDisplay}</BlockTitle>
-                    <List>
-                        <ListItem>
-                            <span>{_t.textComments}</span>
-                            <Toggle checked={isComments}
-                                    onChange={() => {
-                                        storeApplicationSettings.changeDisplayComments(!isComments);
-                                        props.onChangeDisplayComments(!isComments);
-                                    }}
-                            />
-                        </ListItem>
-                        <ListItem>
-                            <span>{_t.textResolvedComments}</span>
-                            <Toggle checked={isResolvedComments} disabled={!isComments}
-                                    onChange={() => {
-                                        storeApplicationSettings.changeDisplayResolved(!isResolvedComments);
-                                        props.onChangeDisplayResolved(!isResolvedComments);
-                                    }}
-                            />
-                        </ListItem>
-                    </List>
-                    <List>
-                        <ListItem>
-                            <span>{_t.textR1C1Style}</span>
-                            <Toggle checked={isRefStyle}
-                                    onChange={() => {
-                                        storeApplicationSettings.changeRefStyle(!isRefStyle);
-                                        props.clickR1C1Style(!isRefStyle);
-                                    }}
-                            />
-                        </ListItem>
-                    </List>
                 </Fragment>
+            }
+                <BlockTitle>{_t.textCommentingDisplay}</BlockTitle>
+                <List>
+                    <ListItem>
+                        <span>{_t.textComments}</span>
+                        <Toggle checked={isComments}
+                                onChange={() => {
+                                    storeApplicationSettings.changeDisplayComments(!isComments);
+                                    props.onChangeDisplayComments(!isComments);
+                                }}
+                        />
+                    </ListItem>
+                    <ListItem>
+                        <span>{_t.textResolvedComments}</span>
+                        <Toggle checked={isResolvedComments} disabled={!isComments}
+                                onChange={() => {
+                                    storeApplicationSettings.changeDisplayResolved(!isResolvedComments);
+                                    props.onChangeDisplayResolved(!isResolvedComments);
+                                }}
+                        />
+                    </ListItem>
+                </List>
+                <List>
+                    <ListItem>
+                        <span>{_t.textR1C1Style}</span>
+                        <Toggle checked={isRefStyle}
+                                onChange={() => {
+                                    storeApplicationSettings.changeRefStyle(!isRefStyle);
+                                    props.clickR1C1Style(!isRefStyle);
+                                }}
+                        />
+                    </ListItem>
+                </List>
             {/* } */}
             {/* {_isShowMacros && */}
                 <List>
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
index 6d3793350..ac8caca6e 100644
--- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
@@ -138,9 +138,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
                             <Icon slot="media" icon="icon-collaboration"></Icon>
                         </ListItem> 
                     : null}
-                    <ListItem link="#" title={_t.textSpreadsheetSettings} onClick={onoptionclick.bind(this, '/spreadsheet-settings/')}>
-                        <Icon slot="media" icon="icon-table-settings"></Icon>
-                    </ListItem>
+                    {_isEdit && 
+                        <ListItem link="#" title={_t.textSpreadsheetSettings} onClick={onoptionclick.bind(this, '/spreadsheet-settings/')}>
+                            <Icon slot="media" icon="icon-table-settings"></Icon>
+                        </ListItem>
+                    }
                     <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
                         <Icon slot="media" icon="icon-app-settings"></Icon>
                     </ListItem>